Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 08:12:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge inbound to m-c a=merge CLOSED TREE

Browse Source
This commit is contained in:
Wes Kocher 2015-03-19 19:15:11 -07:00
commit d2c452e653
1145 changed files with 4298 additions and 2744 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
accessible/base/MarkupMap.h
View File

@ -205,22 +205,22 @@ MARKUPMAP(mmultiscripts_,
roles::MATHML_MULTISCRIPTS)
MARKUPMAP(mtable_,
New_HyperText,
New_HTMLTableAccessible,
roles::MATHML_TABLE,
AttrFromDOM(align, align),
AttrFromDOM(columnlines_, columnlines_),
AttrFromDOM(rowlines_, rowlines_))
MARKUPMAP(mlabeledtr_,
New_HyperText,
New_HTMLTableRowAccessible,
roles::MATHML_LABELED_ROW)
MARKUPMAP(mtr_,
New_HyperText,
New_HTMLTableRowAccessible,
roles::MATHML_TABLE_ROW)
MARKUPMAP(mtd_,
New_HyperText,
New_HTMLTableCellAccessible,
roles::MATHML_CELL)
MARKUPMAP(maction_,

12
accessible/base/nsAccessibilityService.cpp
View File

@ -200,6 +200,18 @@ static Accessible* New_HTMLOutput(nsIContent* aContent, Accessible* aContext)
static Accessible* New_HTMLProgress(nsIContent* aContent, Accessible* aContext)
{ return new HTMLProgressMeterAccessible(aContent, aContext->Document()); }
static Accessible*
New_HTMLTableAccessible(nsIContent* aContent, Accessible* aContext)
{ return new HTMLTableAccessible(aContent, aContext->Document()); }
static Accessible*
New_HTMLTableRowAccessible(nsIContent* aContent, Accessible* aContext)
{ return new HTMLTableRowAccessible(aContent, aContext->Document()); }
static Accessible*
New_HTMLTableCellAccessible(nsIContent* aContent, Accessible* aContext)
{ return new HTMLTableCellAccessible(aContent, aContext->Document()); }
static Accessible*
New_HTMLTableHeaderCell(nsIContent* aContent, Accessible* aContext)
{

19
accessible/html/HTMLTableAccessible.cpp
View File

@ -60,6 +60,9 @@ NS_IMPL_ISUPPORTS_INHERITED0(HTMLTableCellAccessible, HyperTextAccessible)
role
HTMLTableCellAccessible::NativeRole()
{
if (mContent->IsMathMLElement(nsGkAtoms::mtd_)) {
return roles::MATHML_CELL;
}
return roles::CELL;
}
@ -148,8 +151,7 @@ HTMLTableCellAccessible::Table() const
{
Accessible* parent = const_cast<HTMLTableCellAccessible*>(this);
while ((parent = parent->Parent())) {
roles::Role role = parent->Role();
if (role == roles::TABLE || role == roles::TREE_TABLE)
if (parent->IsTable())
return parent->AsTable();
}
@ -349,6 +351,11 @@ NS_IMPL_ISUPPORTS_INHERITED0(HTMLTableRowAccessible, Accessible)
role
HTMLTableRowAccessible::NativeRole()
{
if (mContent->IsMathMLElement(nsGkAtoms::mtr_)) {
return roles::MATHML_TABLE_ROW;
} else if (mContent->IsMathMLElement(nsGkAtoms::mlabeledtr_)) {
return roles::MATHML_LABELED_ROW;
}
return roles::ROW;
}
@ -384,6 +391,9 @@ HTMLTableAccessible::CacheChildren()
role
HTMLTableAccessible::NativeRole()
{
if (mContent->IsMathMLElement(nsGkAtoms::mtable_)) {
return roles::MATHML_TABLE;
}
return roles::TABLE;
}
@ -421,6 +431,11 @@ HTMLTableAccessible::NativeAttributes()
{
nsCOMPtr<nsIPersistentProperties> attributes =
AccessibleWrap::NativeAttributes();
if (mContent->IsMathMLElement(nsGkAtoms::mtable_)) {
GetAccService()->MarkupAttributes(mContent, attributes);
}
if (IsProbablyLayoutTable()) {
nsAutoString unused;
attributes->SetStringProperty(NS_LITERAL_CSTRING("layout-guess"),

29
accessible/tests/mochitest/table.js
View File

@ -27,6 +27,13 @@ const kNoColumnHeader = 0;
const kListboxColumnHeader = 1;
const kTreeColumnHeader = 2;
/**
* Constants to define table type.
*/
const kTable = 0;
const kTreeTable = 1;
const kMathTable = 2;
/**
* Test table structure and related methods.
*
@ -37,10 +44,11 @@ const kTreeColumnHeader = 2;
* arranged into the list.
* @param aCaption [in] caption text if any
* @param aSummary [in] summary text if any
* @param aIsTreeTable [in] specifies whether given table is tree table
* @param aTableType [in] specifies the table type.
* @param aRowRoles [in] array of row roles.
*/
function testTableStruct(aIdentifier, aCellsArray, aColHeaderType,
aCaption, aSummary, aIsTreeTable)
aCaption, aSummary, aTableType, aRowRoles)
{
var tableNode = getNode(aIdentifier);
var isGrid = tableNode.getAttribute("role") == "grid" ||
@ -52,9 +60,19 @@ function testTableStruct(aIdentifier, aCellsArray, aColHeaderType,
// Test table accessible tree.
var tableObj = {
role: aIsTreeTable ? ROLE_TREE_TABLE : ROLE_TABLE,
children: []
};
switch (aTableType) {
case kTable:
tableObj.role = ROLE_TABLE;
break;
case kTreeTable:
tableObj.role = ROLE_TREE_TABLE;
break;
case kMathTable:
tableObj.role = ROLE_MATHML_TABLE;
break;
}
// caption accessible handling
if (aCaption) {
@ -99,7 +117,7 @@ function testTableStruct(aIdentifier, aCellsArray, aColHeaderType,
// rows and cells accessibles
for (var rowIdx = 0; rowIdx < rowCount; rowIdx++) {
var rowObj = {
role: ROLE_ROW,
role: aRowRoles ? aRowRoles[rowIdx] : ROLE_ROW,
children: []
};
@ -109,7 +127,8 @@ function testTableStruct(aIdentifier, aCellsArray, aColHeaderType,
var role = ROLE_NOTHING;
switch (celltype) {
case kDataCell:
role = (isGrid ? ROLE_GRID_CELL : ROLE_CELL);
role = (aTableType == kMathTable ? ROLE_MATHML_CELL :
(isGrid ? ROLE_GRID_CELL : ROLE_CELL));
break;
case kRowHeaderCell:
role = ROLE_ROWHEADER;

1
accessible/tests/mochitest/table/a11y.ini
View File

@ -9,6 +9,7 @@
[test_indexes_table.html]
[test_indexes_tree.xul]
[test_layoutguess.html]
[test_mtable.html]
[test_sels_ariagrid.html]
[test_sels_listbox.xul]
[test_sels_table.html]

128
accessible/tests/mochitest/table/test_mtable.html Normal file
View File

@ -0,0 +1,128 @@
<!DOCTYPE html>
<html>
<head>
<title>MathML table tests</title>
<link rel="stylesheet" type="text/css"
href="chrome://mochikit/content/tests/SimpleTest/test.css" />
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript"
src="../common.js"></script>
<script type="application/javascript"
src="../role.js"></script>
<script type="application/javascript"
src="../table.js"></script>
<script type="application/javascript">
function doTest()
{
// 'Simple' table
var idxes = [
[0, 1],
[2, 3]
];
testTableIndexes("simple", idxes);
var cellsArray = [
[kDataCell, kDataCell],
[kDataCell, kDataCell]
];
var rowsArray = [ROLE_MATHML_TABLE_ROW, ROLE_MATHML_TABLE_ROW];
testTableStruct("simple", cellsArray, kNoColumnHeader,
"", "", kMathTable, rowsArray);
// 'Complex' table
idxes = [
[0, 0, 0],
[1, 1, 2],
[1, 1, 3]
];
testTableIndexes("complex", idxes);
cellsArray = [
[kDataCell, kColSpanned, kColSpanned],
[kDataCell, kColSpanned, kDataCell],
[kRowSpanned, kSpanned, kDataCell],
];
rowsArray = [
ROLE_MATHML_TABLE_ROW,
ROLE_MATHML_TABLE_ROW,
ROLE_MATHML_TABLE_ROW
];
testTableStruct("complex", cellsArray, kNoColumnHeader,
"", "", kMathTable, rowsArray);
// 'Simple' table with mlabeledtr
// At the moment we do not implement mlabeledtr but just hide the label
// with display: none. Thus we just test the role for now. See bug 689641.
var idxes = [[0]];
testTableIndexes("simple_label", idxes);
var cellsArray = [[kDataCell]];
rowsArray = [ROLE_MATHML_LABELED_ROW];
testTableStruct("simple_label", cellsArray, kNoColumnHeader,
"", "", kMathTable, rowsArray);
SimpleTest.finish();
}
SimpleTest.waitForExplicitFinish();
addA11yLoadEvent(doTest);
</script>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
</pre>
<math>
<mtable id="simple">
<mtr>
<mtd>
<mn>1</mn>
</mtd>
<mtd>
<mn>0</mn>
</mtd>
</mtr>
<mtr>
<mtd>
<mn>0</mn>
</mtd>
<mtd>
<mn>1</mn>
</mtd>
</mtr>
</mtable>
<mtable id="complex">
<mtr>
<mtd columnspan="3">
<mtext>1 x 3</mtext>
</mtd>
</mtr>
<mtr>
<mtd rowspan="2" columnspan="2">
<mtext>2 x 2</mtext>
</mtd>
<mtd>
<mtext>1 x 1</mtext>
</mtd>
</mtr>
<mtr>
<mtd>
<mtext>1 x 1</mtext>
</mtd>
</mtr>
</mtable>
<mtable id="simple_label">
<mlabeledtr>
<mtd><mtext>1</mtext></mtd>
<mtd><mtext>label</mtext></mtd>
</mlabeledtr>
</mtable>
</math>
</body>
</html>

3
accessible/tests/mochitest/table/test_struct_ariatreegrid.html
View File

@ -28,7 +28,8 @@
[kDataCell, kDataCell, kDataCell]
];
testTableStruct("treegrid", cellsArray, kNoColumnHeader, "", "", true);
testTableStruct("treegrid", cellsArray, kNoColumnHeader, "", "",
kTreeTable);
SimpleTest.finish();
}

6
b2g/components/Frames.jsm
View File

@ -25,7 +25,7 @@ const Observer = {
start: function () {
Services.obs.addObserver(this, 'remote-browser-shown', false);
Services.obs.addObserver(this, 'inprocess-browser-shown', false);
Services.obs.addObserver(this, 'message-manager-disconnect', false);
Services.obs.addObserver(this, 'message-manager-close', false);
SystemAppProxy.getFrames().forEach(frame => {
let mm = frame.QueryInterface(Ci.nsIFrameLoaderOwner).frameLoader.messageManager;
@ -40,7 +40,7 @@ const Observer = {
stop: function () {
Services.obs.removeObserver(this, 'remote-browser-shown');
Services.obs.removeObserver(this, 'inprocess-browser-shown');
Services.obs.removeObserver(this, 'message-manager-disconnect');
Services.obs.removeObserver(this, 'message-manager-close');
this._frames.clear();
this._apps.clear();
},
@ -61,7 +61,7 @@ const Observer = {
break;
// Every time an iframe is destroyed, its message manager also is
case 'message-manager-disconnect':
case 'message-manager-close':
this.onMessageManagerDestroyed(subject);
break;
}

2
browser/components/sessionstore/content/content-sessionStore.js
View File

@ -754,7 +754,7 @@ function handleRevivedTab() {
// won't be sent or received. The child-process message manager works though,
// despite the fact that we're really running in the parent process.
let browser = docShell.chromeEventHandler;
cpmm.sendSyncMessage("SessionStore:RemoteTabRevived", null, {browser: browser});
cpmm.sendAsyncMessage("SessionStore:RemoteTabRevived", null, {browser: browser});
}
}

2
browser/components/sessionstore/test/browser.ini
View File

@ -72,7 +72,7 @@ support-files =
[browser_cleaner.js]
[browser_cookies.js]
[browser_crashedTabs.js]
skip-if = !e10s || os == "linux" # Waiting on OMTC enabled by default on Linux (Bug 994541)
skip-if = !e10s || !crashreporter
[browser_dying_cache.js]
[browser_dynamic_frames.js]
[browser_form_restore_events.js]

3
browser/components/sessionstore/test/browser_crashedTabs.js
View File

@ -15,6 +15,9 @@ registerCleanupFunction(() => {
// Allow tabs to restore on demand so we can test pending states
Services.prefs.clearUserPref("browser.sessionstore.restore_on_demand");
// Running this test in ASAN is slow.
requestLongerTimeout(2);
/**
* Returns a Promise that resolves once a remote <xul:browser> has experienced
* a crash. Also does the job of cleaning up the minidump of the crash.

4
browser/components/uitour/UITour.jsm
View File

@ -684,7 +684,7 @@ this.UITour = {
}
this.tourBrowsersByWindow.get(window).add(browser);
Services.obs.addObserver(this, "message-manager-disconnect", false);
Services.obs.addObserver(this, "message-manager-close", false);
window.addEventListener("SSWindowClosing", this);
@ -736,7 +736,7 @@ this.UITour = {
switch (aTopic) {
// The browser message manager is disconnected when the <browser> is
// destroyed and we want to teardown at that point.
case "message-manager-disconnect": {
case "message-manager-close": {
let winEnum = Services.wm.getEnumerator("navigator:browser");
while (winEnum.hasMoreElements()) {
let window = winEnum.getNext();

19
browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_keys.js
View File

@ -50,9 +50,9 @@ let consoleOpened = Task.async(function*(aHud) {
// 4 values, and the following properties:
// __defineGetter__ __defineSetter__ __lookupGetter__ __lookupSetter__
// hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString
// toSource unwatch valueOf watch constructor.
is(popup.itemCount, 18, "popup.itemCount is correct");
// __proto__ hasOwnProperty isPrototypeOf propertyIsEnumerable
// toLocaleString toString toSource unwatch valueOf watch constructor.
is(popup.itemCount, 19, "popup.itemCount is correct");
let sameItems = popup.getItems().reverse().map(function(e) {return e.label;});
ok(sameItems.every(function(prop, index) {
@ -61,6 +61,7 @@ let consoleOpened = Task.async(function*(aHud) {
"__defineSetter__",
"__lookupGetter__",
"__lookupSetter__",
"__proto__",
"constructor",
"hasOwnProperty",
"isPrototypeOf",
@ -77,7 +78,7 @@ let consoleOpened = Task.async(function*(aHud) {
"watch",
][index] === prop}), "getItems returns the items we expect");
is(popup.selectedIndex, 17,
is(popup.selectedIndex, 18,
"Index of the first item from bottom is selected.");
EventUtils.synthesizeKey("VK_DOWN", {});
@ -115,7 +116,7 @@ let consoleOpened = Task.async(function*(aHud) {
ok(popup.selectedIndex < currentSelectionIndex, "Index is less after Page UP");
EventUtils.synthesizeKey("VK_END", {});
is(popup.selectedIndex, 17, "index is last after End");
is(popup.selectedIndex, 18, "index is last after End");
EventUtils.synthesizeKey("VK_HOME", {});
is(popup.selectedIndex, 0, "index is first after Home");
@ -152,9 +153,9 @@ function popupHideAfterTab()
ok(popup.isOpen, "popup is open");
is(popup.itemCount, 18, "popup.itemCount is correct");
is(popup.itemCount, 19, "popup.itemCount is correct");
is(popup.selectedIndex, 17, "First index from bottom is selected");
is(popup.selectedIndex, 18, "First index from bottom is selected");
EventUtils.synthesizeKey("VK_DOWN", {});
let prefix = jsterm.inputNode.value.replace(/[\S]/g, " ");
@ -201,9 +202,9 @@ function testReturnKey()
ok(popup.isOpen, "popup is open");
is(popup.itemCount, 18, "popup.itemCount is correct");
is(popup.itemCount, 19, "popup.itemCount is correct");
is(popup.selectedIndex, 17, "First index from bottom is selected");
is(popup.selectedIndex, 18, "First index from bottom is selected");
EventUtils.synthesizeKey("VK_DOWN", {});
let prefix = jsterm.inputNode.value.replace(/[\S]/g, " ");

4
build/autoconf/toolchain.m4
View File

@ -101,9 +101,9 @@ AC_SUBST(CLANG_CXX)
AC_SUBST(CLANG_CL)
if test -n "$GNU_CC" -a -z "$CLANG_CC" ; then
if test "$GCC_MAJOR_VERSION" -eq 4 -a "$GCC_MINOR_VERSION" -lt 6 ||
if test "$GCC_MAJOR_VERSION" -eq 4 -a "$GCC_MINOR_VERSION" -lt 7 ||
test "$GCC_MAJOR_VERSION" -lt 4; then
AC_MSG_ERROR([Only GCC 4.6 or newer supported])
AC_MSG_ERROR([Only GCC 4.7 or newer supported])
fi
fi
])

4
dom/activities/Activity.cpp
View File

@ -25,9 +25,9 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(Activity, DOMRequest)
NS_IMPL_CYCLE_COLLECTION_TRACE_END
/* virtual */ JSObject*
Activity::WrapObject(JSContext* aCx)
Activity::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return MozActivityBinding::Wrap(aCx, this);
return MozActivityBinding::Wrap(aCx, this, aGivenProto);
}
nsresult

2
dom/activities/Activity.h
View File

@ -21,7 +21,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(Activity, DOMRequest)
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
static already_AddRefed<Activity>
Constructor(const GlobalObject& aOwner,

4
dom/animation/Animation.cpp
View File

@ -66,9 +66,9 @@ NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(Animation, AddRef)
NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(Animation, Release)
JSObject*
Animation::WrapObject(JSContext* aCx)
Animation::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return AnimationBinding::Wrap(aCx, this);
return AnimationBinding::Wrap(aCx, this, aGivenProto);
}
already_AddRefed<AnimationEffect>

2
dom/animation/Animation.h
View File

@ -189,7 +189,7 @@ public:
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(Animation)
nsIDocument* GetParentObject() const { return mDocument; }
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
// FIXME: If we succeed in moving transition-specific code to a type of
// AnimationEffect (as per the Web Animations API) we should remove these

4
dom/animation/AnimationEffect.cpp
View File

@ -15,9 +15,9 @@ NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(AnimationEffect, AddRef)
NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(AnimationEffect, Release)
JSObject*
AnimationEffect::WrapObject(JSContext* aCx)
AnimationEffect::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return AnimationEffectBinding::Wrap(aCx, this);
return AnimationEffectBinding::Wrap(aCx, this, aGivenProto);
}
} // namespace dom

2
dom/animation/AnimationEffect.h
View File

@ -27,7 +27,7 @@ public:
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(AnimationEffect)
Animation* GetParentObject() const { return mAnimation; }
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
// AnimationEffect interface
void GetName(nsString& aRetVal) const {

4
dom/animation/AnimationPlayer.cpp
View File

@ -26,9 +26,9 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AnimationPlayer)
NS_INTERFACE_MAP_END
JSObject*
AnimationPlayer::WrapObject(JSContext* aCx)
AnimationPlayer::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return dom::AnimationPlayerBinding::Wrap(aCx, this);
return dom::AnimationPlayerBinding::Wrap(aCx, this, aGivenProto);
}
void

2
dom/animation/AnimationPlayer.h
View File

@ -64,7 +64,7 @@ public:
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(AnimationPlayer)
AnimationTimeline* GetParentObject() const { return mTimeline; }
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
virtual CSSAnimationPlayer* AsCSSAnimationPlayer() { return nullptr; }
virtual CSSTransitionPlayer* AsCSSTransitionPlayer() { return nullptr; }

4
dom/animation/AnimationTimeline.cpp
View File

@ -21,9 +21,9 @@ NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(AnimationTimeline, AddRef)
NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(AnimationTimeline, Release)
JSObject*
AnimationTimeline::WrapObject(JSContext* aCx)
AnimationTimeline::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return AnimationTimelineBinding::Wrap(aCx, this);
return AnimationTimelineBinding::Wrap(aCx, this, aGivenProto);
}
Nullable<TimeDuration>

2
dom/animation/AnimationTimeline.h
View File

@ -41,7 +41,7 @@ public:
{
return mWindow;
}
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
// AnimationTimeline methods
Nullable<TimeDuration> GetCurrentTime() const;

4
dom/archivereader/ArchiveReader.cpp
View File

@ -61,9 +61,9 @@ ArchiveReader::~ArchiveReader()
}
/* virtual */ JSObject*
ArchiveReader::WrapObject(JSContext* aCx)
ArchiveReader::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return ArchiveReaderBinding::Wrap(aCx, this);
return ArchiveReaderBinding::Wrap(aCx, this, aGivenProto);
}
nsresult

2
dom/archivereader/ArchiveReader.h
View File

@ -51,7 +51,7 @@ public:
return mWindow;
}
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
already_AddRefed<ArchiveRequest> GetFilenames();
already_AddRefed<ArchiveRequest> GetFile(const nsAString& filename);

4
dom/archivereader/ArchiveRequest.cpp
View File

@ -77,9 +77,9 @@ ArchiveRequest::PreHandleEvent(EventChainPreVisitor& aVisitor)
}
/* virtual */ JSObject*
ArchiveRequest::WrapObject(JSContext* aCx)
ArchiveRequest::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return ArchiveRequestBinding::Wrap(aCx, this);
return ArchiveRequestBinding::Wrap(aCx, this, aGivenProto);
}
ArchiveReader*

2
dom/archivereader/ArchiveRequest.h
View File

@ -26,7 +26,7 @@ BEGIN_ARCHIVEREADER_NAMESPACE
class ArchiveRequest : public mozilla::dom::DOMRequest
{
public:
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
ArchiveReader* Reader() const;

3
dom/base/AnonymousContent.cpp
View File

@ -131,9 +131,10 @@ AnonymousContent::GetElementById(const nsAString& aElementId)
bool
AnonymousContent::WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aGivenProto,
JS::MutableHandle<JSObject*> aReflector)
{
return AnonymousContentBinding::Wrap(aCx, this, aReflector);
return AnonymousContentBinding::Wrap(aCx, this, aGivenProto, aReflector);
}
} // dom namespace

2
dom/base/AnonymousContent.h
View File

@ -27,7 +27,7 @@ public:
explicit AnonymousContent(Element* aContentNode);
nsCOMPtr<Element> GetContentNode();
void SetContentNode(Element* aContentNode);
bool WrapObject(JSContext* aCx, JS::MutableHandle<JSObject*> aReflector);
bool WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto, JS::MutableHandle<JSObject*> aReflector);
// WebIDL methods
void SetTextContentForElement(const nsAString& aElementId,

4
dom/base/Attr.cpp
View File

@ -384,9 +384,9 @@ Attr::Shutdown()
}
JSObject*
Attr::WrapNode(JSContext* aCx)
Attr::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return AttrBinding::Wrap(aCx, this);
return AttrBinding::Wrap(aCx, this, aGivenProto);
}
} // namespace dom

2
dom/base/Attr.h
View File

@ -82,7 +82,7 @@ public:
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
// WebIDL
virtual JSObject* WrapNode(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
// XPCOM GetName() is OK
// XPCOM GetValue() is OK

4
dom/base/BarProps.cpp
View File

@ -34,9 +34,9 @@ BarProp::GetParentObject() const
}
JSObject*
BarProp::WrapObject(JSContext* aCx)
BarProp::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return BarPropBinding::Wrap(aCx, this);
return BarPropBinding::Wrap(aCx, this, aGivenProto);
}
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(BarProp, mDOMWindow)

2
dom/base/BarProps.h
View File

@ -40,7 +40,7 @@ public:
nsPIDOMWindow* GetParentObject() const;
virtual JSObject*
WrapObject(JSContext* aCx) MOZ_OVERRIDE;
WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
virtual bool GetVisible(ErrorResult& aRv) = 0;
virtual void SetVisible(bool aVisible, ErrorResult& aRv) = 0;

4
dom/base/Comment.cpp
View File

@ -74,9 +74,9 @@ Comment::Constructor(const GlobalObject& aGlobal,
}
JSObject*
Comment::WrapNode(JSContext *aCx)
Comment::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto)
{
return CommentBinding::Wrap(aCx, this);
return CommentBinding::Wrap(aCx, this, aGivenProto);
}
} // namespace dom

2
dom/base/Comment.h
View File

@ -72,7 +72,7 @@ public:
ErrorResult& aRv);
protected:
virtual JSObject* WrapNode(JSContext *aCx) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
};
} // namespace dom

4
dom/base/Console.cpp
View File

@ -722,9 +722,9 @@ Console::Observe(nsISupports* aSubject, const char* aTopic,
}
JSObject*
Console::WrapObject(JSContext* aCx)
Console::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return ConsoleBinding::Wrap(aCx, this);
return ConsoleBinding::Wrap(aCx, this, aGivenProto);
}
#define METHOD(name, string) \

2
dom/base/Console.h
View File

@ -44,7 +44,7 @@ public:
}
virtual JSObject*
WrapObject(JSContext* aCx) MOZ_OVERRIDE;
WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
void
Log(JSContext* aCx, const Sequence<JS::Value>& aData);

4
dom/base/Crypto.cpp
View File

@ -46,9 +46,9 @@ Crypto::Init(nsIGlobalObject* aParent)
}
/* virtual */ JSObject*
Crypto::WrapObject(JSContext* aCx)
Crypto::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return CryptoBinding::Wrap(aCx, this);
return CryptoBinding::Wrap(aCx, this, aGivenProto);
}
void

2
dom/base/Crypto.h
View File

@ -50,7 +50,7 @@ public:
}
virtual JSObject*
WrapObject(JSContext* aCx) MOZ_OVERRIDE;
WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
static uint8_t*
GetRandomValues(uint32_t aLength);

4
dom/base/DOMCursor.cpp
View File

@ -76,9 +76,9 @@ DOMCursor::Continue(ErrorResult& aRv)
}
/* virtual */ JSObject*
DOMCursor::WrapObject(JSContext* aCx)
DOMCursor::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return DOMCursorBinding::Wrap(aCx, this);
return DOMCursorBinding::Wrap(aCx, this, aGivenProto);
}
} // namespace dom

2
dom/base/DOMCursor.h
View File

@ -27,7 +27,7 @@ public:
DOMCursor(nsPIDOMWindow* aWindow, nsICursorContinueCallback *aCallback);
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
bool Done() const
{

4
dom/base/DOMError.cpp
View File

@ -55,9 +55,9 @@ DOMError::~DOMError()
}
JSObject*
DOMError::WrapObject(JSContext* aCx)
DOMError::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return DOMErrorBinding::Wrap(aCx, this);
return DOMErrorBinding::Wrap(aCx, this, aGivenProto);
}
/* static */ already_AddRefed<DOMError>

2
dom/base/DOMError.h
View File

@ -59,7 +59,7 @@ public:
}
virtual JSObject*
WrapObject(JSContext* aCx) MOZ_OVERRIDE;
WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
static already_AddRefed<DOMError>
Constructor(const GlobalObject& global, const nsAString& name,

8
dom/base/DOMException.cpp
View File

@ -490,9 +490,9 @@ Exception::Initialize(const nsACString& aMessage, nsresult aResult,
}
JSObject*
Exception::WrapObject(JSContext* cx)
Exception::WrapObject(JSContext* cx, JS::Handle<JSObject*> aGivenProto)
{
return ExceptionBinding::Wrap(cx, this);
return ExceptionBinding::Wrap(cx, this, aGivenProto);
}
void
@ -706,9 +706,9 @@ DOMException::Constructor(GlobalObject& /* unused */,
}
JSObject*
DOMException::WrapObject(JSContext* aCx)
DOMException::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return DOMExceptionBinding::Wrap(aCx, this);
return DOMExceptionBinding::Wrap(aCx, this, aGivenProto);
}
/* static */already_AddRefed<DOMException>

4
dom/base/DOMException.h
View File

@ -63,7 +63,7 @@ public:
void StowJSVal(JS::Value& aVp);
// WebIDL API
virtual JSObject* WrapObject(JSContext* cx)
virtual JSObject* WrapObject(JSContext* cx, JS::Handle<JSObject*> aGivenProto)
MOZ_OVERRIDE;
nsISupports* GetParentObject() const { return nullptr; }
@ -136,7 +136,7 @@ public:
NS_IMETHOD ToString(nsACString& aReturn) MOZ_OVERRIDE;
// nsWrapperCache overrides
virtual JSObject* WrapObject(JSContext* aCx)
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
MOZ_OVERRIDE;
static already_AddRefed<DOMException>

4
dom/base/DOMImplementation.cpp
View File

@ -29,9 +29,9 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMImplementation)
NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMImplementation)
JSObject*
DOMImplementation::WrapObject(JSContext* aCx)
DOMImplementation::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return DOMImplementationBinding::Wrap(aCx, this);
return DOMImplementationBinding::Wrap(aCx, this, aGivenProto);
}
bool

2
dom/base/DOMImplementation.h
View File

@ -52,7 +52,7 @@ public:
return mOwner;
}
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
// nsIDOMDOMImplementation
NS_DECL_NSIDOMDOMIMPLEMENTATION

4
dom/base/DOMMatrix.cpp
View File

@ -658,9 +658,9 @@ DOMMatrix::SetMatrixValue(const nsAString& aTransformList, ErrorResult& aRv)
}
JSObject*
DOMMatrix::WrapObject(JSContext* aCx)
DOMMatrix::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return DOMMatrixBinding::Wrap(aCx, this);
return DOMMatrixBinding::Wrap(aCx, this, aGivenProto);
}
} // namespace dom

2
dom/base/DOMMatrix.h
View File

@ -166,7 +166,7 @@ public:
Constructor(const GlobalObject& aGlobal, const Sequence<double>& aNumberSequence, ErrorResult& aRv);
nsISupports* GetParentObject() const { return mParent; }
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
#define Set2DMatrixMember(entry2D, entry3D) \
{ \

4
dom/base/DOMParser.h
View File

@ -75,9 +75,9 @@ public:
return mOwner;
}
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE
{
return mozilla::dom::DOMParserBinding::Wrap(aCx, this);
return mozilla::dom::DOMParserBinding::Wrap(aCx, this, aGivenProto);
}
private:

4
dom/base/DOMPoint.cpp
View File

@ -37,7 +37,7 @@ DOMPoint::Constructor(const GlobalObject& aGlobal, double aX, double aY,
}
JSObject*
DOMPoint::WrapObject(JSContext* aCx)
DOMPoint::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return DOMPointBinding::Wrap(aCx, this);
return DOMPointBinding::Wrap(aCx, this, aGivenProto);
}

2
dom/base/DOMPoint.h
View File

@ -64,7 +64,7 @@ public:
double aZ, double aW, ErrorResult& aRV);
nsISupports* GetParentObject() const { return mParent; }
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
void SetX(double aX) { mX = aX; }
void SetY(double aY) { mY = aY; }

4
dom/base/DOMQuad.cpp
View File

@ -38,9 +38,9 @@ DOMQuad::~DOMQuad()
}
JSObject*
DOMQuad::WrapObject(JSContext* aCx)
DOMQuad::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return DOMQuadBinding::Wrap(aCx, this);
return DOMQuadBinding::Wrap(aCx, this, aGivenProto);
}
already_AddRefed<DOMQuad>

2
dom/base/DOMQuad.h
View File

