зеркало из https://github.com/mozilla/gecko-dev.git
Merge m-c to b2g-inbound
This commit is contained in:
Коммит
065e1fb950
|
@ -1315,7 +1315,7 @@ pref("browser.newtabpage.rows", 3);
|
|||
// number of columns of newtab grid
|
||||
pref("browser.newtabpage.columns", 3);
|
||||
|
||||
pref("browser.newtabpage.directorySource", "chrome://global/content/directoryLinks.json");
|
||||
pref("browser.newtabpage.directorySource", "data:application/json,{}");
|
||||
|
||||
// Enable the DOM fullscreen API.
|
||||
pref("full-screen-api.enabled", true);
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<xul:panel id="sponsored-panel" orient="vertical" type="arrow">
|
||||
<xul:description>&newtab.panel.message;</xul:description>
|
||||
<xul:label class="text-link"
|
||||
href="&newtab.panel.link.url;"
|
||||
href="https://support.mozilla.org/kb/how-do-sponsored-tiles-work"
|
||||
onclick="this.parentNode.hidePopup();"
|
||||
value="&newtab.panel.link.text;" />
|
||||
</xul:panel>
|
||||
|
|
|
@ -144,7 +144,7 @@ Site.prototype = {
|
|||
* existing thumbnail and the page allows background captures.
|
||||
*/
|
||||
captureIfMissing: function Site_captureIfMissing() {
|
||||
if (gPage.allowBackgroundCaptures && !this.link.imageURISpec) {
|
||||
if (gPage.allowBackgroundCaptures && !this.link.imageURI) {
|
||||
BackgroundPageThumbs.captureIfMissing(this.url);
|
||||
}
|
||||
},
|
||||
|
@ -157,7 +157,7 @@ Site.prototype = {
|
|||
if (this.link.bgColor) {
|
||||
thumbnail.style.backgroundColor = this.link.bgColor;
|
||||
}
|
||||
let uri = this.link.imageURISpec || PageThumbs.getThumbnailURL(this.url);
|
||||
let uri = this.link.imageURI || PageThumbs.getThumbnailURL(this.url);
|
||||
thumbnail.style.backgroundImage = "url(" + uri + ")";
|
||||
},
|
||||
|
||||
|
|
|
@ -3265,10 +3265,8 @@
|
|||
</method>
|
||||
<field name="_tabMarginLeft">null</field>
|
||||
<field name="_tabMarginRight">null</field>
|
||||
<method name="_adjustElementStartAndEnd">
|
||||
<method name="_calcTabMargins">
|
||||
<parameter name="aTab"/>
|
||||
<parameter name="tabStart"/>
|
||||
<parameter name="tabEnd"/>
|
||||
<body><![CDATA[
|
||||
if (this._tabMarginLeft === null || this._tabMarginRight === null) {
|
||||
let tabMiddle = document.getAnonymousElementByAttribute(aTab, "class", "tab-background-middle");
|
||||
|
@ -3276,6 +3274,14 @@
|
|||
this._tabMarginLeft = parseFloat(tabMiddleStyle.marginLeft);
|
||||
this._tabMarginRight = parseFloat(tabMiddleStyle.marginRight);
|
||||
}
|
||||
]]></body>
|
||||
</method>
|
||||
<method name="_adjustElementStartAndEnd">
|
||||
<parameter name="aTab"/>
|
||||
<parameter name="tabStart"/>
|
||||
<parameter name="tabEnd"/>
|
||||
<body><![CDATA[
|
||||
this._calcTabMargins(aTab);
|
||||
if (this._tabMarginLeft < 0) {
|
||||
tabStart = tabStart + this._tabMarginLeft;
|
||||
}
|
||||
|
@ -3920,6 +3926,10 @@
|
|||
|
||||
var scrollRect = this.mTabstrip.scrollClientRect;
|
||||
var tab = aTab.getBoundingClientRect();
|
||||
this.mTabstrip._calcTabMargins(aTab);
|
||||
|
||||
// DOMRect left/right properties are immutable.
|
||||
tab = {left: tab.left, right: tab.right};
|
||||
|
||||
// Is the new tab already completely visible?
|
||||
if (scrollRect.left <= tab.left && tab.right <= scrollRect.right)
|
||||
|
@ -3928,6 +3938,15 @@
|
|||
if (this.mTabstrip.smoothScroll) {
|
||||
let selected = !this.selectedItem.pinned &&
|
||||
this.selectedItem.getBoundingClientRect();
|
||||
if (selected) {
|
||||
selected = {left: selected.left, right: selected.right};
|
||||
// Need to take in to account the width of the left/right margins on tabs.
|
||||
selected.left = selected.left + this.mTabstrip._tabMarginLeft;
|
||||
selected.right = selected.right - this.mTabstrip._tabMarginRight;
|
||||
}
|
||||
|
||||
tab.left += this.mTabstrip._tabMarginLeft;
|
||||
tab.right -= this.mTabstrip._tabMarginRight;
|
||||
|
||||
// Can we make both the new tab and the selected tab completely visible?
|
||||
if (!selected ||
|
||||
|
|
|
@ -18,9 +18,7 @@ Cu.import("resource://gre/modules/Promise.jsm");
|
|||
Cu.import("resource://gre/modules/osfile.jsm");
|
||||
Cu.import("resource://gre/modules/Log.jsm");
|
||||
Cu.import("resource://gre/modules/Preferences.jsm");
|
||||
Cu.import("resource://services-common/utils.js");
|
||||
Cu.import("resource://gre/modules/AsyncShutdown.jsm");
|
||||
Cu.import("resource://gre/modules/Metrics.jsm");
|
||||
|
||||
XPCOMUtils.defineLazyModuleGetter(this, "UpdateChannel",
|
||||
"resource://gre/modules/UpdateChannel.jsm");
|
||||
|
@ -30,6 +28,11 @@ XPCOMUtils.defineLazyModuleGetter(this, "TelemetryPing",
|
|||
"resource://gre/modules/TelemetryPing.jsm");
|
||||
XPCOMUtils.defineLazyModuleGetter(this, "TelemetryLog",
|
||||
"resource://gre/modules/TelemetryLog.jsm");
|
||||
XPCOMUtils.defineLazyModuleGetter(this, "CommonUtils",
|
||||
"resource://services-common/utils.js");
|
||||
XPCOMUtils.defineLazyModuleGetter(this, "Metrics",
|
||||
"resource://gre/modules/Metrics.jsm");
|
||||
|
||||
// CertUtils.jsm doesn't expose a single "CertUtils" object like a normal .jsm
|
||||
// would.
|
||||
XPCOMUtils.defineLazyGetter(this, "CertUtils",
|
||||
|
|
|
@ -9,5 +9,4 @@
|
|||
<!ENTITY newtab.undo.restoreButton "Restore All.">
|
||||
<!ENTITY newtab.undo.closeTooltip "Hide">
|
||||
<!ENTITY newtab.panel.message "This site is being suggested because it has sponsored Mozilla, helping us promote openness, innovation and opportunity on the Web.">
|
||||
<!ENTITY newtab.panel.link.url "https://support.mozilla.org/kb/how-do-sponsored-tiles-work">
|
||||
<!ENTITY newtab.panel.link.text "Learn more…">
|
||||
|
|
|
@ -592,6 +592,14 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-ic
|
|||
%include ../shared/toolbarbuttons.inc.css
|
||||
%include ../shared/menupanel.inc.css
|
||||
|
||||
#home-button.bookmark-item {
|
||||
list-style-image: url("chrome://browser/skin/Toolbar.png");
|
||||
}
|
||||
|
||||
#home-button.bookmark-item:not(@inAnyPanel@):-moz-lwtheme-brighttext {
|
||||
list-style-image: url(chrome://browser/skin/Toolbar-inverted.png);
|
||||
}
|
||||
|
||||
#back-button:hover:active:not([disabled="true"]) {
|
||||
-moz-image-region: rect(18px, 36px, 36px, 18px);
|
||||
}
|
||||
|
@ -751,11 +759,13 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-ic
|
|||
to avoid potentially breaking add-on toolbar buttons. */
|
||||
|
||||
:-moz-any(@primaryToolbarButtons@),
|
||||
#home-button.bookmark-item,
|
||||
#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
|
||||
list-style-image: url("chrome://browser/skin/Toolbar@2x.png");
|
||||
}
|
||||
|
||||
:-moz-any(@primaryToolbarButtons@):not(@inAnyPanel@):-moz-lwtheme-brighttext,
|
||||
#home-button.bookmark-item:not(@inAnyPanel@):-moz-lwtheme-brighttext,
|
||||
#bookmarks-menu-button:not(@inAnyPanel@):-moz-lwtheme-brighttext > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
|
||||
list-style-image: url("chrome://browser/skin/Toolbar-inverted@2x.png");
|
||||
}
|
||||
|
@ -2623,12 +2633,12 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
|
|||
display: none;
|
||||
}
|
||||
|
||||
.bookmark-item:not(#home-button) {
|
||||
.bookmark-item {
|
||||
list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
|
||||
}
|
||||
|
||||
@media (min-resolution: 2dppx) {
|
||||
.bookmark-item:not(#home-button) {
|
||||
.bookmark-item {
|
||||
list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
|
||||
}
|
||||
|
||||
|
|
|
@ -441,6 +441,9 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
|
|||
#PanelUI-footer-inner {
|
||||
display: flex;
|
||||
border-top: 1px solid hsla(210,4%,10%,.14);
|
||||
}
|
||||
|
||||
#PanelUI-multiView[viewtype="subview"] #PanelUI-footer-inner {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
|
|
|
@ -926,8 +926,7 @@ public:
|
|||
nsIDOMHTMLCollection** aResult);
|
||||
void GetClassList(nsISupports** aClassList);
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_FINAL MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *aCx) MOZ_FINAL MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* Locate an nsIEditor rooted at this content node, if there is one.
|
||||
|
|
|
@ -53,8 +53,7 @@ public:
|
|||
NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS(nsChildContentList)
|
||||
|
||||
// nsWrapperCache
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
// nsIDOMNodeList interface
|
||||
NS_DECL_NSIDOMNODELIST
|
||||
|
|
|
@ -462,8 +462,7 @@ public:
|
|||
|
||||
NS_DECL_NSIDOMFILELIST
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
nsISupports* GetParentObject()
|
||||
{
|
||||
|
|
|
@ -2241,8 +2241,7 @@ public:
|
|||
|
||||
virtual nsHTMLDocument* AsHTMLDocument() { return nullptr; }
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *aCx) MOZ_OVERRIDE;
|
||||
|
||||
private:
|
||||
uint64_t mWarnedAbout;
|
||||
|
|
|
@ -394,8 +394,7 @@ public:
|
|||
*/
|
||||
virtual bool IsNodeOfType(uint32_t aFlags) const = 0;
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *aCx) MOZ_OVERRIDE;
|
||||
|
||||
protected:
|
||||
/**
|
||||
|
@ -403,7 +402,7 @@ protected:
|
|||
* does some additional checks and fix-up that's common to all nodes. WrapNode
|
||||
* should just call the DOM binding's Wrap function.
|
||||
*/
|
||||
virtual JSObject* WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
|
||||
virtual JSObject* WrapNode(JSContext *aCx)
|
||||
{
|
||||
MOZ_ASSERT(!IsDOMBinding(), "Someone forgot to override WrapNode");
|
||||
return nullptr;
|
||||
|
|
|
@ -399,9 +399,9 @@ Attr::Shutdown()
|
|||
}
|
||||
|
||||
JSObject*
|
||||
Attr::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
||||
Attr::WrapObject(JSContext* aCx)
|
||||
{
|
||||
return AttrBinding::Wrap(aCx, aScope, this);
|
||||
return AttrBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
Element*
|
||||
|
|
|
@ -80,8 +80,7 @@ public:
|
|||
virtual nsIDOMNode* AsDOMNode() { return this; }
|
||||
|
||||
// WebIDL
|
||||
virtual JSObject* WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
|
||||
|
||||
// XPCOM GetName() is OK
|
||||
// XPCOM GetValue() is OK
|
||||
|
|
|
@ -74,9 +74,9 @@ Comment::Constructor(const GlobalObject& aGlobal,
|
|||
}
|
||||
|
||||
JSObject*
|
||||
Comment::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
|
||||
Comment::WrapNode(JSContext *aCx)
|
||||
{
|
||||
return CommentBinding::Wrap(aCx, aScope, this);
|
||||
return CommentBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
} // namespace dom
|
||||
|
|
|
@ -72,8 +72,7 @@ public:
|
|||
ErrorResult& aRv);
|
||||
|
||||
protected:
|
||||
virtual JSObject* WrapNode(JSContext *aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapNode(JSContext *aCx) MOZ_OVERRIDE;
|
||||
};
|
||||
|
||||
} // namespace dom
|
||||
|
|
|
@ -29,9 +29,9 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMImplementation)
|
|||
NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMImplementation)
|
||||
|
||||
JSObject*
|
||||
DOMImplementation::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
||||
DOMImplementation::WrapObject(JSContext* aCx)
|
||||
{
|
||||
return DOMImplementationBinding::Wrap(aCx, aScope, this);
|
||||
return DOMImplementationBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
bool
|
||||
|
|
|
@ -53,8 +53,7 @@ public:
|
|||
return mOwner;
|
||||
}
|
||||
|
||||
virtual JSObject* WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
|
||||
|
||||
// nsIDOMDOMImplementation
|
||||
NS_DECL_NSIDOMDOMIMPLEMENTATION
|
||||
|
|
|
@ -73,10 +73,9 @@ public:
|
|||
return mOwner;
|
||||
}
|
||||
|
||||
virtual JSObject* WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
|
||||
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
|
||||
{
|
||||
return mozilla::dom::DOMParserBinding::Wrap(aCx, aScope, this);
|
||||
return mozilla::dom::DOMParserBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
private:
|
||||
|
|
|
@ -37,7 +37,7 @@ DOMPoint::Constructor(const GlobalObject& aGlobal, double aX, double aY,
|
|||
}
|
||||
|
||||
JSObject*
|
||||
DOMPoint::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
||||
DOMPoint::WrapObject(JSContext* aCx)
|
||||
{
|
||||
return DOMPointBinding::Wrap(aCx, aScope, this);
|
||||
return DOMPointBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
|
|
@ -63,8 +63,7 @@ public:
|
|||
double aZ, double aW, ErrorResult& aRV);
|
||||
|
||||
nsISupports* GetParentObject() const { return mParent; }
|
||||
virtual JSObject* WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
|
||||
|
||||
void SetX(double aX) { mX = aX; }
|
||||
void SetY(double aY) { mY = aY; }
|
||||
|
|
|
@ -40,9 +40,9 @@ DOMQuad::~DOMQuad()
|
|||
}
|
||||
|
||||
JSObject*
|
||||
DOMQuad::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
||||
DOMQuad::WrapObject(JSContext* aCx)
|
||||
{
|
||||
return DOMQuadBinding::Wrap(aCx, aScope, this);
|
||||
return DOMQuadBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
already_AddRefed<DOMQuad>
|
||||
|
|
|
@ -34,8 +34,7 @@ public:
|
|||
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(DOMQuad)
|
||||
|
||||
nsISupports* GetParentObject() const { return mParent; }
|
||||
virtual JSObject* WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
|
||||
|
||||
static already_AddRefed<DOMQuad>
|
||||
Constructor(const GlobalObject& aGlobal,
|
||||
|
|
|
@ -21,10 +21,10 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMRectReadOnly)
|
|||
NS_INTERFACE_MAP_END
|
||||
|
||||
JSObject*
|
||||
DOMRectReadOnly::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
||||
DOMRectReadOnly::WrapObject(JSContext* aCx)
|
||||
{
|
||||
MOZ_ASSERT(mParent);
|
||||
return DOMRectReadOnlyBinding::Wrap(aCx, aScope, this);
|
||||
return DOMRectReadOnlyBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
@ -47,10 +47,10 @@ FORWARD_GETTER(Width)
|
|||
FORWARD_GETTER(Height)
|
||||
|
||||
JSObject*
|
||||
DOMRect::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
||||
DOMRect::WrapObject(JSContext* aCx)
|
||||
{
|
||||
MOZ_ASSERT(mParent);
|
||||
return DOMRectBinding::Wrap(aCx, aScope, this);
|
||||
return DOMRectBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
already_AddRefed<DOMRect>
|
||||
|
@ -99,9 +99,9 @@ DOMRectList::Item(uint32_t aIndex, nsIDOMClientRect** aReturn)
|
|||
}
|
||||
|
||||
JSObject*
|
||||
DOMRectList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
|
||||
DOMRectList::WrapObject(JSContext *cx)
|
||||
{
|
||||
return mozilla::dom::DOMRectListBinding::Wrap(cx, scope, this);
|
||||
return mozilla::dom::DOMRectListBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
static double
|
||||
|
|
|
@ -43,8 +43,7 @@ public:
|
|||
MOZ_ASSERT(mParent);
|
||||
return mParent;
|
||||
}
|
||||
virtual JSObject* WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
|
||||
|
||||
virtual double X() const = 0;
|
||||
virtual double Y() const = 0;
|
||||
|
@ -99,8 +98,7 @@ public:
|
|||
Constructor(const GlobalObject& aGlobal, double aX, double aY,
|
||||
double aWidth, double aHeight, ErrorResult& aRV);
|
||||
|
||||
virtual JSObject* WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
|
||||
|
||||
void SetRect(float aX, float aY, float aWidth, float aHeight) {
|
||||
mX = aX; mY = aY; mWidth = aWidth; mHeight = aHeight;
|
||||
|
@ -159,8 +157,7 @@ public:
|
|||
|
||||
NS_DECL_NSIDOMCLIENTRECTLIST
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
nsISupports* GetParentObject()
|
||||
{
|
||||
|
|
|
@ -24,9 +24,9 @@ DOMStringList::~DOMStringList()
|
|||
}
|
||||
|
||||
JSObject*
|
||||
DOMStringList::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
||||
DOMStringList::WrapObject(JSContext* aCx)
|
||||
{
|
||||
return DOMStringListBinding::Wrap(aCx, aScope, this);
|
||||
return DOMStringListBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
} // namespace dom
|
||||
|
|
|
@ -27,7 +27,7 @@ public:
|
|||
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
||||
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMStringList)
|
||||
|
||||
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope);
|
||||
virtual JSObject* WrapObject(JSContext* aCx);
|
||||
nsISupports* GetParentObject()
|
||||
{
|
||||
return nullptr;
|
||||
|
|
|
@ -24,9 +24,9 @@ namespace mozilla {
|
|||
namespace dom {
|
||||
|
||||
JSObject*
|
||||
DocumentFragment::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
|
||||
DocumentFragment::WrapNode(JSContext *aCx)
|
||||
{
|
||||
return DocumentFragmentBinding::Wrap(aCx, aScope, this);
|
||||
return DocumentFragmentBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
bool
|
||||
|
|
|
@ -71,8 +71,7 @@ public:
|
|||
{
|
||||
}
|
||||
|
||||
virtual JSObject* WrapNode(JSContext *aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapNode(JSContext *aCx) MOZ_OVERRIDE;
|
||||
|
||||
// nsIContent
|
||||
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
|
||||
|
|
|
@ -60,9 +60,9 @@ namespace mozilla {
|
|||
namespace dom {
|
||||
|
||||
JSObject*
|
||||
DocumentType::WrapNode(JSContext *cx, JS::Handle<JSObject*> scope)
|
||||
DocumentType::WrapNode(JSContext *cx)
|
||||
{
|
||||
return DocumentTypeBinding::Wrap(cx, scope, this);
|
||||
return DocumentTypeBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
DocumentType::DocumentType(already_AddRefed<nsINodeInfo>& aNodeInfo,
|
||||
|
|
|
@ -77,8 +77,7 @@ public:
|
|||
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
|
||||
|
||||
protected:
|
||||
virtual JSObject* WrapNode(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapNode(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
nsString mPublicId;
|
||||
nsString mSystemId;
|
||||
|
|
|
@ -350,9 +350,9 @@ Element::GetBindingURL(nsIDocument *aDocument, css::URLValue **aResult)
|
|||
}
|
||||
|
||||
JSObject*
|
||||
Element::WrapObject(JSContext *aCx, JS::Handle<JSObject*> aScope)
|
||||
Element::WrapObject(JSContext *aCx)
|
||||
{
|
||||
JS::Rooted<JSObject*> obj(aCx, nsINode::WrapObject(aCx, aScope));
|
||||
JS::Rooted<JSObject*> obj(aCx, nsINode::WrapObject(aCx));
|
||||
if (!obj) {
|
||||
return nullptr;
|
||||
}
|
||||
|
|
|
@ -271,9 +271,9 @@ EventSource::Init(nsISupports* aOwner,
|
|||
}
|
||||
|
||||
/* virtual */ JSObject*
|
||||
EventSource::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
||||
EventSource::WrapObject(JSContext* aCx)
|
||||
{
|
||||
return EventSourceBinding::Wrap(aCx, aScope, this);
|
||||
return EventSourceBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
/* static */ already_AddRefed<EventSource>
|
||||
|
|
|
@ -59,8 +59,7 @@ public:
|
|||
NS_DECL_NSIINTERFACEREQUESTOR
|
||||
|
||||
// nsWrapperCache
|
||||
virtual JSObject* WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
|
||||
|
||||
// WebIDL
|
||||
nsPIDOMWindow*
|
||||
|
|
|
@ -380,9 +380,9 @@ NS_INTERFACE_TABLE_HEAD(nsChildContentList)
|
|||
NS_INTERFACE_MAP_END
|
||||
|
||||
JSObject*
|
||||
nsChildContentList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
|
||||
nsChildContentList::WrapObject(JSContext *cx)
|
||||
{
|
||||
return NodeListBinding::Wrap(cx, scope, this);
|
||||
return NodeListBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
|
|
@ -289,9 +289,9 @@ void NodeIterator::ContentRemoved(nsIDocument *aDocument,
|
|||
}
|
||||
|
||||
JSObject*
|
||||
NodeIterator::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
|
||||
NodeIterator::WrapObject(JSContext *cx)
|
||||
{
|
||||
return NodeIteratorBinding::Wrap(cx, scope, this);
|
||||
return NodeIteratorBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
} // namespace dom
|
||||
|
|
|
@ -70,7 +70,7 @@ public:
|
|||
}
|
||||
// The XPCOM Detach() is fine for our purposes
|
||||
|
||||
JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> scope);
|
||||
JSObject* WrapObject(JSContext *cx);
|
||||
|
||||
private:
|
||||
struct NodePointer {
|
||||
|
|
|
@ -97,9 +97,9 @@ ShadowRoot::~ShadowRoot()
|
|||
}
|
||||
|
||||
JSObject*
|
||||
ShadowRoot::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
||||
ShadowRoot::WrapObject(JSContext* aCx)
|
||||
{
|
||||
return mozilla::dom::ShadowRootBinding::Wrap(aCx, aScope, this);
|
||||
return mozilla::dom::ShadowRootBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
ShadowRoot*
|
||||
|
|
|
@ -105,7 +105,7 @@ public:
|
|||
nsIContent* GetPoolHost() { return mPoolHost; }
|
||||
nsTArray<HTMLShadowElement*>& ShadowDescendants() { return mShadowDescendants; }
|
||||
|
||||
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
|
||||
JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
|
||||
|
||||
static bool IsPooledNode(nsIContent* aChild, nsIContent* aContainer,
|
||||
nsIContent* aHost);
|
||||
|
|
|
@ -451,9 +451,9 @@ TreeWalker::NextSiblingInternal(bool aReversed, ErrorResult& aResult)
|
|||
}
|
||||
|
||||
JSObject*
|
||||
TreeWalker::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
|
||||
TreeWalker::WrapObject(JSContext *cx)
|
||||
{
|
||||
return TreeWalkerBinding::Wrap(cx, scope, this);
|
||||
return TreeWalkerBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
} // namespace dom
|
||||
|
|
|
@ -64,7 +64,7 @@ public:
|
|||
already_AddRefed<nsINode> PreviousNode(ErrorResult& aResult);
|
||||
already_AddRefed<nsINode> NextNode(ErrorResult& aResult);
|
||||
|
||||
JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> scope);
|
||||
JSObject* WrapObject(JSContext *cx);
|
||||
|
||||
private:
|
||||
nsCOMPtr<nsINode> mCurrentNode;
|
||||
|
|
|
@ -471,9 +471,9 @@ WebSocket::~WebSocket()
|
|||
}
|
||||
|
||||
JSObject*
|
||||
WebSocket::WrapObject(JSContext* cx, JS::Handle<JSObject*> scope)
|
||||
WebSocket::WrapObject(JSContext* cx)
|
||||
{
|
||||
return WebSocketBinding::Wrap(cx, scope, this);
|
||||
return WebSocketBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
|
|
@ -68,8 +68,7 @@ public:
|
|||
// nsWrapperCache
|
||||
nsPIDOMWindow* GetParentObject() { return GetOwner(); }
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
public: // static helpers:
|
||||
|
||||
|
|
|
@ -145,9 +145,9 @@ NS_IMPL_ADDREF_INHERITED(nsSimpleContentList, nsBaseContentList)
|
|||
NS_IMPL_RELEASE_INHERITED(nsSimpleContentList, nsBaseContentList)
|
||||
|
||||
JSObject*
|
||||
nsSimpleContentList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
|
||||
nsSimpleContentList::WrapObject(JSContext *cx)
|
||||
{
|
||||
return NodeListBinding::Wrap(cx, scope, this);
|
||||
return NodeListBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
// Hashtable for storing nsContentLists
|
||||
|
@ -268,16 +268,16 @@ const nsCacheableFuncStringContentList::ContentListType
|
|||
#endif
|
||||
|
||||
JSObject*
|
||||
nsCacheableFuncStringNodeList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
|
||||
nsCacheableFuncStringNodeList::WrapObject(JSContext *cx)
|
||||
{
|
||||
return NodeListBinding::Wrap(cx, scope, this);
|
||||
return NodeListBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
|
||||
JSObject*
|
||||
nsCacheableFuncStringHTMLCollection::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
|
||||
nsCacheableFuncStringHTMLCollection::WrapObject(JSContext *cx)
|
||||
{
|
||||
return HTMLCollectionBinding::Wrap(cx, scope, this);
|
||||
return HTMLCollectionBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
// Hashtable for storing nsCacheableFuncStringContentList
|
||||
|
@ -487,9 +487,9 @@ nsContentList::~nsContentList()
|
|||
}
|
||||
|
||||
JSObject*
|
||||
nsContentList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
|
||||
nsContentList::WrapObject(JSContext *cx)
|
||||
{
|
||||
return HTMLCollectionBinding::Wrap(cx, scope, this);
|
||||
return HTMLCollectionBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS_INHERITED3(nsContentList, nsBaseContentList,
|
||||
|
|
|
@ -92,7 +92,7 @@ public:
|
|||
|
||||
virtual int32_t IndexOf(nsIContent *aContent, bool aDoFlush);
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
|
||||
virtual JSObject* WrapObject(JSContext *cx)
|
||||
MOZ_OVERRIDE = 0;
|
||||
|
||||
void SetCapacity(uint32_t aCapacity)
|
||||
|
@ -128,8 +128,7 @@ public:
|
|||
{
|
||||
return mRoot;
|
||||
}
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
private:
|
||||
// This has to be a strong reference, the root might go away before the list.
|
||||
|
@ -253,8 +252,7 @@ public:
|
|||
|
||||
// nsWrapperCache
|
||||
using nsWrapperCache::GetWrapperPreserveColor;
|
||||
virtual JSObject* WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
|
||||
protected:
|
||||
virtual JSObject* GetWrapperPreserveColorInternal() MOZ_OVERRIDE
|
||||
{
|
||||
|
@ -536,8 +534,7 @@ public:
|
|||
#endif
|
||||
}
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
static const ContentListType sType;
|
||||
|
@ -561,8 +558,7 @@ public:
|
|||
#endif
|
||||
}
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
static const ContentListType sType;
|
||||
|
|
|
@ -199,10 +199,6 @@ nsIScriptSecurityManager *nsContentUtils::sSecurityManager;
|
|||
nsIParserService *nsContentUtils::sParserService = nullptr;
|
||||
nsNameSpaceManager *nsContentUtils::sNameSpaceManager;
|
||||
nsIIOService *nsContentUtils::sIOService;
|
||||
imgLoader *nsContentUtils::sImgLoader;
|
||||
imgLoader *nsContentUtils::sPrivateImgLoader;
|
||||
imgICache *nsContentUtils::sImgCache;
|
||||
imgICache *nsContentUtils::sPrivateImgCache;
|
||||
nsIConsoleService *nsContentUtils::sConsoleService;
|
||||
nsDataHashtable<nsISupportsHashKey, EventNameMapping>* nsContentUtils::sAtomEventTable = nullptr;
|
||||
nsDataHashtable<nsStringHashKey, EventNameMapping>* nsContentUtils::sStringEventTable = nullptr;
|
||||
|
@ -545,26 +541,6 @@ nsContentUtils::InitializeModifierStrings()
|
|||
sModifierSeparator = new nsString(modifierSeparator);
|
||||
}
|
||||
|
||||
bool nsContentUtils::sImgLoaderInitialized;
|
||||
|
||||
void
|
||||
nsContentUtils::InitImgLoader()
|
||||
{
|
||||
sImgLoaderInitialized = true;
|
||||
|
||||
// Ignore failure and just don't load images
|
||||
sImgLoader = imgLoader::Create();
|
||||
NS_ABORT_IF_FALSE(sImgLoader, "Creation should have succeeded");
|
||||
|
||||
sPrivateImgLoader = imgLoader::Create();
|
||||
NS_ABORT_IF_FALSE(sPrivateImgLoader, "Creation should have succeeded");
|
||||
|
||||
NS_ADDREF(sImgCache = sImgLoader);
|
||||
NS_ADDREF(sPrivateImgCache = sPrivateImgLoader);
|
||||
|
||||
sPrivateImgCache->RespectPrivacyNotifications();
|
||||
}
|
||||
|
||||
bool
|
||||
nsContentUtils::InitializeEventTable() {
|
||||
NS_ASSERTION(!sAtomEventTable, "EventTable already initialized!");
|
||||
|
@ -1463,10 +1439,6 @@ nsContentUtils::Shutdown()
|
|||
NS_IF_RELEASE(sIOService);
|
||||
NS_IF_RELEASE(sLineBreaker);
|
||||
NS_IF_RELEASE(sWordBreaker);
|
||||
NS_IF_RELEASE(sImgLoader);
|
||||
NS_IF_RELEASE(sPrivateImgLoader);
|
||||
NS_IF_RELEASE(sImgCache);
|
||||
NS_IF_RELEASE(sPrivateImgCache);
|
||||
#ifdef IBMBIDI
|
||||
NS_IF_RELEASE(sBidiKeyboard);
|
||||
#endif
|
||||
|
@ -2690,10 +2662,8 @@ nsContentUtils::CanLoadImage(nsIURI* aURI, nsISupports* aContext,
|
|||
imgLoader*
|
||||
nsContentUtils::GetImgLoaderForDocument(nsIDocument* aDoc)
|
||||
{
|
||||
if (!sImgLoaderInitialized)
|
||||
InitImgLoader();
|
||||
if (!aDoc)
|
||||
return sImgLoader;
|
||||
return imgLoader::Singleton();
|
||||
bool isPrivate = false;
|
||||
nsCOMPtr<nsILoadGroup> loadGroup = aDoc->GetDocumentLoadGroup();
|
||||
nsCOMPtr<nsIInterfaceRequestor> callbacks;
|
||||
|
@ -2707,29 +2677,24 @@ nsContentUtils::GetImgLoaderForDocument(nsIDocument* aDoc)
|
|||
nsCOMPtr<nsIChannel> channel = aDoc->GetChannel();
|
||||
isPrivate = channel && NS_UsePrivateBrowsing(channel);
|
||||
}
|
||||
return isPrivate ? sPrivateImgLoader : sImgLoader;
|
||||
return isPrivate ? imgLoader::PBSingleton() : imgLoader::Singleton();
|
||||
}
|
||||
|
||||
// static
|
||||
imgLoader*
|
||||
nsContentUtils::GetImgLoaderForChannel(nsIChannel* aChannel)
|
||||
{
|
||||
if (!sImgLoaderInitialized)
|
||||
InitImgLoader();
|
||||
if (!aChannel)
|
||||
return sImgLoader;
|
||||
return imgLoader::Singleton();
|
||||
nsCOMPtr<nsILoadContext> context;
|
||||
NS_QueryNotificationCallbacks(aChannel, context);
|
||||
return context && context->UsePrivateBrowsing() ? sPrivateImgLoader : sImgLoader;
|
||||
return context && context->UsePrivateBrowsing() ? imgLoader::PBSingleton() : imgLoader::Singleton();
|
||||
}
|
||||
|
||||
// static
|
||||
bool
|
||||
nsContentUtils::IsImageInCache(nsIURI* aURI, nsIDocument* aDocument)
|
||||
{
|
||||
if (!sImgLoaderInitialized)
|
||||
InitImgLoader();
|
||||
|
||||
imgILoader* loader = GetImgLoaderForDocument(aDocument);
|
||||
nsCOMPtr<imgICache> cache = do_QueryInterface(loader);
|
||||
|
||||
|
|
|
@ -553,7 +553,7 @@ nsDOMAttributeMap::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
|
|||
}
|
||||
|
||||
/* virtual */ JSObject*
|
||||
nsDOMAttributeMap::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
||||
nsDOMAttributeMap::WrapObject(JSContext* aCx)
|
||||
{
|
||||
return MozNamedAttrMapBinding::Wrap(aCx, aScope, this);
|
||||
return MozNamedAttrMapBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
|
|
@ -141,8 +141,7 @@ public:
|
|||
{
|
||||
return mContent;
|
||||
}
|
||||
virtual JSObject* WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
|
||||
|
||||
// WebIDL
|
||||
Attr* GetNamedItem(const nsAString& aAttrName);
|
||||
|
|
|
@ -57,9 +57,9 @@ nsDOMCaretPosition::GetClientRect() const
|
|||
}
|
||||
|
||||
JSObject*
|
||||
nsDOMCaretPosition::WrapObject(JSContext *aCx, JS::Handle<JSObject*> aScope)
|
||||
nsDOMCaretPosition::WrapObject(JSContext *aCx)
|
||||
{
|
||||
return mozilla::dom::CaretPositionBinding::Wrap(aCx, aScope, this);
|
||||
return mozilla::dom::CaretPositionBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(nsDOMCaretPosition,
|
||||
|
|
|
@ -85,7 +85,7 @@ public:
|
|||
return GetOffsetNode();
|
||||
}
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *aCx, JS::Handle<JSObject*> aScope)
|
||||
virtual JSObject* WrapObject(JSContext *aCx)
|
||||
MOZ_OVERRIDE MOZ_FINAL;
|
||||
|
||||
protected:
|
||||
|
|
|
@ -58,9 +58,9 @@ nsDOMDataChannel::~nsDOMDataChannel()
|
|||
}
|
||||
|
||||
/* virtual */ JSObject*
|
||||
nsDOMDataChannel::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
||||
nsDOMDataChannel::WrapObject(JSContext* aCx)
|
||||
{
|
||||
return DataChannelBinding::Wrap(aCx, aScope, this);
|
||||
return DataChannelBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_CLASS(nsDOMDataChannel)
|
||||
|
|
|
@ -39,7 +39,7 @@ public:
|
|||
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDOMDataChannel,
|
||||
mozilla::DOMEventTargetHelper)
|
||||
|
||||
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
||||
virtual JSObject* WrapObject(JSContext* aCx)
|
||||
MOZ_OVERRIDE;
|
||||
nsPIDOMWindow* GetParentObject() const
|
||||
{
|
||||
|
|
|
@ -741,9 +741,9 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMFileList)
|
|||
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMFileList)
|
||||
|
||||
JSObject*
|
||||
nsDOMFileList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
|
||||
nsDOMFileList::WrapObject(JSContext *cx)
|
||||
{
|
||||
return FileListBinding::Wrap(cx, scope, this);
|
||||
return FileListBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
|
|
@ -552,7 +552,7 @@ nsDOMFileReader::GetAsDataURL(nsIDOMBlob *aFile,
|
|||
}
|
||||
|
||||
/* virtual */ JSObject*
|
||||
nsDOMFileReader::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
||||
nsDOMFileReader::WrapObject(JSContext* aCx)
|
||||
{
|
||||
return FileReaderBinding::Wrap(aCx, aScope, this);
|
||||
return FileReaderBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
|
|
@ -61,8 +61,7 @@ public:
|
|||
{
|
||||
return GetOwner();
|
||||
}
|
||||
virtual JSObject* WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
|
||||
|
||||
// WebIDL
|
||||
static already_AddRefed<nsDOMFileReader>
|
||||
|
|
|
@ -46,10 +46,9 @@ public:
|
|||
return mOwner;
|
||||
}
|
||||
|
||||
virtual JSObject* WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
|
||||
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
|
||||
{
|
||||
return mozilla::dom::MutationRecordBinding::Wrap(aCx, aScope, this);
|
||||
return mozilla::dom::MutationRecordBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
||||
|
@ -360,10 +359,9 @@ public:
|
|||
mozilla::dom::MutationCallback& aCb,
|
||||
mozilla::ErrorResult& aRv);
|
||||
|
||||
virtual JSObject* WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
|
||||
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
|
||||
{
|
||||
return mozilla::dom::MutationObserverBinding::Wrap(aCx, aScope, this);
|
||||
return mozilla::dom::MutationObserverBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
nsISupports* GetParentObject() const
|
||||
|
|
|
@ -49,10 +49,9 @@ public:
|
|||
return mOwner;
|
||||
}
|
||||
|
||||
virtual JSObject* WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
|
||||
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
|
||||
{
|
||||
return mozilla::dom::XMLSerializerBinding::Wrap(aCx, aScope, this);
|
||||
return mozilla::dom::XMLSerializerBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
private:
|
||||
|
|
|
@ -21,7 +21,7 @@ nsDOMSettableTokenList::SetValue(const nsAString& aValue, mozilla::ErrorResult&
|
|||
}
|
||||
|
||||
JSObject*
|
||||
nsDOMSettableTokenList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
|
||||
nsDOMSettableTokenList::WrapObject(JSContext *cx)
|
||||
{
|
||||
return mozilla::dom::DOMSettableTokenListBinding::Wrap(cx, scope, this);
|
||||
return mozilla::dom::DOMSettableTokenListBinding::Wrap(cx, this);
|
||||
}
|
||||
|
|
|
@ -22,8 +22,7 @@ public:
|
|||
nsDOMSettableTokenList(mozilla::dom::Element* aElement, nsIAtom* aAttrAtom)
|
||||
: nsDOMTokenList(aElement, aAttrAtom) {}
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
// WebIDL
|
||||
void GetValue(nsAString& aResult) { Stringify(aResult); }
|
||||
|
|
|
@ -309,8 +309,8 @@ nsDOMTokenList::Stringify(nsAString& aResult)
|
|||
}
|
||||
|
||||
JSObject*
|
||||
nsDOMTokenList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
|
||||
nsDOMTokenList::WrapObject(JSContext *cx)
|
||||
{
|
||||
return DOMTokenListBinding::Wrap(cx, scope, this);
|
||||
return DOMTokenListBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
|
|
|
@ -37,8 +37,7 @@ public:
|
|||
|
||||
nsDOMTokenList(Element* aElement, nsIAtom* aAttrAtom);
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
Element* GetParentObject()
|
||||
{
|
||||
|
|
|
@ -12129,11 +12129,11 @@ nsDocument::Evaluate(const nsAString& aExpression, nsIDOMNode* aContextNode,
|
|||
// This is just a hack around the fact that window.document is not
|
||||
// [Unforgeable] yet.
|
||||
JSObject*
|
||||
nsIDocument::WrapObject(JSContext *aCx, JS::Handle<JSObject*> aScope)
|
||||
nsIDocument::WrapObject(JSContext *aCx)
|
||||
{
|
||||
MOZ_ASSERT(IsDOMBinding());
|
||||
|
||||
JS::Rooted<JSObject*> obj(aCx, nsINode::WrapObject(aCx, aScope));
|
||||
JS::Rooted<JSObject*> obj(aCx, nsINode::WrapObject(aCx));
|
||||
if (!obj) {
|
||||
return nullptr;
|
||||
}
|
||||
|
|
|
@ -101,9 +101,9 @@ nsFormData::Append(const nsAString& aName, nsIVariant* aValue)
|
|||
}
|
||||
|
||||
/* virtual */ JSObject*
|
||||
nsFormData::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
||||
nsFormData::WrapObject(JSContext* aCx)
|
||||
{
|
||||
return FormDataBinding::Wrap(aCx, aScope, this);
|
||||
return FormDataBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
/* static */ already_AddRefed<nsFormData>
|
||||
|
|
|
@ -42,8 +42,7 @@ public:
|
|||
NS_DECL_NSIXHRSENDABLE
|
||||
|
||||
// nsWrapperCache
|
||||
virtual JSObject* WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
|
||||
|
||||
// WebIDL
|
||||
nsISupports*
|
||||
|
|
|
@ -1428,6 +1428,7 @@ CheckForOutdatedParent(nsINode* aParent, nsINode* aNode)
|
|||
|
||||
if (js::GetGlobalForObjectCrossCompartment(existingObj) !=
|
||||
global->GetGlobalJSObject()) {
|
||||
JSAutoCompartment ac(cx, existingObj);
|
||||
nsresult rv = ReparentWrapper(cx, existingObj);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
}
|
||||
|
@ -2626,7 +2627,7 @@ nsINode::GetElementById(const nsAString& aId)
|
|||
}
|
||||
|
||||
JSObject*
|
||||
nsINode::WrapObject(JSContext *aCx, JS::Handle<JSObject*> aScope)
|
||||
nsINode::WrapObject(JSContext *aCx)
|
||||
{
|
||||
MOZ_ASSERT(IsDOMBinding());
|
||||
|
||||
|
@ -2647,7 +2648,7 @@ nsINode::WrapObject(JSContext *aCx, JS::Handle<JSObject*> aScope)
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
JS::Rooted<JSObject*> obj(aCx, WrapNode(aCx, aScope));
|
||||
JS::Rooted<JSObject*> obj(aCx, WrapNode(aCx));
|
||||
MOZ_ASSERT_IF(ChromeOnlyAccess(),
|
||||
xpc::IsInXBLScope(obj) || !xpc::UseXBLScope(js::GetObjectCompartment(obj)));
|
||||
return obj;
|
||||
|
|
|
@ -533,6 +533,7 @@ nsNodeUtils::CloneAndAdopt(nsINode *aNode, bool aClone, bool aDeep,
|
|||
JS::Rooted<JSObject*> wrapper(cx);
|
||||
if ((wrapper = aNode->GetWrapper())) {
|
||||
if (IsDOMObject(wrapper)) {
|
||||
JSAutoCompartment ac(cx, wrapper);
|
||||
rv = ReparentWrapper(cx, wrapper);
|
||||
} else {
|
||||
nsIXPConnect *xpc = nsContentUtils::XPConnect();
|
||||
|
|
|
@ -39,9 +39,9 @@ using namespace mozilla;
|
|||
using namespace mozilla::dom;
|
||||
|
||||
JSObject*
|
||||
nsRange::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
||||
nsRange::WrapObject(JSContext* aCx)
|
||||
{
|
||||
return RangeBinding::Wrap(aCx, aScope, this);
|
||||
return RangeBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
/******************************************************
|
||||
|
|
|
@ -219,8 +219,7 @@ public:
|
|||
already_AddRefed<DOMRectList> GetClientRects();
|
||||
|
||||
nsINode* GetParentObject() const { return mOwner; }
|
||||
virtual JSObject* WrapObject(JSContext* cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE MOZ_FINAL;
|
||||
virtual JSObject* WrapObject(JSContext* cx) MOZ_OVERRIDE MOZ_FINAL;
|
||||
|
||||
private:
|
||||
// no copy's or assigns
|
||||
|
|
|
@ -1333,12 +1333,16 @@ nsScriptLoader::OnStreamComplete(nsIStreamLoader* aLoader,
|
|||
} else {
|
||||
mPreloads.RemoveElement(request, PreloadRequestComparator());
|
||||
}
|
||||
rv = NS_OK;
|
||||
} else {
|
||||
NS_Free(const_cast<uint8_t *>(aString));
|
||||
rv = NS_SUCCESS_ADOPTED_DATA;
|
||||
}
|
||||
|
||||
// Process our request and/or any pending ones
|
||||
ProcessPendingRequests();
|
||||
|
||||
return NS_OK;
|
||||
return rv;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -100,9 +100,9 @@ NS_IMPL_ISUPPORTS_INHERITED3(nsTextNode, nsGenericDOMDataNode, nsIDOMNode,
|
|||
nsIDOMText, nsIDOMCharacterData)
|
||||
|
||||
JSObject*
|
||||
nsTextNode::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
|
||||
nsTextNode::WrapNode(JSContext *aCx)
|
||||
{
|
||||
return TextBinding::Wrap(aCx, aScope, this);
|
||||
return TextBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
bool
|
||||
|
|
|
@ -81,8 +81,7 @@ public:
|
|||
#endif
|
||||
|
||||
protected:
|
||||
virtual JSObject* WrapNode(JSContext *aCx,
|
||||
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapNode(JSContext *aCx) MOZ_OVERRIDE;
|
||||
};
|
||||
|
||||
#endif // nsTextNode_h
|
||||
|
|
|
@ -264,9 +264,9 @@ NS_IMPL_ADDREF_INHERITED(nsXMLHttpRequestUpload, nsXHREventTarget)
|
|||
NS_IMPL_RELEASE_INHERITED(nsXMLHttpRequestUpload, nsXHREventTarget)
|
||||
|
||||
/* virtual */ JSObject*
|
||||
nsXMLHttpRequestUpload::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
||||
nsXMLHttpRequestUpload::WrapObject(JSContext* aCx)
|
||||
{
|
||||
return XMLHttpRequestUploadBinding::Wrap(aCx, aScope, this);
|
||||
return XMLHttpRequestUploadBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////
|
||||
|
|
|
@ -147,8 +147,7 @@ public:
|
|||
NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsXHREventTarget)
|
||||
NS_DECL_NSIXMLHTTPREQUESTUPLOAD
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
nsISupports* GetParentObject()
|
||||
{
|
||||
return GetOwner();
|
||||
|
@ -182,10 +181,9 @@ public:
|
|||
nsXMLHttpRequest();
|
||||
virtual ~nsXMLHttpRequest();
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE
|
||||
{
|
||||
return mozilla::dom::XMLHttpRequestBinding::Wrap(cx, scope, this);
|
||||
return mozilla::dom::XMLHttpRequestBinding::Wrap(cx, this);
|
||||
}
|
||||
nsISupports* GetParentObject()
|
||||
{
|
||||
|
|
|
@ -53,9 +53,9 @@ public:
|
|||
// WebIDL
|
||||
void AddColorStop(float offset, const nsAString& colorstr, ErrorResult& rv);
|
||||
|
||||
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
|
||||
JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
|
||||
{
|
||||
return CanvasGradientBinding::Wrap(aCx, aScope, this);
|
||||
return CanvasGradientBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
CanvasRenderingContext2D* GetParentObject()
|
||||
|
|
|
@ -51,9 +51,9 @@ public:
|
|||
SetIsDOMBinding();
|
||||
}
|
||||
|
||||
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
|
||||
JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
|
||||
{
|
||||
return CanvasPatternBinding::Wrap(aCx, aScope, this);
|
||||
return CanvasPatternBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
CanvasRenderingContext2D* GetParentObject()
|
||||
|
|
|
@ -562,9 +562,9 @@ CanvasRenderingContext2D::~CanvasRenderingContext2D()
|
|||
}
|
||||
|
||||
JSObject*
|
||||
CanvasRenderingContext2D::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
|
||||
CanvasRenderingContext2D::WrapObject(JSContext *cx)
|
||||
{
|
||||
return CanvasRenderingContext2DBinding::Wrap(cx, scope, this);
|
||||
return CanvasRenderingContext2DBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
bool
|
||||
|
@ -4368,9 +4368,9 @@ CanvasPath::CanvasPath(nsCOMPtr<nsISupports> aParent, RefPtr<PathBuilder> aPathB
|
|||
}
|
||||
|
||||
JSObject*
|
||||
CanvasPath::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
|
||||
CanvasPath::WrapObject(JSContext* aCx)
|
||||
{
|
||||
return Path2DBinding::Wrap(aCx, aScope, this);
|
||||
return Path2DBinding::Wrap(aCx, this);
|
||||
}
|
||||
|
||||
already_AddRefed<CanvasPath>
|
||||
|
|
|
@ -54,7 +54,7 @@ public:
|
|||
|
||||
nsCOMPtr<nsISupports> GetParentObject() { return mParent; }
|
||||
|
||||
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope);
|
||||
JSObject* WrapObject(JSContext* aCx);
|
||||
|
||||
static already_AddRefed<CanvasPath> Constructor(const GlobalObject& aGlobal,
|
||||
ErrorResult& rv);
|
||||
|
@ -119,8 +119,7 @@ public:
|
|||
CanvasRenderingContext2D();
|
||||
virtual ~CanvasRenderingContext2D();
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
HTMLCanvasElement* GetCanvas() const
|
||||
{
|
||||
|
|
|
@ -105,9 +105,9 @@ ImageData::DropData()
|
|||
}
|
||||
|
||||
JSObject*
|
||||
ImageData::WrapObject(JSContext* cx, JS::Handle<JSObject*> scope)
|
||||
ImageData::WrapObject(JSContext* cx)
|
||||
{
|
||||
return ImageDataBinding::Wrap(cx, scope, this);
|
||||
return ImageDataBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
} // namespace dom
|
||||
|
|
|
@ -71,7 +71,7 @@ public:
|
|||
return mData;
|
||||
}
|
||||
|
||||
JSObject* WrapObject(JSContext* cx, JS::Handle<JSObject*> scope);
|
||||
JSObject* WrapObject(JSContext* cx);
|
||||
|
||||
private:
|
||||
void HoldData();
|
||||
|
|
|
@ -30,10 +30,9 @@ public:
|
|||
return width;
|
||||
}
|
||||
|
||||
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope,
|
||||
bool* aTookOwnership)
|
||||
JSObject* WrapObject(JSContext* aCx, bool* aTookOwnership)
|
||||
{
|
||||
return TextMetricsBinding::Wrap(aCx, aScope, this, aTookOwnership);
|
||||
return TextMetricsBinding::Wrap(aCx, this, aTookOwnership);
|
||||
}
|
||||
|
||||
private:
|
||||
|
|
|
@ -29,9 +29,9 @@ WebGL1Context::~WebGL1Context()
|
|||
// IMPLEMENT nsWrapperCache
|
||||
|
||||
JSObject*
|
||||
WebGL1Context::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
|
||||
WebGL1Context::WrapObject(JSContext *cx)
|
||||
{
|
||||
return dom::WebGLRenderingContextBinding::Wrap(cx, scope, this);
|
||||
return dom::WebGLRenderingContextBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -36,8 +36,7 @@ public:
|
|||
// -------------------------------------------------------------------------
|
||||
// IMPLEMENT nsWrapperCache
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
|
||||
};
|
||||
|
|
|
@ -48,9 +48,9 @@ WebGL2Context::Create()
|
|||
// IMPLEMENT nsWrapperCache
|
||||
|
||||
JSObject*
|
||||
WebGL2Context::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
|
||||
WebGL2Context::WrapObject(JSContext *cx)
|
||||
{
|
||||
return dom::WebGL2RenderingContextBinding::Wrap(cx, scope, this);
|
||||
return dom::WebGL2RenderingContextBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -43,8 +43,7 @@ public:
|
|||
// -------------------------------------------------------------------------
|
||||
// IMPLEMENT nsWrapperCache
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
|
|
@ -10,6 +10,6 @@
|
|||
using namespace mozilla;
|
||||
|
||||
JSObject*
|
||||
WebGLActiveInfo::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope) {
|
||||
return dom::WebGLActiveInfoBinding::Wrap(cx, scope, this);
|
||||
WebGLActiveInfo::WrapObject(JSContext *cx) {
|
||||
return dom::WebGLActiveInfoBinding::Wrap(cx, this);
|
||||
}
|
||||
|
|
|
@ -35,7 +35,7 @@ public:
|
|||
retval = mName;
|
||||
}
|
||||
|
||||
JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> scope);
|
||||
JSObject* WrapObject(JSContext *cx);
|
||||
|
||||
NS_INLINE_DECL_REFCOUNTING(WebGLActiveInfo)
|
||||
|
||||
|
|
|
@ -74,8 +74,8 @@ WebGLBuffer::Validate(GLenum type, uint32_t max_allowed,
|
|||
|
||||
|
||||
JSObject*
|
||||
WebGLBuffer::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope) {
|
||||
return dom::WebGLBufferBinding::Wrap(cx, scope, this);
|
||||
WebGLBuffer::WrapObject(JSContext *cx) {
|
||||
return dom::WebGLBufferBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(WebGLBuffer)
|
||||
|
|
|
@ -53,8 +53,7 @@ public:
|
|||
return Context();
|
||||
}
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLBuffer)
|
||||
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLBuffer)
|
||||
|
|
|
@ -152,8 +152,7 @@ public:
|
|||
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(WebGLContext,
|
||||
nsIDOMWebGLRenderingContext)
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) = 0;
|
||||
virtual JSObject* WrapObject(JSContext *cx) = 0;
|
||||
|
||||
NS_DECL_NSIDOMWEBGLRENDERINGCONTEXT
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ WebGLContext::WebGLObjectAsJSValue(JSContext *cx, const WebGLObjectType *object,
|
|||
JS::Rooted<JS::Value> v(cx);
|
||||
JS::Rooted<JSObject*> wrapper(cx, GetWrapper());
|
||||
JSAutoCompartment ac(cx, wrapper);
|
||||
if (!dom::WrapNewBindingObject(cx, wrapper, const_cast<WebGLObjectType*>(object), &v)) {
|
||||
if (!dom::WrapNewBindingObject(cx, const_cast<WebGLObjectType*>(object), &v)) {
|
||||
rv.Throw(NS_ERROR_FAILURE);
|
||||
return JS::NullValue();
|
||||
}
|
||||
|
|
|
@ -40,13 +40,12 @@ protected:
|
|||
};
|
||||
|
||||
#define DECL_WEBGL_EXTENSION_GOOP \
|
||||
virtual JSObject* WrapObject(JSContext *cx, \
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
#define IMPL_WEBGL_EXTENSION_GOOP(WebGLExtensionType) \
|
||||
JSObject* \
|
||||
WebGLExtensionType::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope) { \
|
||||
return dom::WebGLExtensionType##Binding::Wrap(cx, scope, this); \
|
||||
WebGLExtensionType::WrapObject(JSContext *cx) { \
|
||||
return dom::WebGLExtensionType##Binding::Wrap(cx, this); \
|
||||
}
|
||||
|
||||
class WebGLExtensionCompressedTextureATC
|
||||
|
|
|
@ -18,9 +18,9 @@ using namespace mozilla;
|
|||
using namespace mozilla::gl;
|
||||
|
||||
JSObject*
|
||||
WebGLFramebuffer::WrapObject(JSContext* cx, JS::Handle<JSObject*> scope)
|
||||
WebGLFramebuffer::WrapObject(JSContext* cx)
|
||||
{
|
||||
return dom::WebGLFramebufferBinding::Wrap(cx, scope, this);
|
||||
return dom::WebGLFramebufferBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
WebGLFramebuffer::WebGLFramebuffer(WebGLContext* context)
|
||||
|
|
|
@ -163,8 +163,7 @@ public:
|
|||
|
||||
void FinalizeAttachments() const;
|
||||
|
||||
virtual JSObject* WrapObject(JSContext* cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext* cx) MOZ_OVERRIDE;
|
||||
|
||||
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLFramebuffer)
|
||||
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLFramebuffer)
|
||||
|
|
|
@ -45,8 +45,8 @@ static bool SplitLastSquareBracket(nsACString& string, nsCString& bracketPart)
|
|||
}
|
||||
|
||||
JSObject*
|
||||
WebGLProgram::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope) {
|
||||
return dom::WebGLProgramBinding::Wrap(cx, scope, this);
|
||||
WebGLProgram::WrapObject(JSContext *cx) {
|
||||
return dom::WebGLProgramBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
WebGLProgram::WebGLProgram(WebGLContext *context)
|
||||
|
|
|
@ -104,8 +104,7 @@ public:
|
|||
return Context();
|
||||
}
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLProgram)
|
||||
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLProgram)
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
using namespace mozilla;
|
||||
|
||||
JSObject*
|
||||
WebGLQuery::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope) {
|
||||
return dom::WebGLQueryBinding::Wrap(cx, scope, this);
|
||||
WebGLQuery::WrapObject(JSContext *cx) {
|
||||
return dom::WebGLQueryBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
WebGLQuery::WebGLQuery(WebGLContext* context)
|
||||
|
|
|
@ -58,8 +58,7 @@ public:
|
|||
|
||||
// -------------------------------------------------------------------------
|
||||
// IMPLEMENT NS
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLQuery)
|
||||
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLQuery)
|
||||
|
|
|
@ -38,8 +38,8 @@ NeedsDepthStencilEmu(GLContext* gl, GLenum internalFormat) {
|
|||
}
|
||||
|
||||
JSObject*
|
||||
WebGLRenderbuffer::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope) {
|
||||
return dom::WebGLRenderbufferBinding::Wrap(cx, scope, this);
|
||||
WebGLRenderbuffer::WrapObject(JSContext *cx) {
|
||||
return dom::WebGLRenderbufferBinding::Wrap(cx, this);
|
||||
}
|
||||
|
||||
WebGLRenderbuffer::WebGLRenderbuffer(WebGLContext *context)
|
||||
|
|
|
@ -61,8 +61,7 @@ public:
|
|||
// Only handles a subset of `pname`s.
|
||||
GLint GetRenderbufferParameter(GLenum target, GLenum pname) const;
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
|
||||
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
|
||||
|
||||
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLRenderbuffer)
|
||||
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLRenderbuffer)
|
||||
|
|
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче