mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

merge mozilla-inbound to mozilla-central a=merge

This commit is contained in:
Carsten "Tomcat" Book 2015-11-02 11:54:07 +01:00
Родитель 60c18dcb28 e968844794
Коммит c544f0d430
476 изменённых файлов: 4639 добавлений и 2236 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
accessible/base/NotificationController.cpp
Просмотреть файл

@ -230,12 +230,11 @@ NotificationController::WillRefresh(mozilla::TimeStamp aTime)
nsIContent* containerElm = containerNode->IsElement() ?
containerNode->AsElement() : nullptr;
nsAutoString text;
textFrame->GetRenderedText(&text);
nsIFrame::RenderedText text = textFrame->GetRenderedText();
// Remove text accessible if rendered text is empty.
if (textAcc) {
if (text.IsEmpty()) {
if (text.mString.IsEmpty()) {
#ifdef A11Y_LOG
if (logging::IsEnabled(logging::eTree | logging::eText)) {
logging::MsgBegin("TREE", "text node lost its content");
@ -258,17 +257,17 @@ NotificationController::WillRefresh(mozilla::TimeStamp aTime)
logging::MsgEntry("old text '%s'",
NS_ConvertUTF16toUTF8(textAcc->AsTextLeaf()->Text()).get());
logging::MsgEntry("new text: '%s'",
NS_ConvertUTF16toUTF8(text).get());
NS_ConvertUTF16toUTF8(text.mString).get());
logging::MsgEnd();
}
#endif
TextUpdater::Run(mDocument, textAcc->AsTextLeaf(), text);
TextUpdater::Run(mDocument, textAcc->AsTextLeaf(), text.mString);
continue;
}
// Append an accessible if rendered text is not empty.
if (!text.IsEmpty()) {
if (!text.mString.IsEmpty()) {
#ifdef A11Y_LOG
if (logging::IsEnabled(logging::eTree | logging::eText)) {
logging::MsgBegin("TREE", "text node gains new content");

9
accessible/base/nsAccessibilityService.cpp
Просмотреть файл

@ -1091,12 +1091,11 @@ nsAccessibilityService::GetOrCreateAccessible(nsINode* aNode,
// Create accessible for visible text frames.
if (content->IsNodeOfType(nsINode::eTEXT)) {
nsAutoString text;
frame->GetRenderedText(&text, nullptr, nullptr, 0, UINT32_MAX);
nsIFrame::RenderedText text = frame->GetRenderedText();
// Ignore not rendered text nodes and whitespace text nodes between table
// cells.
if (text.IsEmpty() ||
(aContext->IsTableRow() && nsCoreUtils::IsWhitespaceString(text))) {
if (text.mString.IsEmpty() ||
(aContext->IsTableRow() && nsCoreUtils::IsWhitespaceString(text.mString))) {
if (aIsSubtreeHidden)
*aIsSubtreeHidden = true;
@ -1108,7 +1107,7 @@ nsAccessibilityService::GetOrCreateAccessible(nsINode* aNode,
return nullptr;
document->BindToDocument(newAcc, nullptr);
newAcc->AsTextLeaf()->SetText(text);
newAcc->AsTextLeaf()->SetText(text.mString);
return newAcc;
}

4
accessible/base/nsTextEquivUtils.cpp
Просмотреть файл

@ -139,8 +139,8 @@ nsTextEquivUtils::AppendTextEquivFromTextContent(nsIContent *aContent,
if (aContent->TextLength() > 0) {
nsIFrame *frame = aContent->GetPrimaryFrame();
if (frame) {
nsresult rv = frame->GetRenderedText(aString);
NS_ENSURE_SUCCESS(rv, rv);
nsIFrame::RenderedText text = frame->GetRenderedText();
aString->Append(text.mString);
} else {
// If aContent is an object that is display: none, we have no a frame.
aContent->AppendTextTo(*aString);

6
accessible/generic/Accessible.cpp
Просмотреть файл

@ -394,10 +394,10 @@ Accessible::VisibilityState()
if (frame->GetType() == nsGkAtoms::textFrame &&
!(frame->GetStateBits() & NS_FRAME_OUT_OF_FLOW) &&
frame->GetRect().IsEmpty()) {
nsAutoString renderedText;
frame->GetRenderedText(&renderedText, nullptr, nullptr, 0, 1);
if (renderedText.IsEmpty())
nsIFrame::RenderedText text = frame->GetRenderedText();
if (text.mString.IsEmpty()) {
return states::INVISIBLE;
}
}
return 0;

27
accessible/generic/HyperTextAccessible.cpp
Просмотреть файл

@ -1984,17 +1984,9 @@ HyperTextAccessible::ContentToRenderedOffset(nsIFrame* aFrame, int32_t aContentO
NS_ASSERTION(aFrame->GetPrevContinuation() == nullptr,
"Call on primary frame only");
gfxSkipChars skipChars;
gfxSkipCharsIterator iter;
// Only get info up to original offset, we know that will be larger than skipped offset
nsresult rv = aFrame->GetRenderedText(nullptr, &skipChars, &iter, 0, aContentOffset);
NS_ENSURE_SUCCESS(rv, rv);
uint32_t ourRenderedStart = iter.GetSkippedOffset();
int32_t ourContentStart = iter.GetOriginalOffset();
*aRenderedOffset = iter.ConvertOriginalToSkipped(aContentOffset + ourContentStart) -
ourRenderedStart;
nsIFrame::RenderedText text = aFrame->GetRenderedText(aContentOffset,
aContentOffset + 1);
*aRenderedOffset = text.mOffsetWithinNodeRenderedText;
return NS_OK;
}
@ -2016,16 +2008,9 @@ HyperTextAccessible::RenderedToContentOffset(nsIFrame* aFrame, uint32_t aRendere
NS_ASSERTION(aFrame->GetPrevContinuation() == nullptr,
"Call on primary frame only");
gfxSkipChars skipChars;
gfxSkipCharsIterator iter;
// We only need info up to skipped offset -- that is what we're converting to original offset
nsresult rv = aFrame->GetRenderedText(nullptr, &skipChars, &iter, 0, aRenderedOffset);
NS_ENSURE_SUCCESS(rv, rv);
uint32_t ourRenderedStart = iter.GetSkippedOffset();
int32_t ourContentStart = iter.GetOriginalOffset();
*aContentOffset = iter.ConvertSkippedToOriginal(aRenderedOffset + ourRenderedStart) - ourContentStart;
nsIFrame::RenderedText text = aFrame->GetRenderedText(aRenderedOffset,
aRenderedOffset + 1, nsIFrame::TextOffsetType::OFFSETS_IN_RENDERED_TEXT);
*aContentOffset = text.mOffsetWithinNodeText;
return NS_OK;
}

256
accessible/ipc/ProxyAccessible.cpp
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

4
accessible/tests/mochitest/jsat/test_traversal.html
Просмотреть файл

@ -113,7 +113,7 @@
'A esoteric weapon wielded by only the most ' +
'formidable warriors, for its unrelenting strict' +
' power is unfathomable.',
'• Lists of Programming Languages', 'Lisp ',
'• Lists of Programming Languages', 'Lisp',
'1. Scheme', '2. Racket', '3. Clojure',
'4. Standard Lisp', 'link-0', ' Lisp',
'checkbox-1-5', ' LeLisp', '• JavaScript',
@ -124,7 +124,7 @@
'5 8', 'gridcell4', 'Just an innocuous separator',
'Dirty Words', 'Meaning', 'Mud', 'Wet Dirt',
'Dirt', 'Messy Stuff', 'statusbar-1', 'statusbar-2',
'switch-1', 'This is a MathML formula ', 'math-1',
'switch-1', 'This is a MathML formula', 'math-1',
'with some text after.']);
queueTraversalSequence(gQueue, docAcc, TraversalRules.Landmark, null,

4
accessible/tests/mochitest/pivot/test_virtualcursor.html
Просмотреть файл

@ -52,7 +52,7 @@
gQueue, docAcc, ObjectTraversalRule, null,
['Main Title', 'Lorem ipsum ',
'dolor', ' sit amet. Integer vitae urna leo, id ',
'semper', ' nulla. ', 'Second Section Title',
'semper', ' nulla.', 'Second Section Title',
'Sed accumsan luctus lacus, vitae mollis arcu tristique vulputate.',
'An ', 'embedded', ' document.', 'Hide me', 'Link 1', 'Link 2',
'Link 3', 'Hello', 'World']);
@ -90,7 +90,7 @@
gQueue, docAcc, ObjectTraversalRule,
getAccessible(doc.getElementById('paragraph-1')),
['Lorem ipsum ', 'dolor', ' sit amet. Integer vitae urna leo, id ',
'semper', ' nulla. ']);
'semper', ' nulla.']);
gQueue.push(new setModalRootInvoker(docAcc, docAcc.parent,
NS_ERROR_INVALID_ARG));

4
accessible/tests/mochitest/text/test_doc.html
Просмотреть файл

@ -16,8 +16,8 @@
function doTest()
{
var iframeDoc = [ getNode("iframe").contentDocument ];
testCharacterCount(iframeDoc, 15);
testText(iframeDoc, 0, 15, "outbody inbody ");
testCharacterCount(iframeDoc, 13);
testText(iframeDoc, 0, 13, "outbodyinbody");
SimpleTest.finish();
}

4
accessible/tests/mochitest/text/test_hypertext.html
Просмотреть файл

@ -58,7 +58,7 @@
////////////////////////////////////////////////////////////////////////
// getTextAtOffset line boundary
testTextAtOffset(0, BOUNDARY_LINE_START, "line ", 0, 5,
testTextAtOffset(0, BOUNDARY_LINE_START, "line", 0, 4,
"hypertext3", kOk, kOk, kOk);
// XXX: see bug 634202.
@ -122,7 +122,7 @@
<div id="nulltext"></div>
<div id="hypertext">hello <a>friend</a> see <img></div>
<div id="hypertext">hello <a>friend</a> see <img src="about:blank"></div>
<div id="hypertext2">hello <a>friend</a> see <input></div>
<ol id="list">
<li id="listitem">foo</li>

10
accessible/tests/mochitest/text/test_lineboundary.html
Просмотреть файл

@ -14,9 +14,9 @@
function doTest()
{
testTextAtOffset("line_test_1", BOUNDARY_LINE_START,
[[0, 6, "Line 1 ", 0, 7],
[7, 7, "", 7, 7],
[8, 15, "Line 3 ", 8, 15]]);
[[0, 5, "Line 1", 0, 6],
[6, 6, "", 6, 6],
[7, 13, "Line 3", 7, 13]]);
//////////////////////////////////////////////////////////////////////////
// __h__e__l__l__o__ __m__y__ __f__r__i__e__n__d__
@ -114,10 +114,10 @@
[ [ 0, 3, "foo\n", 0, 4 ], [ 4, 4, "", 4, 4 ] ]);
//////////////////////////////////////////////////////////////////////////
// 'Hello world ' (\n is rendered as space)
// 'Hello world'
testTextAtOffset([ "ht_4" ], BOUNDARY_LINE_START,
[ [ 0, 12, "Hello world ", 0, 12 ] ]);
[ [ 0, 11, "Hello world", 0, 11 ] ]);
//////////////////////////////////////////////////////////////////////////
// list items

15
accessible/tests/mochitest/text/test_wordboundary.html
Просмотреть файл

@ -42,27 +42,20 @@
[ [ 0, 6, "", 0, 0 ] ]);
testTextBeforeOffset(ids, BOUNDARY_WORD_END,
[ [ 0, 5, "", 0, 0 ],
[ 6, 6, "hello", 0, 5,
[ [6, "e2", kTodo, kOk, kTodo ] ]
]
[ 6, 6, "hello", 0, 5 ]
]);
testTextAtOffset(ids, BOUNDARY_WORD_START,
[ [ 0, 6, "hello ", 0, 6 ] ]);
testTextAtOffset(ids, BOUNDARY_WORD_END,
[ [ 0, 4, "hello", 0, 5 ],
[ 5, 6, " ", 5, 6,
[ [ 5, "e2", kTodo, kTodo, kOk ],
[ 6, "e2", kTodo, kTodo, kOk ] ]
]
[ 5, 6, " ", 5, 6 ]
]);
testTextAfterOffset(ids, BOUNDARY_WORD_START,
[ [ 0, 6, "", 6, 6 ] ]);
testTextAfterOffset(ids, BOUNDARY_WORD_END,
[ [ 0, 5, " ", 5, 6,
[ [ 5, "e2", kTodo, kTodo, kOk ] ]
],
[ [ 0, 5, " ", 5, 6 ],
[ 6, 6, "", 6, 6 ]
]);
@ -256,7 +249,7 @@
<input id="i2" value="hello "/>
<pre><div id="d2">hello </div></pre>
<div id="e2" contenteditable="true">hello </div>
<div id="e2" contenteditable="true" style='white-space:pre'>hello </div>
<textarea id="t2">hello </textarea>
<input id="i6" value="hello all"/>

18
accessible/tests/mochitest/textattrs/test_general.html
Просмотреть файл

@ -89,7 +89,7 @@
gComputedStyle = document.defaultView.getComputedStyle(tempElem, "");
attrs = {"color": gComputedStyle.color,
"background-color": gComputedStyle.backgroundColor};
testTextAttrs(ID, 27, attrs, defAttrs, 27, 50);
testTextAttrs(ID, 27, attrs, defAttrs, 27, 49);
//////////////////////////////////////////////////////////////////////////
// area4
@ -110,7 +110,7 @@
tempElem = tempElem.parentNode;
gComputedStyle = document.defaultView.getComputedStyle(tempElem, "");
attrs = {"color": gComputedStyle.color};
testTextAttrs(ID, 34, attrs, defAttrs, 33, 46);
testTextAttrs(ID, 34, attrs, defAttrs, 33, 45);
//////////////////////////////////////////////////////////////////////////
// area5: "Green!*!RedNormal"
@ -144,7 +144,7 @@
// Normal
attrs = {};
testTextAttrs(ID, 11, attrs, defAttrs, 11, 18);
testTextAttrs(ID, 11, attrs, defAttrs, 11, 17);
//////////////////////////////////////////////////////////////////////////
// area6 (CSS vertical-align property, refer to bug 445938 for details
@ -323,7 +323,7 @@
testTextAttrs(ID, 152, attrs, defAttrs, 151, 164);
attrs = {};
testTextAttrs(ID, 165, attrs, defAttrs, 164, 172);
testTextAttrs(ID, 165, attrs, defAttrs, 164, 171);
//////////////////////////////////////////////////////////////////////////
// area10, different single style spans in non-styled paragraph
@ -383,7 +383,7 @@
testTextAttrs(ID, 111, attrs, defAttrs, 110, 123);
attrs = {};
testTextAttrs(ID, 124, attrs, defAttrs, 123, 131);
testTextAttrs(ID, 124, attrs, defAttrs, 123, 130);
//////////////////////////////////////////////////////////////////////////
// area11, "font-weight" tests
@ -410,7 +410,7 @@
testTextAttrs(ID, 51, attrs, defAttrs, 51, 57);
attrs = { };
testTextAttrs(ID, 57, attrs, defAttrs, 57, 97);
testTextAttrs(ID, 57, attrs, defAttrs, 57, 96);
//////////////////////////////////////////////////////////////////////////
// test out of range offset
@ -485,7 +485,7 @@
testTextAttrs(ID, 27, attrs, defAttrs, 27, 31);
attrs = { };
testTextAttrs(ID, 31, attrs, defAttrs, 31, 45);
testTextAttrs(ID, 31, attrs, defAttrs, 31, 44);
//////////////////////////////////////////////////////////////////////////
// area17, "text-decoration" tests
@ -527,7 +527,7 @@
"text-line-through-style": "wavy",
"text-line-through-color": "rgb(0, 0, 0)",
};
testTextAttrs(ID, 39, attrs, defAttrs, 39, 44);
testTextAttrs(ID, 39, attrs, defAttrs, 39, 43);
//////////////////////////////////////////////////////////////////////////
// area18, "auto-generation text" tests
@ -557,7 +557,7 @@
testTextAttrs(ID, 11, attrs, defAttrs, 10, 17);
attrs = {};
testTextAttrs(ID, 18, attrs, defAttrs, 17, 28);
testTextAttrs(ID, 18, attrs, defAttrs, 17, 27);
//////////////////////////////////////////////////////////////////////////
// area20, "aOffset as -1 (Mozilla Bug 789621)" test

2
accessible/tests/mochitest/textcaret/test_general.html
Просмотреть файл

@ -71,7 +71,7 @@
turnCaretBrowsing(true);
// test caret offsets
testCaretOffset(document, 16);
testCaretOffset(document, 15);
testCaretOffset("textbox", -1);
testCaretOffset("textarea", -1);
testCaretOffset("p", -1);

2
accessible/tests/mochitest/tree/test_invalidationlist.html
Просмотреть файл

@ -51,7 +51,7 @@
<div id="container">
<div><label for="x"></label></div>
<div style="display: table-cell;" id="x">Z<span> </span><span></span></div>
<div style="display: table-cell;" id="x">Z<span style='white-space:pre'> </span><span></span></div>
</div>
</body>
</html>

8
accessible/tests/mochitest/tree/test_txtcntr.html
Просмотреть файл

@ -49,14 +49,14 @@
},
{
role: ROLE_TEXT_LEAF,
name: "Hello3 "
name: "Hello3"
},
{
role: ROLE_PARAGRAPH,
children: [
{
role: ROLE_TEXT_LEAF,
name: "Hello4 "
name: "Hello4"
}
]
}
@ -71,7 +71,7 @@
children: [
{
role: ROLE_TEXT_LEAF,
name: "helllo "
name: "helllo"
},
{
role: ROLE_PARAGRAPH,
@ -84,7 +84,7 @@
},
{
role: ROLE_TEXT_LEAF,
name: "hello "
name: "hello"
}
]
};

1
browser/app/profile/firefox.js
Просмотреть файл

@ -996,6 +996,7 @@ pref("urlclassifier.downloadAllowTable", "goog-downloadwhite-digest256");
pref("browser.geolocation.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/geolocation/");
pref("browser.push.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/push/");
pref("browser.push.warning.migrationURL", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/push#w_upgraded-notifications");
pref("browser.EULA.version", 3);
pref("browser.rights.version", 3);

2
browser/base/content/test/alerts/browser_notification_permission_migration.js
Просмотреть файл

@ -24,7 +24,7 @@ add_task(function* test_permissionMigration() {
let alertWindow = yield alertWindowPromise;
info("Clicking on notification");
let url = Services.urlFormatter.formatURLPref("browser.push.warning.infoURL");
let url = Services.urlFormatter.formatURLPref("browser.push.warning.migrationURL");
let closePromise = promiseWindowClosed(alertWindow);
let tabPromise = BrowserTestUtils.waitForNewTab(gBrowser, url);
EventUtils.synthesizeMouseAtCenter(alertWindow.document.getElementById("alertTitleLabel"), {}, alertWindow);

9
browser/base/content/test/general/mochitest.ini
Просмотреть файл

@ -1,5 +1,5 @@
[DEFAULT]
skip-if = buildapp == 'b2g' || e10s
skip-if = buildapp == 'b2g'
support-files =
audio.ogg
bug364677-data.xml
@ -31,9 +31,10 @@ support-files =
[test_contextmenu.html]
skip-if = toolkit == "gtk2" || toolkit == "gtk3" || (os == 'mac' && os_version != '10.6') # disabled on Linux due to bug 513558, on Mac after 10.6 due to bug 792304
[test_contextmenu_input.html]
skip-if = toolkit == "gtk2" || toolkit == "gtk3" # disabled on Linux due to bug 513558
skip-if = toolkit == "gtk2" || toolkit == "gtk3" || e10s # disabled on Linux due to bug 513558
[test_feed_discovery.html]
skip-if = e10s
[test_offlineNotification.html]
skip-if = buildapp == 'mulet' # Bug 1066070 - I don't think either popup notifications nor addon install stuff works?
skip-if = buildapp == 'mulet' || e10s # Bug 1066070 - I don't think either popup notifications nor addon install stuff works?
[test_offline_gzip.html]
skip-if = buildapp == 'mulet' # Bug 1066070 - I don't think either popup notifications nor addon install stuff works?
skip-if = buildapp == 'mulet' || e10s # Bug 1066070 - I don't think either popup notifications nor addon install stuff works?

2
browser/components/nsBrowserGlue.js
Просмотреть файл

@ -2244,7 +2244,7 @@ BrowserGlue.prototype = {
let imageURL = "chrome://browser/skin/web-notifications-icon.svg";
let title = gBrowserBundle.GetStringFromName("webNotifications.upgradeTitle");
let text = gBrowserBundle.GetStringFromName("webNotifications.upgradeInfo");
let url = Services.urlFormatter.formatURLPref("browser.push.warning.infoURL");
let url = Services.urlFormatter.formatURLPref("browser.push.warning.migrationURL");
try {
AlertsService.showAlertNotification(imageURL, title, text,

2
caps/DomainPolicy.cpp
Просмотреть файл

@ -35,7 +35,7 @@ BroadcastDomainSetChange(DomainSetType aSetType, DomainSetChangeType aChangeType
SerializeURI(aDomain, uri);
for (uint32_t i = 0; i < parents.Length(); i++) {
unused << parents[i]->SendDomainSetChanged(aSetType, aChangeType, uri);
Unused << parents[i]->SendDomainSetChanged(aSetType, aChangeType, uri);
}
return NS_OK;
}

2
chrome/nsChromeRegistryChrome.cpp
Просмотреть файл

@ -749,7 +749,7 @@ SendManifestEntry(const ChromeRegistryItem &aItem)
return;
for (uint32_t i = 0; i < parents.Length(); i++) {
unused << parents[i]->SendRegisterChromeItem(aItem);
Unused << parents[i]->SendRegisterChromeItem(aItem);
}
}

2
chrome/test/unit/head_crtestutils.js
Просмотреть файл

@ -9,6 +9,6 @@ var Cr = Components.results;
function registerManifests(manifests)
{
var reg = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
for each (var manifest in manifests)
for (var manifest of manifests)
reg.autoRegister(manifest);
}

12
config/static-checking.js
Просмотреть файл

@ -26,7 +26,7 @@ function LoadModules(modulelist)
return;
let modulenames = modulelist.split(',');
for each (let modulename in modulenames) {
for (let modulename of modulenames) {
let module = { __proto__: this };
include(modulename, module);
modules.push(module);
@ -39,7 +39,7 @@ if (treehydra_enabled())
function process_type(c)
{
for each (let module in modules)
for (let module of modules)
if (module.hasOwnProperty('process_type'))
module.process_type(c);
}
@ -51,9 +51,11 @@ function hasAttribute(c, attrname)
if (c.attributes === undefined)
return false;
for each (attr in c.attributes)
for (var key in c.attributes) {
attr = c.attributes[key];
if (attr.name == 'user' && attr.value[0] == attrname)
return true;
}
return false;
}
@ -135,7 +137,7 @@ const forward_functions = [
function setup_forwarding(n)
{
this[n] = function() {
for each (let module in modules) {
for (let module of modules) {
if (module.hasOwnProperty(n)) {
module[n].apply(this, arguments);
}
@ -143,5 +145,5 @@ function setup_forwarding(n)
}
}
for each (let n in forward_functions)
for (let n of forward_functions)
setup_forwarding(n);

1
devtools/shared/apps/tests/mochitest.ini
Просмотреть файл

@ -1,5 +1,4 @@
[DEFAULT]
skip-if = e10s
support-files =
debugger-protocol-helper.js
redirect.sjs

4
docshell/base/crashtests/crashtests.list
Просмотреть файл

@ -6,9 +6,9 @@ load 430628-1.html
load 432114-1.html
load 432114-2.html
load 436900-1.html
asserts(0-3) load 436900-2.html # bug 566159
asserts(0-1) load 436900-2.html # bug 566159
load 500328-1.html
load 514779-1.xhtml
load 614499-1.html
load 678872-1.html
skip-if(Android||B2G||browserIsRemote) pref(dom.disable_open_during_load,false) load 914521.html
skip-if(Android||B2G) pref(dom.disable_open_during_load,false) load 914521.html

2
docshell/base/nsDocShell.cpp
Просмотреть файл

@ -5107,7 +5107,7 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
// asserts). Satisfy that assertion now since GetDoc will force
// creation of one if it hasn't already been created.
if (mScriptGlobal) {
unused << mScriptGlobal->GetDoc();
Unused << mScriptGlobal->GetDoc();
}
// Display a message box

2
dom/animation/Animation.cpp
Просмотреть файл

@ -933,7 +933,7 @@ Animation::PauseAt(const TimeDuration& aReadyTime)
MOZ_ASSERT(mPendingState == PendingState::PausePending,
"Expected to pause a pause-pending animation");
if (!mStartTime.IsNull()) {
if (!mStartTime.IsNull() && mHoldTime.IsNull()) {
mHoldTime.SetValue((aReadyTime - mStartTime.Value())
.MultDouble(mPlaybackRate));
}

13
dom/animation/test/css-animations/file_animation-pausing.html
Просмотреть файл

@ -257,6 +257,19 @@ test(function(t) {
'infinite-duration animation');
}, 'pause() from idle with a negative playbackRate and endless effect');
promise_test(function(t) {
var div = addDiv(t, { style: 'animation: anim 1000s' });
return div.getAnimations()[0].ready
.then(function(animation) {
animation.finish();
animation.pause();
return animation.ready;
}).then(function(animation) {
assert_equals(animation.currentTime, 1000 * 1000,
'currentTime after pausing finished animation');
});
}, 'pause() on a finished animation');
done();
</script>
</body>

2
dom/animation/test/testcommon.js
Просмотреть файл

@ -96,7 +96,7 @@ if (opener) {
"assert_between_inclusive",
"assert_true", "assert_false",
"assert_class_string", "assert_throws",
"assert_unreached", "test"]) {
"assert_unreached", "promise_test", "test"]) {
window[funcName] = opener[funcName].bind(opener);
}

15
dom/apps/tests/mochitest.ini
Просмотреть файл

@ -1,5 +1,4 @@
[DEFAULT]
skip-if = e10s
support-files =
addons/application.zip
addons/invalid.webapp
@ -38,21 +37,21 @@ support-files =
icon48.png
[test_app_addons.html]
skip-if = os == "android" || toolkit == "gonk" # embed-apps doesn't work in mochitest app
skip-if = os == "android" || toolkit == "gonk" || e10s # embed-apps doesn't work in mochitest app
[test_app_blocklist.html]
skip-if = buildapp != 'mulet' # we need MOZ_B2G defined and the test to run in the parent process.
[test_app_enabled.html]
[test_app_update.html]
skip-if = os == "android" || toolkit == "gonk" # embed-apps doesn't work in mochitest app
skip-if = os == "android" || toolkit == "gonk" || e10s # embed-apps doesn't work in mochitest app
[test_bug_795164.html]
[test_bug_1168300.html]
skip-if = toolkit == "gonk" # see bug 1175784
skip-if = toolkit == "gonk" || e10s # see bug 1175784
[test_import_export.html]
[test_install_dev_mode.html]
[test_install_multiple_apps_origin.html]
[test_install_receipts.html]
[test_langpacks.html]
skip-if = os == "android" || toolkit == "gonk" # embed-apps doesn't work in mochitest app
skip-if = os == "android" || toolkit == "gonk" || e10s # embed-apps doesn't work in mochitest app
[test_marketplace_pkg_install.html]
skip-if = buildapp == "b2g" || toolkit == "android" # see bug 989806
[test_packaged_app_install.html]
@ -64,10 +63,10 @@ skip-if = (toolkit == 'android' && processor == 'x86') #x86 only
[test_uninstall_errors.html]
[test_theme_role.html]
[test_third_party_homescreen.html]
skip-if = os == "android" || toolkit == "gonk" # embed-apps doesn't work in mochitest app
skip-if = os == "android" || toolkit == "gonk" || e10s # embed-apps doesn't work in mochitest app
[test_web_app_install.html]
[test_widget.html]
skip-if = os == "android" || toolkit == "gonk" # embed-apps doesn't work in mochitest app
skip-if = os == "android" || toolkit == "gonk" || e10s # embed-apps doesn't work in mochitest app
[test_widget_browser.html]
skip-if = os == "android" || toolkit == "gonk" # embed-apps doesn't work in mochitest app
skip-if = os == "android" || toolkit == "gonk" || e10s # embed-apps doesn't work in mochitest app
[test_checkInstalled.html]

10
dom/asmjscache/AsmJSCache.cpp
Просмотреть файл

@ -56,7 +56,7 @@ using mozilla::ipc::BackgroundChild;
using mozilla::ipc::IsOnBackgroundThread;
using mozilla::ipc::PBackgroundChild;
using mozilla::ipc::PrincipalInfo;
using mozilla::unused;
using mozilla::Unused;
using mozilla::HashString;
namespace mozilla {
@ -478,7 +478,7 @@ private:
FinishOnOwningThread();
if (!mActorDestroyed) {
unused << Send__delete__(this, mResult);
Unused << Send__delete__(this, mResult);
}
}
@ -993,7 +993,7 @@ ParentRunnable::Run()
// Metadata is now open.
if (!SendOnOpenMetadataForRead(mMetadata)) {
unused << Send__delete__(this, JS::AsmJSCache_InternalError);
Unused << Send__delete__(this, JS::AsmJSCache_InternalError);
}
return NS_OK;
@ -1035,7 +1035,7 @@ ParentRunnable::Run()
FileDescriptor::PlatformHandleType handle =
FileDescriptor::PlatformHandleType(PR_FileDesc2NativeHandle(mFileDesc));
if (!SendOnOpenCacheFile(mFileSize, FileDescriptor(handle))) {
unused << Send__delete__(this, JS::AsmJSCache_InternalError);
Unused << Send__delete__(this, JS::AsmJSCache_InternalError);
}
return NS_OK;
@ -1451,7 +1451,7 @@ ChildRunnable::Run()
Release();
if (!mActorDestroyed) {
unused << Send__delete__(this, JS::AsmJSCache_Success);
Unused << Send__delete__(this, JS::AsmJSCache_Success);
}
mState = eFinished;

2
dom/base/FragmentOrElement.cpp
Просмотреть файл

@ -1159,7 +1159,7 @@ void
FragmentOrElement::GetTextContentInternal(nsAString& aTextContent,
ErrorResult& aError)
{
if(!nsContentUtils::GetNodeTextContent(this, true, aTextContent, fallible)) {
if (!nsContentUtils::GetNodeTextContent(this, true, aTextContent, fallible)) {
aError.Throw(NS_ERROR_OUT_OF_MEMORY);
}
}

2
dom/base/ImageEncoder.cpp
Просмотреть файл

@ -210,7 +210,7 @@ public:
rv = NS_DispatchToMainThread(mEncodingCompleteEvent);
if (NS_FAILED(rv)) {
// Better to leak than to crash.
unused << mEncodingCompleteEvent.forget();
Unused << mEncodingCompleteEvent.forget();
return rv;
}

0
dom/base/crashtests/713417.html → dom/base/crashtests/713417-1.html
Просмотреть файл

16
dom/base/crashtests/crashtests.list
Просмотреть файл

@ -1,3 +1,4 @@
load 43040-1.html
load 90613-1.html
load 116848-1.html
load 149320-1.html
@ -66,7 +67,6 @@ load 418928-1.html
load 420620-1.html
load 424276-1.html
load 426987-1.html
load 43040-1.html
load 439206-1.html
load 443538-1.svg
load 448615-1.html
@ -146,8 +146,8 @@ load 706283-1.html
load 708405-1.html
load 709384.html
load 709954.html
load 713417-1.html
load 713417-2.html
load 713417.html
load 715056.html
load 729431-1.xhtml
load 741163-1.html
@ -184,7 +184,7 @@ load 847127.html
load 849601.html
load 849727.html
load 849732.html
skip-if(Android) load 851353-1.html
load 851353-1.html
load 852381.html
load 863950.html
load 864448.html
@ -194,14 +194,14 @@ load 930250.html
load 942979.html
load 973401.html
load 978646.html
pref(dom.webcomponents.enabled,true) load 1027461-1.html
pref(dom.webcomponents.enabled,true) load 1024428-1.html
load 1026714.html
pref(dom.webcomponents.enabled,true) load 1027461-1.html
pref(dom.webcomponents.enabled,true) load 1029710.html
HTTP(..) load xhr_abortinprogress.html
load xhr_empty_datauri.html
load xhr_html_nullresponse.html
load structured_clone_container_throws.html
load 1154598.xhtml
load 1157995.html
load 1181619.html
load structured_clone_container_throws.html
HTTP(..) load xhr_abortinprogress.html
load xhr_empty_datauri.html
load xhr_html_nullresponse.html

12
dom/base/nsContentPermissionHelper.cpp
Просмотреть файл

@ -33,7 +33,7 @@
#include "nsIDOMEvent.h"
#include "nsWeakPtr.h"
using mozilla::unused; // <snicker>
using mozilla::Unused; // <snicker>
using namespace mozilla::dom;
using namespace mozilla;
@ -473,7 +473,7 @@ nsContentPermissionRequestProxy::nsContentPermissionRequesterProxy
mGetCallback = aCallback;
mWaitGettingResult = true;
unused << mParent->SendGetVisibility();
Unused << mParent->SendGetVisibility();
return NS_OK;
}
@ -608,7 +608,7 @@ nsContentPermissionRequestProxy::Cancel()
nsTArray<PermissionChoice> emptyChoices;
unused << ContentPermissionRequestParent::Send__delete__(mParent, false, emptyChoices);
Unused << ContentPermissionRequestParent::Send__delete__(mParent, false, emptyChoices);
mParent = nullptr;
return NS_OK;
}
@ -672,7 +672,7 @@ nsContentPermissionRequestProxy::Allow(JS::HandleValue aChoices)
return NS_ERROR_FAILURE;
}
unused << ContentPermissionRequestParent::Send__delete__(mParent, true, choices);
Unused << ContentPermissionRequestParent::Send__delete__(mParent, true, choices);
mParent = nullptr;
return NS_OK;
}
@ -776,7 +776,7 @@ RemotePermissionRequest::RecvGetVisibility()
bool isActive = false;
docshell->GetIsActive(&isActive);
unused << SendNotifyVisibility(isActive);
Unused << SendNotifyVisibility(isActive);
return true;
}
@ -787,6 +787,6 @@ RemotePermissionRequest::NotifyVisibility(bool isVisible)
return NS_OK;
}
unused << SendNotifyVisibility(isVisible);
Unused << SendNotifyVisibility(isVisible);
return NS_OK;
}

2
dom/base/nsFocusManager.cpp
Просмотреть файл

@ -1123,7 +1123,7 @@ void
ActivateOrDeactivateChild(TabParent* aParent, void* aArg)
{
bool active = static_cast<bool>(aArg);
unused << aParent->SendParentActivated(active);
Unused << aParent->SendParentActivated(active);
}
void

12
dom/base/nsFrameLoader.cpp
Просмотреть файл

@ -990,8 +990,8 @@ nsFrameLoader::SwapWithOtherRemoteLoader(nsFrameLoader* aOther,
mInSwap = aOther->mInSwap = false;
unused << mRemoteBrowser->SendSwappedWithOtherRemoteLoader();
unused << aOther->mRemoteBrowser->SendSwappedWithOtherRemoteLoader();
Unused << mRemoteBrowser->SendSwappedWithOtherRemoteLoader();
Unused << aOther->mRemoteBrowser->SendSwappedWithOtherRemoteLoader();
return NS_OK;
}
@ -2296,7 +2296,7 @@ nsFrameLoader::TryRemoteBrowser()
nsGkAtoms::mozpasspointerevents,
nsGkAtoms::_true,
eCaseMatters)) {
unused << mRemoteBrowser->SendSetUpdateHitRegion(true);
Unused << mRemoteBrowser->SendSetUpdateHitRegion(true);
}
ReallyLoadFrameScripts();
@ -2341,14 +2341,14 @@ nsFrameLoader::DeactivateRemoteFrame() {
void
nsFrameLoader::ActivateUpdateHitRegion() {
if (mRemoteBrowser) {
unused << mRemoteBrowser->SendSetUpdateHitRegion(true);
Unused << mRemoteBrowser->SendSetUpdateHitRegion(true);
}
}
void
nsFrameLoader::DeactivateUpdateHitRegion() {
if (mRemoteBrowser) {
unused << mRemoteBrowser->SendSetUpdateHitRegion(false);
Unused << mRemoteBrowser->SendSetUpdateHitRegion(false);
}
}
@ -2857,7 +2857,7 @@ nsFrameLoader::RequestNotifyAfterRemotePaint()
{
// If remote browsing (e10s), handle this with the TabParent.
if (mRemoteBrowser) {
unused << mRemoteBrowser->SendRequestNotifyAfterRemotePaint();
Unused << mRemoteBrowser->SendRequestNotifyAfterRemotePaint();
}
return NS_OK;

4
dom/base/nsGlobalWindow.cpp
Просмотреть файл

@ -11623,7 +11623,7 @@ nsGlobalWindow::SetTimeoutOrInterval(nsIScriptTimeoutHandler *aHandler,
}
// The timeout is now also held in the timer's closure.
unused << copy.forget();
Unused << copy.forget();
} else {
// If we are frozen, however, then we instead simply set
// timeout->mTimeRemaining to be the "time remaining" in the timeout (i.e.,
@ -12029,7 +12029,7 @@ nsGlobalWindow::RunTimeout(nsTimeout *aTimeout)
// through a timeout that fired while a modal (to this window)
// dialog was open or through other non-obvious paths.
MOZ_ASSERT(dummy_timeout->HasRefCntOne(), "dummy_timeout may leak");
unused << timeoutExtraRef.forget().take();
Unused << timeoutExtraRef.forget().take();
mTimeoutInsertionPoint = last_insertion_point;

245
dom/base/nsRange.cpp
Просмотреть файл

@ -35,6 +35,9 @@
#include "mozilla/Telemetry.h"
#include "mozilla/Likely.h"
#include "nsCSSFrameConstructor.h"
#include "nsStyleStruct.h"
#include "nsStyleStructInlines.h"
#include "nsComputedDOMStyle.h"
using namespace mozilla;
using namespace mozilla::dom;
@ -3193,3 +3196,245 @@ nsRange::ExcludeNonSelectableNodes(nsTArray<RefPtr<nsRange>>* aOutRanges)
}
}
}
struct InnerTextAccumulator
{
explicit InnerTextAccumulator(mozilla::dom::DOMString& aValue)
: mString(aValue.AsAString()), mRequiredLineBreakCount(0) {}
void FlushLineBreaks()
{
while (mRequiredLineBreakCount > 0) {
// Required line breaks at the start of the text are suppressed.
if (!mString.IsEmpty()) {
mString.Append('\n');
}
--mRequiredLineBreakCount;
}
}
void Append(char aCh)
{
Append(nsAutoString(aCh));
}
void Append(const nsAString& aString)
{
if (aString.IsEmpty()) {
return;
}
FlushLineBreaks();
mString.Append(aString);
}
void AddRequiredLineBreakCount(int8_t aCount)
{
mRequiredLineBreakCount = std::max(mRequiredLineBreakCount, aCount);
}
nsAString& mString;
int8_t mRequiredLineBreakCount;
};
static bool
IsVisibleAndNotInReplacedElement(nsIFrame* aFrame)
{
if (!aFrame || !aFrame->StyleVisibility()->IsVisible()) {
return false;
}
for (nsIFrame* f = aFrame->GetParent(); f; f = f->GetParent()) {
if (f->IsFrameOfType(nsIFrame::eReplaced) &&
!f->GetContent()->IsHTMLElement(nsGkAtoms::button)) {
return false;
}
}
return true;
}
static bool
ElementIsVisible(Element* aElement)
{
if (!aElement) {
return false;
}
RefPtr<nsStyleContext> sc = nsComputedDOMStyle::GetStyleContextForElement(
aElement, nullptr, nullptr);
return sc && sc->StyleVisibility()->IsVisible();
}
static void
AppendTransformedText(InnerTextAccumulator& aResult,
nsGenericDOMDataNode* aTextNode,
int32_t aStart, int32_t aEnd)
{
nsIFrame* frame = aTextNode->GetPrimaryFrame();
if (!IsVisibleAndNotInReplacedElement(frame)) {
return;
}
nsIFrame::RenderedText text = frame->GetRenderedText(aStart, aEnd);
aResult.Append(text.mString);
}
/**
* States for tree traversal. AT_NODE means that we are about to enter
* the current DOM node. AFTER_NODE means that we have just finished traversing
* the children of the current DOM node and are about to apply any
* "after processing the node's children" steps before we finish visiting
* the node.
*/
enum TreeTraversalState {
AT_NODE,
AFTER_NODE
};
static int8_t
GetRequiredInnerTextLineBreakCount(nsIFrame* aFrame)
{
if (aFrame->GetContent()->IsHTMLElement(nsGkAtoms::p)) {
return 2;
}
const nsStyleDisplay* styleDisplay = aFrame->StyleDisplay();
if (styleDisplay->IsBlockOutside(aFrame) ||
styleDisplay->mDisplay == NS_STYLE_DISPLAY_TABLE_CAPTION) {
return 1;
}
return 0;
}
static bool
IsLastCellOfRow(nsIFrame* aFrame)
{
nsIAtom* type = aFrame->GetType();
if (type != nsGkAtoms::tableCellFrame &&
type != nsGkAtoms::bcTableCellFrame) {
return true;
}
for (nsIFrame* c = aFrame; c; c = c->GetNextContinuation()) {
if (c->GetNextSibling()) {
return false;
}
}
return true;
}
static bool
IsLastRowOfRowGroup(nsIFrame* aFrame)
{
if (aFrame->GetType() != nsGkAtoms::tableRowFrame) {
return true;
}
for (nsIFrame* c = aFrame; c; c = c->GetNextContinuation()) {
if (c->GetNextSibling()) {
return false;
}
}
return true;
}
static bool
IsLastNonemptyRowGroupOfTable(nsIFrame* aFrame)
{
if (aFrame->GetType() != nsGkAtoms::tableRowGroupFrame) {
return true;
}
for (nsIFrame* c = aFrame; c; c = c->GetNextContinuation()) {
for (nsIFrame* next = c->GetNextSibling(); next; next = next->GetNextSibling()) {
if (next->GetFirstPrincipalChild()) {
return false;
}
}
}
return true;
}
void
nsRange::GetInnerTextNoFlush(DOMString& aValue, ErrorResult& aError,
nsIContent* aStartParent, uint32_t aStartOffset,
nsIContent* aEndParent, uint32_t aEndOffset)
{
InnerTextAccumulator result(aValue);
nsIContent* currentNode = aStartParent;
TreeTraversalState currentState = AFTER_NODE;
if (aStartParent->IsNodeOfType(nsINode::eTEXT)) {
auto t = static_cast<nsGenericDOMDataNode*>(aStartParent);
if (aStartParent == aEndParent) {
AppendTransformedText(result, t, aStartOffset, aEndOffset);
return;
}
AppendTransformedText(result, t, aStartOffset, t->TextLength());
} else {
if (uint32_t(aStartOffset) < aStartParent->GetChildCount()) {
currentNode = aStartParent->GetChildAt(aStartOffset);
currentState = AT_NODE;
}
}
nsIContent* endNode = aEndParent;
TreeTraversalState endState = AFTER_NODE;
if (aEndParent->IsNodeOfType(nsINode::eTEXT)) {
endState = AT_NODE;
} else {
if (uint32_t(aEndOffset) < aEndParent->GetChildCount()) {
endNode = aEndParent->GetChildAt(aEndOffset);
endState = AT_NODE;
}
}
while (currentNode != endNode || currentState != endState) {
nsIFrame* f = currentNode->GetPrimaryFrame();
bool isVisibleAndNotReplaced = IsVisibleAndNotInReplacedElement(f);
if (currentState == AT_NODE) {
bool isText = currentNode->IsNodeOfType(nsINode::eTEXT);
if (isText && currentNode->GetParent()->IsHTMLElement(nsGkAtoms::rp) &&
ElementIsVisible(currentNode->GetParent()->AsElement())) {
nsAutoString str;
currentNode->GetTextContent(str, aError);
result.Append(str);
} else if (isVisibleAndNotReplaced) {
result.AddRequiredLineBreakCount(GetRequiredInnerTextLineBreakCount(f));
if (isText) {
nsIFrame::RenderedText text = f->GetRenderedText();
result.Append(text.mString);
}
}
nsIContent* child = currentNode->GetFirstChild();
if (child) {
currentNode = child;
continue;
}
currentState = AFTER_NODE;
}
if (currentNode == endNode && currentState == endState) {
break;
}
if (isVisibleAndNotReplaced) {
if (currentNode->IsHTMLElement(nsGkAtoms::br)) {
result.Append('\n');
}
switch (f->StyleDisplay()->mDisplay) {
case NS_STYLE_DISPLAY_TABLE_CELL:
if (!IsLastCellOfRow(f)) {
result.Append('\t');
}
break;
case NS_STYLE_DISPLAY_TABLE_ROW:
if (!IsLastRowOfRowGroup(f) ||
!IsLastNonemptyRowGroupOfTable(f->GetParent())) {
result.Append('\n');
}
break;
}
result.AddRequiredLineBreakCount(GetRequiredInnerTextLineBreakCount(f));
}
nsIContent* next = currentNode->GetNextSibling();
if (next) {
currentNode = next;
currentState = AT_NODE;
} else {
currentNode = currentNode->GetParent();
}
}
if (aEndParent->IsNodeOfType(nsINode::eTEXT)) {
nsGenericDOMDataNode* t = static_cast<nsGenericDOMDataNode*>(aEndParent);
AppendTransformedText(result, t, 0, aEndOffset);
}
// Do not flush trailing line breaks! Required breaks at the end of the text
// are suppressed.
}

6
dom/base/nsRange.h
Просмотреть файл

@ -212,6 +212,12 @@ public:
bool aFlushLayout = true);
already_AddRefed<DOMRectList> GetClientRects(bool aClampToEdge = true,
bool aFlushLayout = true);
static void GetInnerTextNoFlush(mozilla::dom::DOMString& aValue,
mozilla::ErrorResult& aError,
nsIContent* aStartParent,
uint32_t aStartOffset,
nsIContent* aEndParent,
uint32_t aEndOffset);
nsINode* GetParentObject() const { return mOwner; }
virtual JSObject* WrapObject(JSContext* cx, JS::Handle<JSObject*> aGivenProto) override final;

6
dom/base/nsScriptLoader.cpp
Просмотреть файл

@ -819,8 +819,8 @@ NotifyOffThreadScriptLoadCompletedRunnable::~NotifyOffThreadScriptLoadCompletedR
} else {
MOZ_ASSERT(false, "We really shouldn't leak!");
// Better to leak than crash.
unused << mRequest.forget();
unused << mLoader.forget();
Unused << mRequest.forget();
Unused << mLoader.forget();
}
}
}
@ -890,7 +890,7 @@ nsScriptLoader::AttemptAsyncScriptCompile(nsScriptLoadRequest* aRequest)
mDocument->BlockOnload();
aRequest->mProgress = nsScriptLoadRequest::Progress_Compiling;
unused << runnable.forget();
Unused << runnable.forget();
return NS_OK;
}

4
dom/base/test/mochitest.ini
Просмотреть файл

@ -387,7 +387,7 @@ support-files = test_XHR_timeout.js
[test_blobconstructor.html]
[test_blob_fragment_and_query.html]
[test_bug166235.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined)
skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined)
[test_bug199959.html]
[test_bug218236.html]
[test_bug218277.html]
@ -829,7 +829,7 @@ support-files = file_bug1011748_redirect.sjs file_bug1011748_OK.sjs
[test_user_select.html]
skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android'
[test_bug1081686.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s
skip-if = buildapp == 'b2g' || toolkit == 'android'
[test_window_define_nonconfigurable.html]
skip-if = release_build
[test_root_iframe.html]

6
dom/bindings/crashtests/crashtests.list
Просмотреть файл

@ -1,11 +1,11 @@
skip-if(1) load 769464.html # bug 823822 - assert often leaks into other tests
skip load 769464.html # bug 823822 - assert often leaks into other tests
load 822340-1.html
load 822340-2.html
load 832899.html
load 860591.html
load 860551.html
load 862610.html
load 860591.html
load 862092.html
load 862610.html
load 869038.html
load 949940.html
load 1010658-1.html

4
dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.cpp
Просмотреть файл

@ -65,7 +65,7 @@ BluetoothDaemonA2dpModule::ConnectCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -86,7 +86,7 @@ BluetoothDaemonA2dpModule::DisconnectCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}