@ -35,7 +35,7 @@ public:
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(DOMQuad)
nsISupports* GetParentObject() const { return mParent; }
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
static already_AddRefed<DOMQuad>
Constructor(const GlobalObject& aGlobal,

12
dom/base/DOMRect.cpp
View File

@ -21,10 +21,10 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMRectReadOnly)
NS_INTERFACE_MAP_END
JSObject*
DOMRectReadOnly::WrapObject(JSContext* aCx)
DOMRectReadOnly::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
MOZ_ASSERT(mParent);
return DOMRectReadOnlyBinding::Wrap(aCx, this);
return DOMRectReadOnlyBinding::Wrap(aCx, this, aGivenProto);
}
// -----------------------------------------------------------------------------
@ -47,10 +47,10 @@ FORWARD_GETTER(Width)
FORWARD_GETTER(Height)
JSObject*
DOMRect::WrapObject(JSContext* aCx)
DOMRect::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
MOZ_ASSERT(mParent);
return DOMRectBinding::Wrap(aCx, this);
return DOMRectBinding::Wrap(aCx, this, aGivenProto);
}
already_AddRefed<DOMRect>
@ -99,9 +99,9 @@ DOMRectList::Item(uint32_t aIndex, nsIDOMClientRect** aReturn)
}
JSObject*
DOMRectList::WrapObject(JSContext *cx)
DOMRectList::WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto)
{
return mozilla::dom::DOMRectListBinding::Wrap(cx, this);
return mozilla::dom::DOMRectListBinding::Wrap(cx, this, aGivenProto);
}
static double

6
dom/base/DOMRect.h
View File

@ -43,7 +43,7 @@ public:
MOZ_ASSERT(mParent);
return mParent;
}
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
virtual double X() const = 0;
virtual double Y() const = 0;
@ -98,7 +98,7 @@ public:
Constructor(const GlobalObject& aGlobal, double aX, double aY,
double aWidth, double aHeight, ErrorResult& aRV);
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
void SetRect(float aX, float aY, float aWidth, float aHeight) {
mX = aX; mY = aY; mWidth = aWidth; mHeight = aHeight;
@ -161,7 +161,7 @@ public:
NS_DECL_NSIDOMCLIENTRECTLIST
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
nsISupports* GetParentObject()
{

4
dom/base/DOMRequest.cpp
View File

@ -66,9 +66,9 @@ NS_IMPL_ADDREF_INHERITED(DOMRequest, DOMEventTargetHelper)
NS_IMPL_RELEASE_INHERITED(DOMRequest, DOMEventTargetHelper)
/* virtual */ JSObject*
DOMRequest::WrapObject(JSContext* aCx)
DOMRequest::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return DOMRequestBinding::Wrap(aCx, this);
return DOMRequestBinding::Wrap(aCx, this, aGivenProto);
}
NS_IMPL_EVENT_HANDLER(DOMRequest, success)

2
dom/base/DOMRequest.h
View File

@ -47,7 +47,7 @@ public:
return GetOwner();
}
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
// WebIDL Interface
DOMRequestReadyState ReadyState() const

4
dom/base/DOMStringList.cpp
View File

@ -24,9 +24,9 @@ DOMStringList::~DOMStringList()
}
JSObject*
DOMStringList::WrapObject(JSContext* aCx)
DOMStringList::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return DOMStringListBinding::Wrap(aCx, this);
return DOMStringListBinding::Wrap(aCx, this, aGivenProto);
}
} // namespace dom

2
dom/base/DOMStringList.h
View File

@ -24,7 +24,7 @@ public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMStringList)
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
nsISupports* GetParentObject()
{
return nullptr;

4
dom/base/DocumentFragment.cpp
View File

@ -24,9 +24,9 @@ namespace mozilla {
namespace dom {
JSObject*
DocumentFragment::WrapNode(JSContext *aCx)
DocumentFragment::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto)
{
return DocumentFragmentBinding::Wrap(aCx, this);
return DocumentFragmentBinding::Wrap(aCx, this, aGivenProto);
}
bool

2
dom/base/DocumentFragment.h
View File

@ -65,7 +65,7 @@ public:
Init();
}
virtual JSObject* WrapNode(JSContext *aCx) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
// nsIContent
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,

4
dom/base/DocumentType.cpp
View File

@ -60,9 +60,9 @@ namespace mozilla {
namespace dom {
JSObject*
DocumentType::WrapNode(JSContext *cx)
DocumentType::WrapNode(JSContext *cx, JS::Handle<JSObject*> aGivenProto)
{
return DocumentTypeBinding::Wrap(cx, this);
return DocumentTypeBinding::Wrap(cx, this, aGivenProto);
}
DocumentType::DocumentType(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,

2
dom/base/DocumentType.h
View File

@ -77,7 +77,7 @@ public:
protected:
virtual ~DocumentType();
virtual JSObject* WrapNode(JSContext *cx) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *cx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
nsString mPublicId;
nsString mSystemId;

8
dom/base/Element.cpp
View File

@ -406,9 +406,9 @@ Element::GetBindingURL(nsIDocument *aDocument, css::URLValue **aResult)
}
JSObject*
Element::WrapObject(JSContext *aCx)
Element::WrapObject(JSContext *aCx, JS::Handle<JSObject*> aGivenProto)
{
JS::Rooted<JSObject*> obj(aCx, nsINode::WrapObject(aCx));
JS::Rooted<JSObject*> obj(aCx, nsINode::WrapObject(aCx, aGivenProto));
if (!obj) {
return nullptr;
}
@ -1108,9 +1108,9 @@ DestinationInsertionPointList::IndexOf(nsIContent* aContent)
}
JSObject*
DestinationInsertionPointList::WrapObject(JSContext* aCx)
DestinationInsertionPointList::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return NodeListBinding::Wrap(aCx, this);
return NodeListBinding::Wrap(aCx, this, aGivenProto);
}
already_AddRefed<DestinationInsertionPointList>

4
dom/base/Element.h
View File

@ -960,7 +960,7 @@ public:
nsIDOMHTMLCollection** aResult);
void GetClassList(nsISupports** aClassList);
virtual JSObject* WrapObject(JSContext *aCx) MOZ_FINAL MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *aCx, JS::Handle<JSObject*> aGivenProto) MOZ_FINAL MOZ_OVERRIDE;
nsINode* GetScopeChainParent() const MOZ_OVERRIDE;
@ -1315,7 +1315,7 @@ public:
virtual int32_t IndexOf(nsIContent* aContent) MOZ_OVERRIDE;
virtual nsINode* GetParentObject() MOZ_OVERRIDE { return mParent; }
virtual uint32_t Length() const;
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
protected:
virtual ~DestinationInsertionPointList();

4
dom/base/EventSource.cpp
View File

@ -265,9 +265,9 @@ EventSource::Init(nsISupports* aOwner,
}
/* virtual */ JSObject*
EventSource::WrapObject(JSContext* aCx)
EventSource::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return EventSourceBinding::Wrap(aCx, this);
return EventSourceBinding::Wrap(aCx, this, aGivenProto);
}
/* static */ already_AddRefed<EventSource>

2
dom/base/EventSource.h
View File

@ -58,7 +58,7 @@ public:
NS_DECL_NSIINTERFACEREQUESTOR
// nsWrapperCache
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
// WebIDL
nsPIDOMWindow*

10
dom/base/File.cpp
View File

@ -559,10 +559,10 @@ File::IsMemoryFile()
}
JSObject*
File::WrapObject(JSContext* aCx)
File::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return IsFile() ? FileBinding::Wrap(aCx, this)
: BlobBinding::Wrap(aCx, this);
return IsFile() ? FileBinding::Wrap(aCx, this, aGivenProto)
: BlobBinding::Wrap(aCx, this, aGivenProto);
}
/* static */ already_AddRefed<File>
@ -1235,9 +1235,9 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(FileList)
NS_IMPL_CYCLE_COLLECTING_RELEASE(FileList)
JSObject*
FileList::WrapObject(JSContext *cx)
FileList::WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto)
{
return mozilla::dom::FileListBinding::Wrap(cx, this);
return mozilla::dom::FileListBinding::Wrap(cx, this, aGivenProto);
}
NS_IMETHODIMP

4
dom/base/File.h
View File

@ -189,7 +189,7 @@ public:
const ChromeFilePropertyBag& aBag,
ErrorResult& aRv);
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
uint64_t GetSize(ErrorResult& aRv);
@ -828,7 +828,7 @@ public:
NS_DECL_NSIDOMFILELIST
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
nsISupports* GetParentObject()
{

4
dom/base/FragmentOrElement.cpp
View File

@ -401,9 +401,9 @@ NS_INTERFACE_TABLE_HEAD(nsChildContentList)
NS_INTERFACE_MAP_END
JSObject*
nsChildContentList::WrapObject(JSContext *cx)
nsChildContentList::WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto)
{
return NodeListBinding::Wrap(cx, this);
return NodeListBinding::Wrap(cx, this, aGivenProto);
}
NS_IMETHODIMP

2
dom/base/FragmentOrElement.h
View File

@ -56,7 +56,7 @@ public:
NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS(nsChildContentList)
// nsWrapperCache
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
// nsIDOMNodeList interface
NS_DECL_NSIDOMNODELIST

4
dom/base/MessageChannel.cpp
View File

@ -81,9 +81,9 @@ MessageChannel::~MessageChannel()
}
JSObject*
MessageChannel::WrapObject(JSContext* aCx)
MessageChannel::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return MessageChannelBinding::Wrap(aCx, this);
return MessageChannelBinding::Wrap(aCx, this, aGivenProto);
}
/* static */ already_AddRefed<MessageChannel>

2
dom/base/MessageChannel.h
View File

@ -40,7 +40,7 @@ public:
}
virtual JSObject*
WrapObject(JSContext* aCx) MOZ_OVERRIDE;
WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
static already_AddRefed<MessageChannel>
Constructor(const GlobalObject& aGlobal, ErrorResult& aRv);

6
dom/base/MessagePort.cpp
View File

@ -223,7 +223,7 @@ PostMessageReadTransferStructuredClone(JSContext* aCx,
port->BindToOwner(scInfo->mPort->GetOwner());
scInfo->mPorts.Put(port, nullptr);
JS::Rooted<JSObject*> obj(aCx, port->WrapObject(aCx));
JS::Rooted<JSObject*> obj(aCx, port->WrapObject(aCx, JS::NullPtr()));
if (!obj || !JS_WrapObject(aCx, &obj)) {
return false;
}
@ -414,9 +414,9 @@ MessagePort::~MessagePort()
}
JSObject*
MessagePort::WrapObject(JSContext* aCx)
MessagePort::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return MessagePortBinding::Wrap(aCx, this);
return MessagePortBinding::Wrap(aCx, this, aGivenProto);
}
void

2
dom/base/MessagePort.h
View File

@ -64,7 +64,7 @@ public:
explicit MessagePort(nsPIDOMWindow* aWindow);
virtual JSObject*
WrapObject(JSContext* aCx) MOZ_OVERRIDE;
WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
virtual void
PostMessageMoz(JSContext* aCx, JS::Handle<JS::Value> aMessage,

4
dom/base/MessagePortList.cpp
View File

@ -20,9 +20,9 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MessagePortList)
NS_INTERFACE_MAP_END
JSObject*
MessagePortList::WrapObject(JSContext* aCx)
MessagePortList::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return MessagePortListBinding::Wrap(aCx, this);
return MessagePortListBinding::Wrap(aCx, this, aGivenProto);
}
} // namespace dom

2
dom/base/MessagePortList.h
View File

@ -41,7 +41,7 @@ public:
}
virtual JSObject*
WrapObject(JSContext* aCx) MOZ_OVERRIDE;
WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
uint32_t
Length() const

4
dom/base/Navigator.cpp
View File

@ -2234,9 +2234,9 @@ Navigator::GetOwnPropertyNames(JSContext* aCx, nsTArray<nsString>& aNames,
}
JSObject*
Navigator::WrapObject(JSContext* cx)
Navigator::WrapObject(JSContext* cx, JS::Handle<JSObject*> aGivenProto)
{
return NavigatorBinding::Wrap(cx, this);
return NavigatorBinding::Wrap(cx, this, aGivenProto);
}
/* static */

2
dom/base/Navigator.h
View File

@ -324,7 +324,7 @@ public:
return GetWindow();
}
virtual JSObject* WrapObject(JSContext* cx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* cx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
// GetWindowFromGlobal returns the inner window for this global, if
// any, else null.

4
dom/base/NodeIterator.cpp
View File

@ -289,9 +289,9 @@ void NodeIterator::ContentRemoved(nsIDocument *aDocument,
}
bool
NodeIterator::WrapObject(JSContext *cx, JS::MutableHandle<JSObject*> aReflector)
NodeIterator::WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto, JS::MutableHandle<JSObject*> aReflector)
{
return NodeIteratorBinding::Wrap(cx, this, aReflector);
return NodeIteratorBinding::Wrap(cx, this, aGivenProto, aReflector);
}
} // namespace dom

2
dom/base/NodeIterator.h
View File

@ -69,7 +69,7 @@ public:
}
// The XPCOM Detach() is fine for our purposes
bool WrapObject(JSContext *cx, JS::MutableHandle<JSObject*> aReflector);
bool WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto, JS::MutableHandle<JSObject*> aReflector);
private:
virtual ~NodeIterator();

4
dom/base/PerformanceEntry.cpp
View File

@ -34,7 +34,7 @@ PerformanceEntry::~PerformanceEntry()
}
JSObject*
PerformanceEntry::WrapObject(JSContext* aCx)
PerformanceEntry::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return mozilla::dom::PerformanceEntryBinding::Wrap(aCx, this);
return mozilla::dom::PerformanceEntryBinding::Wrap(aCx, this, aGivenProto);
}

2
dom/base/PerformanceEntry.h
View File

@ -27,7 +27,7 @@ public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(PerformanceEntry)
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
nsPerformance* GetParentObject() const
{

4
dom/base/PerformanceMark.cpp
View File

@ -21,7 +21,7 @@ PerformanceMark::~PerformanceMark()
}
JSObject*
PerformanceMark::WrapObject(JSContext* aCx)
PerformanceMark::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return PerformanceMarkBinding::Wrap(aCx, this);
return PerformanceMarkBinding::Wrap(aCx, this, aGivenProto);
}

2
dom/base/PerformanceMark.h
View File

@ -18,7 +18,7 @@ public:
PerformanceMark(nsPerformance* aPerformance,
const nsAString& aName);
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
virtual DOMHighResTimeStamp StartTime() const MOZ_OVERRIDE
{

4
dom/base/PerformanceMeasure.cpp
View File

@ -24,7 +24,7 @@ PerformanceMeasure::~PerformanceMeasure()
}
JSObject*
PerformanceMeasure::WrapObject(JSContext* aCx)
PerformanceMeasure::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return PerformanceMeasureBinding::Wrap(aCx, this);
return PerformanceMeasureBinding::Wrap(aCx, this, aGivenProto);
}

2
dom/base/PerformanceMeasure.h
View File

@ -20,7 +20,7 @@ public:
DOMHighResTimeStamp aStartTime,
DOMHighResTimeStamp aEndTime);
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
virtual DOMHighResTimeStamp StartTime() const MOZ_OVERRIDE
{

4
dom/base/PerformanceResourceTiming.cpp
View File

@ -43,7 +43,7 @@ PerformanceResourceTiming::StartTime() const
}
JSObject*
PerformanceResourceTiming::WrapObject(JSContext* aCx)
PerformanceResourceTiming::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return PerformanceResourceTimingBinding::Wrap(aCx, this);
return PerformanceResourceTimingBinding::Wrap(aCx, this, aGivenProto);
}

2
dom/base/PerformanceResourceTiming.h
View File

@ -31,7 +31,7 @@ public:
nsPerformance* aPerformance,
const nsAString& aName);
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
virtual DOMHighResTimeStamp StartTime() const MOZ_OVERRIDE;

2
dom/base/ProcessGlobal.h
View File

@ -58,7 +58,7 @@ public:
}
virtual nsIPrincipal* GetPrincipal() MOZ_OVERRIDE { return mPrincipal; }
virtual JSObject* WrapObject(JSContext* cx) MOZ_OVERRIDE
virtual JSObject* WrapObject(JSContext* cx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE
{
MOZ_CRASH("ProcessGlobal doesn't use DOM bindings!");
}

4
dom/base/ShadowRoot.cpp
View File

@ -104,9 +104,9 @@ ShadowRoot::~ShadowRoot()
}
JSObject*
ShadowRoot::WrapObject(JSContext* aCx)
ShadowRoot::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return mozilla::dom::ShadowRootBinding::Wrap(aCx, this);
return mozilla::dom::ShadowRootBinding::Wrap(aCx, this, aGivenProto);
}
ShadowRoot*

2
dom/base/ShadowRoot.h
View File

@ -103,7 +103,7 @@ public:
nsIContent* GetPoolHost() { return mPoolHost; }
nsTArray<HTMLShadowElement*>& ShadowDescendants() { return mShadowDescendants; }
JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
static bool IsPooledNode(nsIContent* aChild, nsIContent* aContainer,
nsIContent* aHost);

4
dom/base/StyleSheetList.cpp
View File

@ -23,9 +23,9 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(StyleSheetList)
NS_IMPL_CYCLE_COLLECTING_RELEASE(StyleSheetList)
/* virtual */ JSObject*
StyleSheetList::WrapObject(JSContext* aCx)
StyleSheetList::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return StyleSheetListBinding::Wrap(aCx, this);
return StyleSheetListBinding::Wrap(aCx, this, aGivenProto);
}
NS_IMETHODIMP

2
dom/base/StyleSheetList.h
View File

@ -24,7 +24,7 @@ public:
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(StyleSheetList)
NS_DECL_NSIDOMSTYLESHEETLIST
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE MOZ_FINAL;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE MOZ_FINAL;
virtual nsINode* GetParentObject() const = 0;

4
dom/base/SubtleCrypto.cpp
View File

@ -29,9 +29,9 @@ SubtleCrypto::SubtleCrypto(nsIGlobalObject* aParent)
}
JSObject*
SubtleCrypto::WrapObject(JSContext* aCx)
SubtleCrypto::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
return SubtleCryptoBinding::Wrap(aCx, this);
return SubtleCryptoBinding::Wrap(aCx, this, aGivenProto);
}
#define SUBTLECRYPTO_METHOD_BODY(Operation, aRv, ...) \

2
dom/base/SubtleCrypto.h
View File

@ -38,7 +38,7 @@ public:
return mParent;
}
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) MOZ_OVERRIDE;
already_AddRefed<Promise> Encrypt(JSContext* cx,
const ObjectOrString& algorithm,

4
dom/base/TreeWalker.cpp
View File

@ -451,9 +451,9 @@ TreeWalker::NextSiblingInternal(bool aReversed, ErrorResult& aResult)
}
bool
TreeWalker::WrapObject(JSContext *aCx, JS::MutableHandle<JSObject*> aReflector)
TreeWalker::WrapObject(JSContext *aCx, JS::Handle<JSObject*> aGivenProto, JS::MutableHandle<JSObject*> aReflector)
{
return TreeWalkerBinding::Wrap(aCx, this, aReflector);
return TreeWalkerBinding::Wrap(aCx, this, aGivenProto, aReflector);
}
} // namespace dom

2
dom/base/TreeWalker.h
View File

@ -65,7 +65,7 @@ public:
already_AddRefed<nsINode> PreviousNode(ErrorResult& aResult);
already_AddRefed<nsINode> NextNode(ErrorResult& aResult);
bool WrapObject(JSContext *aCx, JS::MutableHandle<JSObject*> aReflector);
bool WrapObject(JSContext *aCx, JS::Handle<JSObject*> aGivenProto, JS::MutableHandle<JSObject*> aReflector);
private:
nsCOMPtr<nsINode> mCurrentNode;

Some files were not shown because too many files have changed in this diff Show More