20
dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.cpp
Просмотреть файл

@ -68,7 +68,7 @@ BluetoothDaemonAvrcpModule::GetPlayStatusRspCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -94,7 +94,7 @@ BluetoothDaemonAvrcpModule::ListPlayerAppAttrRspCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -118,7 +118,7 @@ BluetoothDaemonAvrcpModule::ListPlayerAppValueRspCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -143,7 +143,7 @@ BluetoothDaemonAvrcpModule::GetPlayerAppValueRspCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -167,7 +167,7 @@ BluetoothDaemonAvrcpModule::GetPlayerAppAttrTextRspCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -191,7 +191,7 @@ BluetoothDaemonAvrcpModule::GetPlayerAppValueTextRspCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -215,7 +215,7 @@ BluetoothDaemonAvrcpModule::GetElementAttrRspCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -237,7 +237,7 @@ BluetoothDaemonAvrcpModule::SetPlayerAppValueRspCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -266,7 +266,7 @@ BluetoothDaemonAvrcpModule::RegisterNotificationRspCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -288,7 +288,7 @@ BluetoothDaemonAvrcpModule::SetVolumeCmd(uint8_t aVolume,
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}

40
dom/bluetooth/bluedroid/BluetoothDaemonCoreInterface.cpp
Просмотреть файл

@ -65,7 +65,7 @@ BluetoothDaemonCoreModule::EnableCmd(BluetoothResultHandler* aRes)
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -82,7 +82,7 @@ BluetoothDaemonCoreModule::DisableCmd(BluetoothResultHandler* aRes)
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -100,7 +100,7 @@ BluetoothDaemonCoreModule::GetAdapterPropertiesCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -122,7 +122,7 @@ BluetoothDaemonCoreModule::GetAdapterPropertyCmd(BluetoothPropertyType aType,
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -144,7 +144,7 @@ BluetoothDaemonCoreModule::SetAdapterPropertyCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -166,7 +166,7 @@ BluetoothDaemonCoreModule::GetRemoteDevicePropertiesCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -190,7 +190,7 @@ BluetoothDaemonCoreModule::GetRemoteDevicePropertyCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -214,7 +214,7 @@ BluetoothDaemonCoreModule::SetRemoteDevicePropertyCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -237,7 +237,7 @@ BluetoothDaemonCoreModule::GetRemoteServiceRecordCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -258,7 +258,7 @@ BluetoothDaemonCoreModule::GetRemoteServicesCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -275,7 +275,7 @@ BluetoothDaemonCoreModule::StartDiscoveryCmd(BluetoothResultHandler* aRes)
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -292,7 +292,7 @@ BluetoothDaemonCoreModule::CancelDiscoveryCmd(BluetoothResultHandler* aRes)
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -319,7 +319,7 @@ BluetoothDaemonCoreModule::CreateBondCmd(const BluetoothAddress& aBdAddr,
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -341,7 +341,7 @@ BluetoothDaemonCoreModule::RemoveBondCmd(const BluetoothAddress& aBdAddr,
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -363,7 +363,7 @@ BluetoothDaemonCoreModule::CancelBondCmd(const BluetoothAddress& aBdAddr,
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -387,7 +387,7 @@ BluetoothDaemonCoreModule::PinReplyCmd(const BluetoothAddress& aBdAddr,
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -411,7 +411,7 @@ BluetoothDaemonCoreModule::SspReplyCmd(const BluetoothAddress& aBdAddr,
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -433,7 +433,7 @@ BluetoothDaemonCoreModule::DutModeConfigureCmd(bool aEnable,
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -457,7 +457,7 @@ BluetoothDaemonCoreModule::DutModeSendCmd(uint16_t aOpcode,
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -481,7 +481,7 @@ BluetoothDaemonCoreModule::LeTestModeCmd(uint16_t aOpcode,
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}

70
dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.cpp
Просмотреть файл

@ -67,7 +67,7 @@ BluetoothDaemonGattModule::ClientRegisterCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -89,7 +89,7 @@ BluetoothDaemonGattModule::ClientUnregisterCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -113,7 +113,7 @@ BluetoothDaemonGattModule::ClientScanCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -143,7 +143,7 @@ BluetoothDaemonGattModule::ClientConnectCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -171,7 +171,7 @@ BluetoothDaemonGattModule::ClientDisconnectCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -196,7 +196,7 @@ BluetoothDaemonGattModule::ClientListenCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -222,7 +222,7 @@ BluetoothDaemonGattModule::ClientRefreshCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -250,7 +250,7 @@ BluetoothDaemonGattModule::ClientSearchServiceCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -279,7 +279,7 @@ BluetoothDaemonGattModule::ClientGetIncludedServiceCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -309,7 +309,7 @@ BluetoothDaemonGattModule::ClientGetCharacteristicCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -341,7 +341,7 @@ BluetoothDaemonGattModule::ClientGetDescriptorCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -369,7 +369,7 @@ BluetoothDaemonGattModule::ClientReadCharacteristicCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -396,7 +396,7 @@ BluetoothDaemonGattModule::ClientWriteCharacteristicCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -425,7 +425,7 @@ BluetoothDaemonGattModule::ClientReadDescriptorCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -453,7 +453,7 @@ BluetoothDaemonGattModule::ClientWriteDescriptorCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -477,7 +477,7 @@ BluetoothDaemonGattModule::ClientExecuteWriteCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -505,7 +505,7 @@ BluetoothDaemonGattModule::ClientRegisterNotificationCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -533,7 +533,7 @@ BluetoothDaemonGattModule::ClientDeregisterNotificationCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -558,7 +558,7 @@ BluetoothDaemonGattModule::ClientReadRemoteRssiCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -580,7 +580,7 @@ BluetoothDaemonGattModule::ClientGetDeviceTypeCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -616,7 +616,7 @@ BluetoothDaemonGattModule::ClientSetAdvDataCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -650,7 +650,7 @@ BluetoothDaemonGattModule::ClientTestCommandCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -672,7 +672,7 @@ BluetoothDaemonGattModule::ServerRegisterCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -694,7 +694,7 @@ BluetoothDaemonGattModule::ServerUnregisterCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -724,7 +724,7 @@ BluetoothDaemonGattModule::ServerConnectPeripheralCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -751,7 +751,7 @@ BluetoothDaemonGattModule::ServerDisconnectPeripheralCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -777,7 +777,7 @@ BluetoothDaemonGattModule::ServerAddServiceCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -804,7 +804,7 @@ BluetoothDaemonGattModule::ServerAddIncludedServiceCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -835,7 +835,7 @@ BluetoothDaemonGattModule::ServerAddCharacteristicCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -864,7 +864,7 @@ BluetoothDaemonGattModule::ServerAddDescriptorCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -891,7 +891,7 @@ BluetoothDaemonGattModule::ServerStartServiceCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -916,7 +916,7 @@ BluetoothDaemonGattModule::ServerStopServiceCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -941,7 +941,7 @@ BluetoothDaemonGattModule::ServerDeleteServiceCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -970,7 +970,7 @@ BluetoothDaemonGattModule::ServerSendIndicationCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -1003,7 +1003,7 @@ BluetoothDaemonGattModule::ServerSendResponseCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}

30
dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.cpp
Просмотреть файл

@ -71,7 +71,7 @@ BluetoothDaemonHandsfreeModule::ConnectCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -93,7 +93,7 @@ BluetoothDaemonHandsfreeModule::DisconnectCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -115,7 +115,7 @@ BluetoothDaemonHandsfreeModule::ConnectAudioCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -137,7 +137,7 @@ BluetoothDaemonHandsfreeModule::DisconnectAudioCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -162,7 +162,7 @@ BluetoothDaemonHandsfreeModule::StartVoiceRecognitionCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -187,7 +187,7 @@ BluetoothDaemonHandsfreeModule::StopVoiceRecognitionCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -217,7 +217,7 @@ BluetoothDaemonHandsfreeModule::VolumeControlCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -246,7 +246,7 @@ BluetoothDaemonHandsfreeModule::DeviceStatusNotificationCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -275,7 +275,7 @@ BluetoothDaemonHandsfreeModule::CopsResponseCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -326,7 +326,7 @@ BluetoothDaemonHandsfreeModule::CindResponseCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -355,7 +355,7 @@ BluetoothDaemonHandsfreeModule::FormattedAtResponseCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -387,7 +387,7 @@ BluetoothDaemonHandsfreeModule::AtResponseCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -430,7 +430,7 @@ BluetoothDaemonHandsfreeModule::ClccResponseCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -463,7 +463,7 @@ BluetoothDaemonHandsfreeModule::PhoneStateChangeCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}
@ -488,7 +488,7 @@ BluetoothDaemonHandsfreeModule::ConfigureWbsCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return NS_OK;
}

4
dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp
Просмотреть файл

@ -445,7 +445,7 @@ BluetoothDaemonInterface::Init(
// If we could not cleanup properly before and an old
// instance of the daemon is still running, we kill it
// here.
unused << NS_WARN_IF(property_set("ctl.stop", "bluetoothd"));
Unused << NS_WARN_IF(property_set("ctl.stop", "bluetoothd"));
mResultHandlerQ.AppendElement(aRes);
@ -1006,7 +1006,7 @@ BluetoothDaemonInterface::OnConnectError(int aIndex)
mCmdChannel->Close();
case CMD_CHANNEL:
// Stop daemon and close listen socket
unused << NS_WARN_IF(property_set("ctl.stop", "bluetoothd"));
Unused << NS_WARN_IF(property_set("ctl.stop", "bluetoothd"));
mListenSocket->Close();
case LISTEN_SOCKET:
if (!mResultHandlerQ.IsEmpty()) {

6
dom/bluetooth/bluedroid/BluetoothDaemonSetupInterface.cpp
Просмотреть файл

@ -77,7 +77,7 @@ BluetoothDaemonSetupModule::RegisterModuleCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -99,7 +99,7 @@ BluetoothDaemonSetupModule::UnregisterModuleCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -123,7 +123,7 @@ BluetoothDaemonSetupModule::ConfigurationCmd(
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}

4
dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.cpp
Просмотреть файл

@ -49,7 +49,7 @@ BluetoothDaemonSocketModule::ListenCmd(BluetoothSocketType aType,
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}
@ -80,7 +80,7 @@ BluetoothDaemonSocketModule::ConnectCmd(const BluetoothAddress& aBdAddr,
if (NS_FAILED(rv)) {
return rv;
}
unused << pdu.forget();
Unused << pdu.forget();
return rv;
}

2
dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp
Просмотреть файл

@ -2301,7 +2301,7 @@ BluetoothServiceBluedroid::RemoteDevicePropertiesNotification(
break;
}
}
unused << NS_WARN_IF(i == mGetRemoteServiceRecordArray.Length());
Unused << NS_WARN_IF(i == mGetRemoteServiceRecordArray.Length());
} else if (p.mType == PROPERTY_UNKNOWN) {
/* Bug 1065999: working around unknown properties */
} else {

26
dom/bluetooth/bluez/BluetoothDBusService.cpp
Просмотреть файл

@ -1234,7 +1234,7 @@ AppendDeviceName(BluetoothSignal& aSignal)
NS_ENSURE_TRUE_VOID(success);
unused << handler.forget(); // picked up by callback handler
Unused << handler.forget(); // picked up by callback handler
}
class SetPairingConfirmationTask : public Task
@ -1660,7 +1660,7 @@ private:
NS_ENSURE_TRUE(success, false);
unused << handler.forget(); // picked up by callback handler
Unused << handler.forget(); // picked up by callback handler
return true;
}
@ -1699,7 +1699,7 @@ public:
NS_ENSURE_TRUE_VOID(success);
unused << handler.forget(); /* picked up by callback handler */
Unused << handler.forget(); /* picked up by callback handler */
}
};
@ -2390,7 +2390,7 @@ protected:
return false;
}
unused << handler.forget(); // picked up by callback handler
Unused << handler.forget(); // picked up by callback handler
return true;
}
@ -2450,7 +2450,7 @@ public:
DBUS_TYPE_INVALID);
NS_ENSURE_TRUE_VOID(success);
unused << handler.forget(); // picked up by callback handler
Unused << handler.forget(); // picked up by callback handler
}
private:
@ -2523,7 +2523,7 @@ public:
DBUS_TYPE_INVALID);
NS_ENSURE_TRUE_VOID(success);
unused << mRunnable.forget(); // picked up by callback handler
Unused << mRunnable.forget(); // picked up by callback handler
}
private:
@ -2791,7 +2791,7 @@ protected:
NS_ENSURE_TRUE(success, false);
unused << handler.forget(); // picked up by callback handler
Unused << handler.forget(); // picked up by callback handler
return true;
}
@ -2954,7 +2954,7 @@ public:
1000, msg);
NS_ENSURE_TRUE_VOID(success);
unused << mRunnable.forget(); // picked up by callback handler
Unused << mRunnable.forget(); // picked up by callback handler
}
private:
@ -3099,7 +3099,7 @@ public:
DBUS_TYPE_INVALID);
NS_ENSURE_TRUE_VOID(success);
unused << mRunnable.forget(); // picked up by callback handler
Unused << mRunnable.forget(); // picked up by callback handler
/**
* FIXME: Bug 820274
@ -3168,7 +3168,7 @@ public:
DBUS_TYPE_INVALID);
NS_ENSURE_TRUE_VOID(success);
unused << mRunnable.forget(); // picked up by callback handler
Unused << mRunnable.forget(); // picked up by callback handler
}
protected:
@ -3622,7 +3622,7 @@ public:
DBUS_TYPE_INVALID);
NS_ENSURE_TRUE_VOID(success);
unused << handler.forget(); // picked up by callback handler
Unused << handler.forget(); // picked up by callback handler
}
private:
@ -3927,7 +3927,7 @@ public:
DBUS_TYPE_INVALID);
NS_ENSURE_TRUE_VOID(success);
unused << mRunnable.forget(); // picked up by callback handler
Unused << mRunnable.forget(); // picked up by callback handler
}
private:
@ -4057,7 +4057,7 @@ public:
DBUS_TYPE_INVALID);
NS_ENSURE_TRUE_VOID(success);
unused << mRunnable.forget(); // picked up by callback handler
Unused << mRunnable.forget(); // picked up by callback handler
}
private:

2
dom/bluetooth/common/BluetoothService.cpp
Просмотреть файл

@ -454,7 +454,7 @@ BluetoothService::SetEnabled(bool aEnabled)
GetAllBluetoothActors(childActors);
for (uint32_t index = 0; index < childActors.Length(); index++) {
unused << childActors[index]->SendEnabled(aEnabled);
Unused << childActors[index]->SendEnabled(aEnabled);
}
/**

6
dom/bluetooth/ipc/BluetoothParent.cpp
Просмотреть файл

@ -17,7 +17,7 @@
#include "BluetoothReplyRunnable.h"
#include "BluetoothService.h"
using mozilla::unused;
using mozilla::Unused;
USING_BLUETOOTH_NAMESPACE
/*******************************************************************************
@ -99,7 +99,7 @@ BluetoothParent::BeginShutdown()
{
// Only do something here if we haven't yet begun the shutdown sequence.
if (mShutdownState == Running) {
unused << SendBeginShutdown();
Unused << SendBeginShutdown();
mShutdownState = SentBeginShutdown;
}
}
@ -357,7 +357,7 @@ BluetoothParent::DeallocPBluetoothRequestParent(PBluetoothRequestParent* aActor)
void
BluetoothParent::Notify(const BluetoothSignal& aSignal)
{
unused << SendNotify(aSignal);
Unused << SendNotify(aSignal);
}
/*******************************************************************************

4
dom/broadcastchannel/BroadcastChannelParent.cpp
Просмотреть файл

@ -60,7 +60,7 @@ BroadcastChannelParent::RecvClose()
mService->UnregisterActor(this);
mService = nullptr;
unused << Send__delete__(this);
Unused << Send__delete__(this);
return true;
}
@ -105,7 +105,7 @@ BroadcastChannelParent::CheckAndDeliver(const ClonedMessageData& aData,
newData.blobsParent()[i] = blobParent;
}
unused << SendNotify(newData);
Unused << SendNotify(newData);
}
}

4
dom/broadcastchannel/tests/mochitest.ini
Просмотреть файл

@ -20,7 +20,7 @@ support-files =
[test_broadcastchannel_worker.html]
[test_broadcastchannel_worker_alive.html]
[test_broadcastchannel_mozbrowser.html]
skip-if = e10s || buildapp == 'b2g'
skip-if = buildapp == 'b2g'
[test_broadcastchannel_mozbrowser2.html]
skip-if = e10s || buildapp == 'b2g'
skip-if = buildapp == 'b2g'
[test_bfcache.html]

10
dom/cache/AutoUtils.cpp поставляемый
Просмотреть файл

@ -24,7 +24,7 @@
namespace {
using mozilla::unused;
using mozilla::Unused;
using mozilla::dom::cache::CachePushStreamChild;
using mozilla::dom::cache::CacheReadStream;
using mozilla::dom::cache::CacheReadStreamOrVoid;
@ -54,7 +54,7 @@ CleanupChildFds(CacheReadStream& aReadStream, CleanupAction aAction)
MOZ_ASSERT(fdSetActor);
if (aAction == Delete) {
unused << fdSetActor->Send__delete__(fdSetActor);
Unused << fdSetActor->Send__delete__(fdSetActor);
}
// FileDescriptorSet doesn't clear its fds in its ActorDestroy, so we
@ -114,7 +114,7 @@ CleanupParentFds(CacheReadStream& aReadStream, CleanupAction aAction)
MOZ_ASSERT(fdSetActor);
if (aAction == Delete) {
unused << fdSetActor->Send__delete__(fdSetActor);
Unused << fdSetActor->Send__delete__(fdSetActor);
}
// FileDescriptorSet doesn't clear its fds in its ActorDestroy, so we
@ -482,7 +482,7 @@ AutoParentOpResult::~AutoParentOpResult()
if (action == Forget || result.actorParent() == nullptr) {
break;
}
unused << PCacheParent::Send__delete__(result.actorParent());
Unused << PCacheParent::Send__delete__(result.actorParent());
}
default:
// other types do not need clean up
@ -490,7 +490,7 @@ AutoParentOpResult::~AutoParentOpResult()
}
if (action == Delete && mStreamControl) {
unused << PCacheStreamControlParent::Send__delete__(mStreamControl);
Unused << PCacheStreamControlParent::Send__delete__(mStreamControl);
}
}

2
dom/cache/CacheChild.cpp поставляемый
Просмотреть файл

@ -124,7 +124,7 @@ CacheChild::StartDestroy()
MOZ_ASSERT(!mListener);
// Start actor destruction from parent process
unused << SendTeardown();
Unused << SendTeardown();
}
void

8
dom/cache/CacheOpParent.cpp поставляемый
Просмотреть файл

@ -56,7 +56,7 @@ CacheOpParent::Execute(ManagerId* aManagerId)
RefPtr<Manager> manager;
nsresult rv = Manager::GetOrCreate(aManagerId, getter_AddRefs(manager));
if (NS_WARN_IF(NS_FAILED(rv))) {
unused << Send__delete__(this, ErrorResult(rv), void_t());
Unused << Send__delete__(this, ErrorResult(rv), void_t());
return;
}
@ -144,7 +144,7 @@ CacheOpParent::OnPrincipalVerified(nsresult aRv, ManagerId* aManagerId)
mVerifier = nullptr;
if (NS_WARN_IF(NS_FAILED(aRv))) {
unused << Send__delete__(this, ErrorResult(aRv), void_t());
Unused << Send__delete__(this, ErrorResult(aRv), void_t());
return;
}
@ -165,7 +165,7 @@ CacheOpParent::OnOpComplete(ErrorResult&& aRv, const CacheOpResult& aResult,
// Never send an op-specific result if we have an error. Instead, send
// void_t() to ensure that we don't leak actors on the child side.
if (NS_WARN_IF(aRv.Failed())) {
unused << Send__delete__(this, aRv, void_t());
Unused << Send__delete__(this, aRv, void_t());
aRv.SuppressException(); // We serialiazed it, as best we could.
return;
}
@ -190,7 +190,7 @@ CacheOpParent::OnOpComplete(ErrorResult&& aRv, const CacheOpResult& aResult,
result.Add(aSavedRequestList[i], aStreamList);
}
unused << Send__delete__(this, aRv, result.SendAsOpResult());
Unused << Send__delete__(this, aRv, result.SendAsOpResult());
}
already_AddRefed<nsIInputStream>

4
dom/cache/CachePushStreamChild.cpp поставляемый
Просмотреть файл

@ -192,7 +192,7 @@ CachePushStreamChild::DoRead()
// If we read any data from the stream, send it across.
if (!buffer.IsEmpty()) {
unused << SendBuffer(buffer);
Unused << SendBuffer(buffer);
}
if (rv == NS_BASE_STREAM_WOULD_BLOCK) {
@ -255,7 +255,7 @@ CachePushStreamChild::OnEnd(nsresult aRv)
}
// This will trigger an ActorDestroy() from the parent side
unused << SendClose(aRv);
Unused << SendClose(aRv);
}
} // namespace cache

2
dom/cache/CachePushStreamParent.cpp поставляемый
Просмотреть файл

@ -79,7 +79,7 @@ bool
CachePushStreamParent::RecvClose(const nsresult& aRv)
{
mWriter->CloseWithStatus(aRv);
unused << Send__delete__(this);
Unused << Send__delete__(this);
return true;
}

2
dom/cache/CacheStorage.cpp поставляемый
Просмотреть файл

@ -32,7 +32,7 @@ namespace mozilla {
namespace dom {
namespace cache {
using mozilla::unused;
using mozilla::Unused;
using mozilla::ErrorResult;
using mozilla::dom::workers::WorkerPrivate;
using mozilla::ipc::BackgroundChild;

4
dom/cache/CacheStorageChild.cpp поставляемый
Просмотреть файл

@ -53,7 +53,7 @@ CacheStorageChild::ExecuteOp(nsIGlobalObject* aGlobal, Promise* aPromise,
nsISupports* aParent, const CacheOpArgs& aArgs)
{
mNumChildActors += 1;
unused << SendPCacheOpConstructor(
Unused << SendPCacheOpConstructor(
new CacheOpChild(GetFeature(), aGlobal, aParent, aPromise), aArgs);
}
@ -99,7 +99,7 @@ CacheStorageChild::StartDestroy()
MOZ_ASSERT(!mListener);
// Start actor destruction from parent process
unused << SendTeardown();
Unused << SendTeardown();
}
void

2
dom/cache/CacheStorageParent.cpp поставляемый
Просмотреть файл

@ -101,7 +101,7 @@ CacheStorageParent::RecvPCacheOpConstructor(PCacheOpParent* aActor,
}
if (NS_WARN_IF(NS_FAILED(mVerifiedStatus))) {
unused << CacheOpParent::Send__delete__(actor, ErrorResult(mVerifiedStatus),
Unused << CacheOpParent::Send__delete__(actor, ErrorResult(mVerifiedStatus),
void_t());
return true;
}

6
dom/cache/CacheStreamControlChild.cpp поставляемый
Просмотреть файл

@ -101,7 +101,7 @@ CacheStreamControlChild::SerializeFds(CacheReadStream* aReadStreamOut,
if (!aFds.IsEmpty()) {
fdSet = Manager()->SendPFileDescriptorSetConstructor(aFds[0]);
for (uint32_t i = 1; i < aFds.Length(); ++i) {
unused << fdSet->SendAddFileDescriptor(aFds[i]);
Unused << fdSet->SendAddFileDescriptor(aFds[i]);
}
}
@ -128,14 +128,14 @@ CacheStreamControlChild::DeserializeFds(const CacheReadStream& aReadStream,
fdSetActor->ForgetFileDescriptors(aFdsOut);
MOZ_ASSERT(!aFdsOut.IsEmpty());
unused << fdSetActor->Send__delete__(fdSetActor);
Unused << fdSetActor->Send__delete__(fdSetActor);
}
void
CacheStreamControlChild::NoteClosedAfterForget(const nsID& aId)
{
NS_ASSERT_OWNINGTHREAD(CacheStreamControlChild);
unused << SendNoteClosed(aId);
Unused << SendNoteClosed(aId);
// A stream has closed. If we delayed StartDestry() due to this stream
// being read, then we should check to see if any of the remaining streams

6
dom/cache/CacheStreamControlParent.cpp поставляемый
Просмотреть файл

@ -61,7 +61,7 @@ CacheStreamControlParent::SerializeFds(CacheReadStream* aReadStreamOut,
if (!aFds.IsEmpty()) {
fdSet = Manager()->SendPFileDescriptorSetConstructor(aFds[0]);
for (uint32_t i = 1; i < aFds.Length(); ++i) {
unused << fdSet->SendAddFileDescriptor(aFds[i]);
Unused << fdSet->SendAddFileDescriptor(aFds[i]);
}
}
@ -141,7 +141,7 @@ CacheStreamControlParent::Close(const nsID& aId)
{
NS_ASSERT_OWNINGTHREAD(CacheStreamControlParent);
NotifyClose(aId);
unused << SendClose(aId);
Unused << SendClose(aId);
}
void
@ -149,7 +149,7 @@ CacheStreamControlParent::CloseAll()
{
NS_ASSERT_OWNINGTHREAD(CacheStreamControlParent);
NotifyCloseAll();
unused << SendCloseAll();
Unused << SendCloseAll();
}
void

2
dom/cache/FileUtils.cpp поставляемый
Просмотреть файл

@ -187,7 +187,7 @@ BodyCancelWrite(nsIFile* aBaseDir, nsISupports* aCopyContext)
MOZ_ASSERT(aCopyContext);
nsresult rv = NS_CancelAsyncCopy(aCopyContext, NS_ERROR_ABORT);
unused << NS_WARN_IF(NS_FAILED(rv));
Unused << NS_WARN_IF(NS_FAILED(rv));
// The partially written file must be cleaned up after the async copy
// makes its callback.

4
dom/cache/Manager.cpp поставляемый
Просмотреть файл

@ -138,7 +138,7 @@ public:
}
rv = BodyDeleteFiles(dbDir, mDeletedBodyIdList);
unused << NS_WARN_IF(NS_FAILED(rv));
Unused << NS_WARN_IF(NS_FAILED(rv));
aResolver->Resolve(rv);
}
@ -897,7 +897,7 @@ private:
}
rv = trans.Commit();
unused << NS_WARN_IF(NS_FAILED(rv));
Unused << NS_WARN_IF(NS_FAILED(rv));
DoResolve(rv);
}

2
dom/cache/ReadStream.cpp поставляемый
Просмотреть файл

@ -20,7 +20,7 @@ namespace mozilla {
namespace dom {
namespace cache {
using mozilla::unused;
using mozilla::Unused;
using mozilla::ipc::FileDescriptor;
// ----------------------------------------------------------------------------

2
dom/cache/TypeUtils.cpp поставляемый
Просмотреть файл

@ -78,7 +78,7 @@ SerializeNormalStream(nsIInputStream* aStream, CacheReadStream& aReadStreamOut)
fdSet = manager->SendPFileDescriptorSetConstructor(fds[0]);
for (uint32_t i = 1; i < fds.Length(); ++i) {
unused << fdSet->SendAddFileDescriptor(fds[i]);
Unused << fdSet->SendAddFileDescriptor(fds[i]);
}
}

4
dom/canvas/CanvasRenderingContext2D.cpp
Просмотреть файл

@ -1026,7 +1026,7 @@ CanvasRenderingContext2D::ParseColor(const nsAString& aString,
mCanvasElement, nullptr, presShell);
}
unused << nsRuleNode::ComputeColor(
Unused << nsRuleNode::ComputeColor(
value, presShell ? presShell->GetPresContext() : nullptr, parentContext,
*aColor);
}
@ -4888,7 +4888,7 @@ CanvasRenderingContext2D::DrawWindow(nsGlobalWindow& window, double x,
}
nsCOMPtr<nsIPresShell> shell = presContext->PresShell();
unused << shell->RenderDocument(r, renderDocFlags, backgroundColor, thebes);
Unused << shell->RenderDocument(r, renderDocFlags, backgroundColor, thebes);
if (drawDT) {
RefPtr<SourceSurface> snapshot = drawDT->Snapshot();
RefPtr<DataSourceSurface> data = snapshot->GetDataSurface();

2
dom/canvas/WebGL2ContextTransformFeedback.cpp
Просмотреть файл

@ -41,7 +41,7 @@ WebGL2Context::DeleteTransformFeedback(WebGLTransformFeedback* tf)
return;
if (mBoundTransformFeedback == tf)
BindTransformFeedback(LOCAL_GL_TRANSFORM_FEEDBACK, tf);
BindTransformFeedback(LOCAL_GL_TRANSFORM_FEEDBACK, nullptr);
tf->RequestDelete();
}

12
dom/canvas/crashtests/crashtests.list
Просмотреть файл

@ -1,18 +1,16 @@
load 0px-size-font-667225.html
load 0px-size-font-shadow.html
load 360293-1.html
load 421715-1.html
load 553938-1.html
load 647480.html
load 727547.html
load 0px-size-font-667225.html
load 0px-size-font-shadow.html
load texImage2D.html
load 729116.html
load 745699-1.html
load 746813-1.html
# this test crashes in a bunch places still
#load 745818-large-source.html
load 743499-negative-size.html
skip-if(Android) load 767337-1.html
skip-if(Android||B2G) load 745818-large-source.html # Bug XXX - Crashes Android/B2G mid-run w/o a stack
load 767337-1.html
skip-if(Android||B2G) load 780392-1.html # bug 833371 for B2G
skip-if(Android||B2G) skip-if(gtkWidget&&isDebugBuild) load 789933-1.html # bug 833371 for B2G, bug 1155252 for linux
load 794463-1.html
@ -25,4 +23,4 @@ load 1099143-1.html
load 1161277-1.html
load 1183363.html
load 1190705.html
load texImage2D.html

2
dom/datastore/DataStoreService.cpp
Просмотреть файл

@ -1326,7 +1326,7 @@ DataStoreService::EnableDataStore(uint32_t aAppId, const nsAString& aName,
ContentParent::GetAll(children);
for (uint32_t i = 0; i < children.Length(); i++) {
if (children[i]->NeedsDataStoreInfos()) {
unused << children[i]->SendDataStoreNotify(aAppId, nsAutoString(aName),
Unused << children[i]->SendDataStoreNotify(aAppId, nsAutoString(aName),
nsAutoString(aManifestURL));
}
}

24
dom/devicestorage/DeviceStorageRequestParent.cpp
Просмотреть файл

@ -415,7 +415,7 @@ DeviceStorageRequestParent::PostFreeSpaceResultEvent::CancelableRun() {
MOZ_ASSERT(NS_IsMainThread());
FreeSpaceStorageResponse response(mFreeSpace);
unused << mParent->Send__delete__(mParent, response);
Unused << mParent->Send__delete__(mParent, response);
return NS_OK;
}
@ -437,7 +437,7 @@ DeviceStorageRequestParent::PostUsedSpaceResultEvent::CancelableRun() {
MOZ_ASSERT(NS_IsMainThread());
UsedSpaceStorageResponse response(mUsedSpace);
unused << mParent->Send__delete__(mParent, response);
Unused << mParent->Send__delete__(mParent, response);
return NS_OK;
}
@ -455,7 +455,7 @@ DeviceStorageRequestParent::PostErrorEvent::CancelableRun() {
MOZ_ASSERT(NS_IsMainThread());
ErrorResponse response(mError);
unused << mParent->Send__delete__(mParent, response);
Unused << mParent->Send__delete__(mParent, response);
return NS_OK;
}
@ -472,7 +472,7 @@ DeviceStorageRequestParent::PostSuccessEvent::CancelableRun() {
MOZ_ASSERT(NS_IsMainThread());
SuccessResponse response;
unused << mParent->Send__delete__(mParent, response);
Unused << mParent->Send__delete__(mParent, response);
return NS_OK;
}
@ -509,14 +509,14 @@ DeviceStorageRequestParent::PostBlobSuccessEvent::CancelableRun() {
BlobParent* actor = cp->GetOrCreateActorForBlobImpl(blob);
if (!actor) {
ErrorResponse response(NS_LITERAL_STRING(POST_ERROR_EVENT_UNKNOWN));
unused << mParent->Send__delete__(mParent, response);
Unused << mParent->Send__delete__(mParent, response);
return NS_OK;
}
BlobResponse response;
response.blobParent() = actor;
unused << mParent->Send__delete__(mParent, response);
Unused << mParent->Send__delete__(mParent, response);
return NS_OK;
}
@ -540,7 +540,7 @@ DeviceStorageRequestParent::PostEnumerationSuccessEvent::CancelableRun() {
MOZ_ASSERT(NS_IsMainThread());
EnumerationResponse response(mStorageType, mRelPath, mPaths);
unused << mParent->Send__delete__(mParent, response);
Unused << mParent->Send__delete__(mParent, response);
return NS_OK;
}
@ -867,7 +867,7 @@ DeviceStorageRequestParent::PostPathResultEvent::CancelableRun()
MOZ_ASSERT(NS_IsMainThread());
SuccessResponse response;
unused << mParent->Send__delete__(mParent, response);
Unused << mParent->Send__delete__(mParent, response);
return NS_OK;
}
@ -890,7 +890,7 @@ DeviceStorageRequestParent::PostFileDescriptorResultEvent::CancelableRun()
MOZ_ASSERT(NS_IsMainThread());
FileDescriptorResponse response(mFileDescriptor);
unused << mParent->Send__delete__(mParent, response);
Unused << mParent->Send__delete__(mParent, response);
return NS_OK;
}
@ -918,7 +918,7 @@ DeviceStorageRequestParent::PostFormatResultEvent::CancelableRun()
}
FormatStorageResponse response(state);
unused << mParent->Send__delete__(mParent, response);
Unused << mParent->Send__delete__(mParent, response);
return NS_OK;
}
@ -946,7 +946,7 @@ DeviceStorageRequestParent::PostMountResultEvent::CancelableRun()
}
MountStorageResponse response(state);
unused << mParent->Send__delete__(mParent, response);
Unused << mParent->Send__delete__(mParent, response);
return NS_OK;
}
@ -974,7 +974,7 @@ DeviceStorageRequestParent::PostUnmountResultEvent::CancelableRun()
}
UnmountStorageResponse response(state);
unused << mParent->Send__delete__(mParent, response);
Unused << mParent->Send__delete__(mParent, response);
return NS_OK;
}

2
dom/events/EventDispatcher.cpp
Просмотреть файл

@ -255,7 +255,7 @@ void
EventTargetChainItem::PreHandleEvent(EventChainPreVisitor& aVisitor)
{
aVisitor.Reset();
unused << mTarget->PreHandleEvent(aVisitor);
Unused << mTarget->PreHandleEvent(aVisitor);
SetForceContentDispatch(aVisitor.mForceContentDispatch);
SetWantsWillHandleEvent(aVisitor.mWantsWillHandleEvent);
SetMayHaveListenerManager(aVisitor.mMayHaveListenerManager);

4
dom/events/IMEStateManager.cpp
Просмотреть файл

@ -417,7 +417,7 @@ IMEStateManager::OnChangeFocusInternal(nsPresContext* aPresContext,
("ISM: IMEStateManager::OnChangeFocusInternal(), notifying previous "
"focused child process of parent process or another child process "
"getting focus"));
unused << sActiveTabParent->SendStopIMEStateManagement();
Unused << sActiveTabParent->SendStopIMEStateManagement();
}
nsCOMPtr<nsIWidget> widget =
@ -445,7 +445,7 @@ IMEStateManager::OnChangeFocusInternal(nsPresContext* aPresContext,
// to be restored by the child process asynchronously. Therefore,
// some key events which are fired immediately after closing menu
// may not be handled by IME.
unused << newTabParent->
Unused << newTabParent->
SendMenuKeyboardListenerInstalled(sInstalledMenuKeyboardListener);
setIMEState = sInstalledMenuKeyboardListener;
} else if (focusActuallyChanging) {

6
dom/events/TextComposition.cpp
Просмотреть файл

@ -140,7 +140,7 @@ TextComposition::OnCompositionEventDiscarded(
if (mTabParent) {
// The composition event should be discarded in the child process too.
unused << mTabParent->SendCompositionEvent(*aCompositionEvent);
Unused << mTabParent->SendCompositionEvent(*aCompositionEvent);
}
// XXX If composition events are discarded, should we dispatch them with
@ -218,7 +218,7 @@ TextComposition::DispatchCompositionEvent(
// If the content is a container of TabParent, composition should be in the
// remote process.
if (mTabParent) {
unused << mTabParent->SendCompositionEvent(*aCompositionEvent);
Unused << mTabParent->SendCompositionEvent(*aCompositionEvent);
aCompositionEvent->mFlags.mPropagationStopped = true;
if (aCompositionEvent->CausesDOMTextEvent()) {
mLastData = aCompositionEvent->mData;
@ -386,7 +386,7 @@ TextComposition::HandleSelectionEvent(nsPresContext* aPresContext,
// If the content is a container of TabParent, composition should be in the
// remote process.
if (aTabParent) {
unused << aTabParent->SendSelectionEvent(*aSelectionEvent);
Unused << aTabParent->SendSelectionEvent(*aSelectionEvent);
aSelectionEvent->mFlags.mPropagationStopped = true;
return;
}

4
dom/events/crashtests/crashtests.list
Просмотреть файл

@ -8,10 +8,10 @@ load 682637-1.html
load 1033343.html
load 1035654-1.html
load 1035654-2.html
needs-focus load 1072137-1.html
load 1143972-1.html
load 1190036-1.html
needs-focus load 1072137-1.html
load eventctor-nulldictionary.html
load eventctor-nullstorage.html
load recursive-onload.html
load recursive-DOMNodeInserted.html
load recursive-onload.html

6
dom/events/test/mochitest.ini
Просмотреть файл

@ -26,7 +26,7 @@ skip-if = buildapp == 'b2g'
[test_bug1037990.html]
[test_bug299673-2.html]
[test_bug322588.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || e10s #Bug 931116, b2g desktop specific, initial triage
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
[test_bug328885.html]
[test_bug336682_1.html]
support-files = test_bug336682.js
@ -43,7 +43,7 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
# Sometimes fails to finish after tests pass on 'B2G ICS Emulator'.
skip-if = (os == 'b2g')
[test_bug422132.html]
skip-if = buildapp == 'b2g' || e10s # b2g(2 failures out of 8, mousewheel test) b2g-debug(2 failures out of 8, mousewheel test) b2g-desktop(2 failures out of 8, mousewheel test)
skip-if = buildapp == 'b2g' # b2g(2 failures out of 8, mousewheel test) b2g-debug(2 failures out of 8, mousewheel test) b2g-desktop(2 failures out of 8, mousewheel test)
[test_bug426082.html]
skip-if = buildapp == 'mulet' || buildapp == 'b2g' || os == "win" || toolkit == 'android' || e10s # Intermittent failures, bug 921693 # b2g(1 failure out of 6, Moving the mouse down from the label should have unpressed the button) b2g-debug(1 failure out of 6, Moving the mouse down from the label should have unpressed the button) b2g-desktop(1 failure out of 6, Moving the mouse down from the label should have unpressed the button)
[test_bug427537.html]
@ -64,7 +64,7 @@ skip-if = buildapp == 'mulet' || (buildapp == 'b2g' && toolkit != 'gonk') #Bug 9
[test_bug502818.html]
skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
[test_bug508479.html]
skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #CRASH_DUMP, RANDOM # b2g(drag event, also fails on Android) b2g-debug(drag event, also fails on Android) b2g-desktop(drag event, also fails on Android)
skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #CRASH_DUMP, RANDOM # b2g(drag event, also fails on Android) b2g-debug(drag event, also fails on Android) b2g-desktop(drag event, also fails on Android)
[test_bug822898.html]
[test_bug517851.html]
[test_bug534833.html]

4
dom/fetch/FetchDriver.cpp
Просмотреть файл

@ -781,8 +781,8 @@ FetchDriver::AsyncOnChannelRedirect(nsIChannel* aOldChannel,
// be ignored.
MOZ_ASSERT(!mFoundOpaqueRedirect);
mFoundOpaqueRedirect = true;
unused << OnStartRequest(aOldChannel, nullptr);
unused << OnStopRequest(aOldChannel, nullptr, NS_OK);
Unused << OnStartRequest(aOldChannel, nullptr);
Unused << OnStopRequest(aOldChannel, nullptr, NS_OK);
aOldChannel->Cancel(NS_BINDING_FAILED);

4
dom/fetch/Request.cpp
Просмотреть файл

@ -109,7 +109,7 @@ GetRequestURLFromDocument(nsIDocument* aDocument, const nsAString& aInput,
// This fails with URIs with weird protocols, even when they are valid,
// so we ignore the failure
nsAutoCString credentials;
unused << resolvedURI->GetUserPass(credentials);
Unused << resolvedURI->GetUserPass(credentials);
if (!credentials.IsEmpty()) {
aRv.ThrowTypeError<MSG_URL_HAS_CREDENTIALS>(&aInput);
return;
@ -148,7 +148,7 @@ GetRequestURLFromChrome(const nsAString& aInput, nsAString& aRequestURL,
// This fails with URIs with weird protocols, even when they are valid,
// so we ignore the failure
nsAutoCString credentials;
unused << uri->GetUserPass(credentials);
Unused << uri->GetUserPass(credentials);
if (!credentials.IsEmpty()) {
aRv.ThrowTypeError<MSG_URL_HAS_CREDENTIALS>(&aInput);
return;

6
dom/filehandle/ActorsParent.cpp
Просмотреть файл

@ -1003,7 +1003,7 @@ FileHandleThreadPool::Cleanup()
MOZ_ASSERT(completeCallback);
MOZ_ASSERT(completeCallback->mCallback);
unused << completeCallback->mCallback->Run();
Unused << completeCallback->mCallback->Run();
}
mCompleteCallbacks.Clear();
@ -1651,7 +1651,7 @@ FileHandle::SendCompleteNotification(bool aAborted)
AssertIsOnBackgroundThread();
if (!IsActorDestroyed()) {
unused << SendComplete(aAborted);
Unused << SendComplete(aAborted);
}
}
@ -2280,7 +2280,7 @@ ProgressRunnable::Run()
{
AssertIsOnBackgroundThread();
unused << mCopyFileHandleOp->SendProgress(mProgress, mProgressMax);
Unused << mCopyFileHandleOp->SendProgress(mProgress, mProgressMax);
mCopyFileHandleOp = nullptr;

2
dom/filesystem/FileSystemTaskBase.cpp
Просмотреть файл

@ -111,7 +111,7 @@ FileSystemTaskBase::HandleResult()
return;
}
if (mRequestParent && mRequestParent->IsRunning()) {
unused << mRequestParent->Send__delete__(mRequestParent,
Unused << mRequestParent->Send__delete__(mRequestParent,
GetRequestResult());
} else {
HandlerCallback();

16
dom/fmradio/ipc/FMRadioParent.cpp
Просмотреть файл

@ -98,41 +98,41 @@ FMRadioParent::Notify(const FMRadioEventType& aType)
{
switch (aType) {
case FrequencyChanged:
unused << SendNotifyFrequencyChanged(
Unused << SendNotifyFrequencyChanged(
IFMRadioService::Singleton()->GetFrequency());
break;
case EnabledChanged:
unused << SendNotifyEnabledChanged(
Unused << SendNotifyEnabledChanged(
IFMRadioService::Singleton()->IsEnabled(),
IFMRadioService::Singleton()->GetFrequency());
break;
case RDSEnabledChanged:
unused << SendNotifyRDSEnabledChanged(
Unused << SendNotifyRDSEnabledChanged(
IFMRadioService::Singleton()->IsRDSEnabled());
break;
case PIChanged: {
Nullable<unsigned short> pi =
IFMRadioService::Singleton()->GetPi();
unused << SendNotifyPIChanged(!pi.IsNull(),
Unused << SendNotifyPIChanged(!pi.IsNull(),
pi.IsNull() ? 0 : pi.Value());
break;
}
case PTYChanged: {
Nullable<uint8_t> pty = IFMRadioService::Singleton()->GetPty();
unused << SendNotifyPTYChanged(!pty.IsNull(),
Unused << SendNotifyPTYChanged(!pty.IsNull(),
pty.IsNull() ? 0 : pty.Value());
break;
}
case PSChanged: {
nsAutoString psname;
IFMRadioService::Singleton()->GetPs(psname);
unused << SendNotifyPSChanged(psname);
Unused << SendNotifyPSChanged(psname);
break;
}
case RadiotextChanged: {
nsAutoString radiotext;
IFMRadioService::Singleton()->GetRt(radiotext);
unused << SendNotifyRadiotextChanged(radiotext);
Unused << SendNotifyRadiotextChanged(radiotext);
break;
}
case NewRDSGroup: {
@ -140,7 +140,7 @@ FMRadioParent::Notify(const FMRadioEventType& aType)
DebugOnly<bool> rdsgroupset =
IFMRadioService::Singleton()->GetRdsgroup(group);
MOZ_ASSERT(rdsgroupset);
unused << SendNotifyNewRDSGroup(group);
Unused << SendNotifyNewRDSGroup(group);
break;
}
default:

2
dom/fmradio/ipc/FMRadioRequestParent.cpp
Просмотреть файл

@ -34,7 +34,7 @@ FMRadioRequestParent::Run()
MOZ_ASSERT(NS_IsMainThread(), "Wrong thread!");
if (!mActorDestroyed) {
unused << Send__delete__(this, mResponseType);
Unused << Send__delete__(this, mResponseType);
}
return NS_OK;

2
dom/gamepad/GamepadFunctions.cpp
Просмотреть файл

@ -29,7 +29,7 @@ NotifyGamepadChange(const T& aInfo)
nsTArray<ContentParent*> t;
ContentParent::GetAll(t);
for(uint32_t i = 0; i < t.Length(); ++i) {
unused << t[i]->SendGamepadUpdate(e);
Unused << t[i]->SendGamepadUpdate(e);
}
// If we have a GamepadService in the main process, send directly to it.
if (GamepadService::IsServiceRunning()) {

4
dom/geolocation/nsGeolocation.cpp
Просмотреть файл

@ -63,7 +63,7 @@ class nsIPrincipal;
// the geolocation enabled setting
#define GEO_SETTINGS_ENABLED "geolocation.enabled"
using mozilla::unused; // <snicker>
using mozilla::Unused; // <snicker>
using namespace mozilla;
using namespace mozilla::dom;
@ -1276,7 +1276,7 @@ Geolocation::RemoveRequest(nsGeolocationRequest* aRequest)
(mPendingCallbacks.RemoveElement(aRequest) !=
mWatchingCallbacks.RemoveElement(aRequest));
unused << requestWasKnown;
Unused << requestWasKnown;
}
NS_IMETHODIMP

2
dom/geolocation/nsGeolocationSettings.cpp
Просмотреть файл

@ -37,7 +37,7 @@
#define GEO_ALA_TYPE_VALUE_FIXED "user-defined"
#define GEO_ALA_TYPE_VALUE_NONE "no-location"
using mozilla::unused;
using mozilla::Unused;
using namespace mozilla;
using namespace mozilla::dom;

2
dom/html/crashtests/crashtests.list
Просмотреть файл

@ -1,3 +1,4 @@
load 68912-1.html
load 257818-1.html
load 285166-1.html
load 294235-1.html
@ -50,7 +51,6 @@ load 673853.html
load 680922-1.xul
load 682058.xhtml
load 682460.html
load 68912-1.html
load 738744.xhtml
load 741218.json
load 741250.xhtml

77
dom/html/nsGenericHTMLElement.cpp
Просмотреть файл

@ -84,6 +84,8 @@
#include "nsITextControlElement.h"
#include "mozilla/dom/Element.h"
#include "HTMLFieldSetElement.h"
#include "nsTextNode.h"
#include "HTMLBRElement.h"
#include "HTMLMenuElement.h"
#include "nsDOMMutationObserver.h"
#include "mozilla/Preferences.h"
@ -104,6 +106,7 @@
#include "nsGlobalWindow.h"
#include "mozilla/dom/HTMLBodyElement.h"
#include "imgIContainer.h"
#include "nsComputedDOMStyle.h"
using namespace mozilla;
using namespace mozilla::dom;
@ -3292,3 +3295,77 @@ nsGenericHTMLElement::NewURIFromString(const nsAString& aURISpec,
return NS_OK;
}
void
nsGenericHTMLElement::GetInnerText(mozilla::dom::DOMString& aValue,
mozilla::ErrorResult& aError)
{
if (!GetPrimaryFrame(Flush_Layout)) {
RefPtr<nsStyleContext> sc =
nsComputedDOMStyle::GetStyleContextForElementNoFlush(this, nullptr, nullptr);
if (!sc || sc->StyleDisplay()->mDisplay == NS_STYLE_DISPLAY_NONE ||
!IsInComposedDoc()) {
GetTextContentInternal(aValue, aError);
return;
}
}
nsRange::GetInnerTextNoFlush(aValue, aError, this, 0, this, GetChildCount());
}
void
nsGenericHTMLElement::SetInnerText(const nsAString& aValue)
{
// Fire DOMNodeRemoved mutation events before we do anything else.
nsCOMPtr<nsIContent> kungFuDeathGrip;
// Batch possible DOMSubtreeModified events.
mozAutoSubtreeModified subtree(OwnerDoc(), nullptr);
FireNodeRemovedForChildren();
// Might as well stick a batch around this since we're performing several
// mutations.
mozAutoDocUpdate updateBatch(GetComposedDoc(),
UPDATE_CONTENT_MODEL, true);
nsAutoMutationBatch mb;
uint32_t childCount = GetChildCount();
mb.Init(this, true, false);
for (uint32_t i = 0; i < childCount; ++i) {
RemoveChildAt(0, true);
}
mb.RemovalDone();
nsString str;
const char16_t* s = aValue.BeginReading();
const char16_t* end = aValue.EndReading();
while (true) {
if (s != end && *s == '\r' && s + 1 != end && s[1] == '\n') {
// a \r\n pair should only generate one <br>, so just skip the \r
++s;
}
if (s == end || *s == '\r' || *s == '\n') {
if (!str.IsEmpty()) {
RefPtr<nsTextNode> textContent =
new nsTextNode(NodeInfo()->NodeInfoManager());
textContent->SetText(str, true);
AppendChildTo(textContent, true);
}
if (s == end) {
break;
}
str.Truncate();
already_AddRefed<mozilla::dom::NodeInfo> ni =
NodeInfo()->NodeInfoManager()->GetNodeInfo(nsGkAtoms::br,
nullptr, kNameSpaceID_XHTML, nsIDOMNode::ELEMENT_NODE);
RefPtr<HTMLBRElement> br = new HTMLBRElement(ni);
AppendChildTo(br, true);
} else {
str.Append(*s);
}
++s;
}
mb.NodesAdded();
}

3
dom/html/nsGenericHTMLElement.h
Просмотреть файл

@ -241,6 +241,9 @@ public:
mScrollgrab = aValue;
}
void GetInnerText(mozilla::dom::DOMString& aValue, mozilla::ErrorResult& aError);
void SetInnerText(const nsAString& aValue);
/**
* Determine whether an attribute is an event (onclick, etc.)
* @param aName the attribute

2
dom/html/test/mochitest.ini
Просмотреть файл

@ -535,7 +535,7 @@ skip-if = toolkit == 'android' || (toolkit == 'gonk' && debug) #bug 871015, bug
[test_bug196523.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
[test_bug199692.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit == 'android' || e10s #bug 811644 #Bug 931116, b2g desktop specific, initial triage
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit == 'android' #bug 811644 #Bug 931116, b2g desktop specific, initial triage
[test_bug172261.html]
[test_bug255820.html]
[test_bug259332.html]

4
dom/identity/nsDOMIdentity.js
Просмотреть файл

@ -28,6 +28,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "checkRenamed",
"resource://gre/modules/identity/IdentityUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "objectCopy",
"resource://gre/modules/identity/IdentityUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "makeMessageObject",
"resource://gre/modules/identity/IdentityUtils.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "uuidgen",
"@mozilla.org/uuid-generator;1",
@ -639,7 +641,7 @@ nsDOMIdentity.prototype = {
this._log("DOMIdentityMessage: " + JSON.stringify(message));
return message;
return makeMessageObject(message);
},
/**

52
dom/indexedDB/ActorsParent.cpp
Просмотреть файл

@ -5313,7 +5313,7 @@ public:
void
CloseDatabaseWhenIdle(const nsACString& aDatabaseId)
{
unused << CloseDatabaseWhenIdleInternal(aDatabaseId);
Unused << CloseDatabaseWhenIdleInternal(aDatabaseId);
}
void
@ -9592,7 +9592,7 @@ RecvPIndexedDBPermissionRequestConstructor(
}
if (permission != PermissionRequestBase::kPermissionPrompt) {
unused <<
Unused <<
PIndexedDBPermissionRequestParent::Send__delete__(actor, permission);
}
@ -9850,7 +9850,7 @@ DatabaseConnection::RollbackWriteTransaction()
// This may fail if SQLite already rolled back the transaction so ignore any
// errors.
unused << stmt->Execute();
Unused << stmt->Execute();
mInWriteTransaction = false;
}
@ -9978,7 +9978,7 @@ DatabaseConnection::RollbackSavepoint()
// This may fail if SQLite already rolled back the savepoint so ignore any
// errors.
unused << stmt->Execute();
Unused << stmt->Execute();
return NS_OK;
}
@ -10068,7 +10068,7 @@ DatabaseConnection::DoIdleProcessing(bool aNeedsCheckpoint)
// Release the connection's normal transaction. It's possible that it could
// fail, but that isn't a problem here.
unused << rollbackStmt->Execute();
Unused << rollbackStmt->Execute();
mInReadTransaction = false;
}
@ -10093,7 +10093,7 @@ DatabaseConnection::DoIdleProcessing(bool aNeedsCheckpoint)
// Truncate the WAL if we were asked to or if we managed to free some space.
if (aNeedsCheckpoint || freedSomePages) {
rv = CheckpointInternal(CheckpointMode::Truncate);
unused << NS_WARN_IF(NS_FAILED(rv));
Unused << NS_WARN_IF(NS_FAILED(rv));
}
// Finally try to restart the read transaction if we rolled it back earlier.
@ -10219,7 +10219,7 @@ DatabaseConnection::ReclaimFreePagesWhileIdle(
MOZ_ASSERT(mInWriteTransaction);
// Something failed, make sure we roll everything back.
unused << aRollbackStatement->Execute();
Unused << aRollbackStatement->Execute();
mInWriteTransaction = false;
@ -11187,7 +11187,7 @@ ConnectionPool::Start(const nsID& aBackgroundChildLoggingId,
}
if (!transactionInfo->mBlockedOn.Count()) {
unused << ScheduleTransaction(transactionInfo,
Unused << ScheduleTransaction(transactionInfo,
/* aFromQueuedTransactions */ false);
}
@ -11280,7 +11280,7 @@ ConnectionPool::WaitForDatabasesToComplete(nsTArray<nsCString>&& aDatabaseIds,
}
if (mayRunCallbackImmediately) {
unused << aCallback->Run();
Unused << aCallback->Run();
return;
}
@ -11352,7 +11352,7 @@ ConnectionPool::Cleanup()
MOZ_ASSERT(completeCallback);
MOZ_ASSERT(completeCallback->mCallback);
unused << completeCallback->mCallback->Run();
Unused << completeCallback->mCallback->Run();
}
mCompleteCallbacks.Clear();
@ -11878,7 +11878,7 @@ ConnectionPool::NoteClosedDatabase(DatabaseInfo* aDatabaseInfo)
for (uint32_t index = 0, count = scheduledTransactions.Length();
index < count;
index++) {
unused << ScheduleTransaction(scheduledTransactions[index],
Unused << ScheduleTransaction(scheduledTransactions[index],
/* aFromQueuedTransactions */ false);
}
@ -11943,7 +11943,7 @@ ConnectionPool::MaybeFireCallback(DatabasesCompleteCallback* aCallback)
}
}
unused << aCallback->mCallback->Run();
Unused << aCallback->mCallback->Run();
return true;
}
@ -12222,7 +12222,7 @@ FinishCallbackWrapper::Run()
mHasRunOnce = true;
unused << mCallback->Run();
Unused << mCallback->Run();
MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
mOwningThread->Dispatch(this, NS_DISPATCH_NORMAL)));
@ -12520,7 +12520,7 @@ TransactionInfo::Schedule()
MOZ_ASSERT(connectionPool);
connectionPool->AssertIsOnOwningThread();
unused <<
Unused <<
connectionPool->ScheduleTransaction(this,
/* aFromQueuedTransactions */ false);
}
@ -12910,7 +12910,7 @@ WaitForTransactionsHelper::WaitForTransactions()
{
MOZ_ASSERT(mState == State::Initial);
unused << this->Run();
Unused << this->Run();
}
void
@ -13142,7 +13142,7 @@ Database::Invalidate()
mInvalidated = true;
if (mActorWasAlive && !mActorDestroyed) {
unused << SendInvalidate();
Unused << SendInvalidate();
}
if (!Helper::InvalidateTransactions(mTransactions)) {
@ -14748,7 +14748,7 @@ NormalTransaction::SendCompleteNotification(nsresult aResult)
AssertIsOnBackgroundThread();
if (!IsActorDestroyed()) {
unused << SendComplete(aResult);
Unused << SendComplete(aResult);
}
}
@ -15047,7 +15047,7 @@ VersionChangeTransaction::SendCompleteNotification(nsresult aResult)
openDatabaseOp->mState = OpenDatabaseOp::State::SendingResults;
if (!IsActorDestroyed()) {
unused << SendComplete(aResult);
Unused << SendComplete(aResult);
}
MOZ_ALWAYS_TRUE(NS_SUCCEEDED(openDatabaseOp->Run()));
@ -16843,7 +16843,7 @@ QuotaClient::PerformIdleMaintenance()
if (kRunningXPCShellTests) {
// We don't want user activity to impact this code if we're running tests.
unused << Observe(nullptr, OBSERVER_TOPIC_IDLE, nullptr);
Unused << Observe(nullptr, OBSERVER_TOPIC_IDLE, nullptr);
} else if (!mIdleObserverRegistered) {
nsCOMPtr<nsIIdleService> idleService =
do_GetService(kIdleServiceContractId);
@ -18009,7 +18009,7 @@ AutoProgressHandler::Unregister()
nsCOMPtr<mozIStorageProgressHandler> oldHandler;
nsresult rv = mConnection->RemoveProgressHandler(getter_AddRefs(oldHandler));
unused << NS_WARN_IF(NS_FAILED(rv));
Unused << NS_WARN_IF(NS_FAILED(rv));
MOZ_ASSERT_IF(NS_SUCCEEDED(rv), oldHandler == this);
}
@ -20932,7 +20932,7 @@ OpenDatabaseOp::SendBlockedNotification()
MOZ_ASSERT(mState == State::WaitingForOtherDatabasesToClose);
if (!IsActorDestroyed()) {
unused << SendBlocked(mMetadata->mCommonMetadata.version());
Unused << SendBlocked(mMetadata->mCommonMetadata.version());
}
}
@ -21095,7 +21095,7 @@ OpenDatabaseOp::SendResults()
response = ClampResultCode(mResultCode);
}
unused <<
Unused <<
PBackgroundIDBFactoryRequestParent::Send__delete__(this, response);
}
@ -21821,7 +21821,7 @@ DeleteDatabaseOp::SendBlockedNotification()
MOZ_ASSERT(mState == State::WaitingForOtherDatabasesToClose);
if (!IsActorDestroyed()) {
unused << SendBlocked(0);
Unused << SendBlocked(0);
}
}
@ -21840,7 +21840,7 @@ DeleteDatabaseOp::SendResults()
response = ClampResultCode(mResultCode);
}
unused <<
Unused <<
PBackgroundIDBFactoryRequestParent::Send__delete__(this, response);
}
@ -22914,7 +22914,7 @@ CreateFileOp::SendResults()
response = ClampResultCode(mResultCode);
}
unused <<
Unused <<
PBackgroundIDBDatabaseRequestParent::Send__delete__(this, response);
}
@ -27272,7 +27272,7 @@ PermissionRequestHelper::OnPromptComplete(PermissionValue aPermissionValue)
MOZ_ASSERT(NS_IsMainThread());
if (!mActorDestroyed) {
unused <<
Unused <<
PIndexedDBPermissionRequestParent::Send__delete__(this, aPermissionValue);
}
}

4
dom/ipc/Blob.cpp
Просмотреть файл

@ -273,7 +273,7 @@ CancelableRunnableWrapper::Cancel()
return NS_ERROR_UNEXPECTED;
}
unused << Run();
Unused << Run();
MOZ_ASSERT(!mRunnable);
return NS_OK;
@ -4108,7 +4108,7 @@ BlobParent::NoteDyingRemoteBlobImpl()
mBlobImpl = nullptr;
mRemoteBlobImpl = nullptr;
unused << PBlobParent::Send__delete__(this);
Unused << PBlobParent::Send__delete__(this);
}
void

8
dom/ipc/ColorPickerParent.cpp
Просмотреть файл

@ -12,7 +12,7 @@
#include "mozilla/dom/Element.h"
#include "mozilla/dom/TabParent.h"
using mozilla::unused;
using mozilla::Unused;
using namespace mozilla::dom;
NS_IMPL_ISUPPORTS(ColorPickerParent::ColorPickerShownCallback,
@ -22,7 +22,7 @@ NS_IMETHODIMP
ColorPickerParent::ColorPickerShownCallback::Update(const nsAString& aColor)
{
if (mColorPickerParent) {
unused << mColorPickerParent->SendUpdate(nsString(aColor));
Unused << mColorPickerParent->SendUpdate(nsString(aColor));
}
return NS_OK;
}
@ -31,7 +31,7 @@ NS_IMETHODIMP
ColorPickerParent::ColorPickerShownCallback::Done(const nsAString& aColor)
{
if (mColorPickerParent) {
unused << mColorPickerParent->Send__delete__(mColorPickerParent,
Unused << mColorPickerParent->Send__delete__(mColorPickerParent,
nsString(aColor));
}
return NS_OK;
@ -68,7 +68,7 @@ bool
ColorPickerParent::RecvOpen()
{
if (!CreateColorPicker()) {
unused << Send__delete__(this, mInitialColor);
Unused << Send__delete__(this, mInitialColor);
return true;
}

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше