Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 07:45:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to autoland. a=merge CLOSED TREE

Browse Source
This commit is contained in:
Bogdan Tara 2018-09-05 02:43:23 +03:00
commit 32e713bf8b
179 changed files with 1857 additions and 1898 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -146,3 +146,4 @@ ccfd7b716a91241ddbc084cb7116ec561e56d5d1 FIREFOX_BETA_61_BASE
9b74b9f2939a7ae3a0ea6e711dc32ed5203e03ff FIREFOX_BETA_62_BASE
4f6e597104dabedfecfafa2ab63dc79fd7f8bc7a FIREFOX_NIGHTLY_62_END
190b827aaa2b5e6fb9af7a0defb238ccc35f8b9e FIREFOX_BETA_63_BASE
034c5ef24e98b0ce85fa849face079f568eb397c FIREFOX_NIGHTLY_63_END

2
CLOBBER
View File

@ -22,4 +22,4 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.
Bug 1346211 - Modifying ICU data file requires a clobber.
Merge day clobber

14
browser/actors/NetErrorChild.jsm
View File

@ -124,7 +124,7 @@ class NetErrorChild extends ActorChild {
msg1 = "";
msg1 += gPipNSSBundle.formatStringFromName("certErrorTrust_UnknownIssuer4", [hostString], 1);
msg1 += "\n\n";
msg1 += gPipNSSBundle.formatStringFromName("certErrorTrust_UnknownIssuer6", [brandName, hostString], 2);
msg1 += gPipNSSBundle.formatStringFromName("certErrorTrust_UnknownIssuer5", [brandName, hostString], 2);
msg1 += "\n\n";
} else {
msg1 += gPipNSSBundle.GetStringFromName("certErrorTrust_UnknownIssuer") + "\n";
@ -168,7 +168,7 @@ class NetErrorChild extends ActorChild {
if (newErrorPagesEnabled) {
technicalInfo.textContent = "";
let brandName = gBrandBundle.GetStringFromName("brandShortName");
msgPrefix = gPipNSSBundle.formatStringFromName("certErrorMismatchSinglePrefix2", [brandName, hostString], 2) + " ";
msgPrefix = gPipNSSBundle.formatStringFromName("certErrorMismatchSinglePrefix1", [brandName, hostString], 2) + " ";
msgPrefix += gPipNSSBundle.GetStringFromName("certErrorMismatchSinglePrefix");
} else {
msgPrefix = gPipNSSBundle.GetStringFromName("certErrorMismatchSinglePrefix");
@ -242,7 +242,7 @@ class NetErrorChild extends ActorChild {
if (newErrorPagesEnabled) {
technicalInfo.textContent = "";
let brandName = gBrandBundle.GetStringFromName("brandShortName");
msg = gPipNSSBundle.formatStringFromName("certErrorMismatchMultiple2", [brandName, hostString], 2) + " ";
msg = gPipNSSBundle.formatStringFromName("certErrorMismatchMultiple1", [brandName, hostString], 2) + " ";
} else {
msg = gPipNSSBundle.GetStringFromName("certErrorMismatchMultiple") + "\n";
}
@ -259,7 +259,7 @@ class NetErrorChild extends ActorChild {
if (newErrorPagesEnabled) {
technicalInfo.textContent = "";
let brandName = gBrandBundle.GetStringFromName("brandShortName");
msg = gPipNSSBundle.formatStringFromName("certErrorMismatch2", [brandName, hostString], 2) + " ";
msg = gPipNSSBundle.formatStringFromName("certErrorMismatch1", [brandName, hostString], 2) + " ";
} else {
msg = gPipNSSBundle.formatStringFromName("certErrorMismatch",
[hostString], 1);
@ -277,7 +277,7 @@ class NetErrorChild extends ActorChild {
if (nowTime > input.data.validity.notAfter) {
if (newErrorPagesEnabled) {
technicalInfo.textContent = "";
msg += gPipNSSBundle.formatStringFromName("certErrorExpiredNow2",
msg += gPipNSSBundle.formatStringFromName("certErrorExpiredNow1",
[hostString], 1);
msg += "\n";
} else {
@ -289,7 +289,7 @@ class NetErrorChild extends ActorChild {
// eslint-disable-next-line no-lonely-if
if (newErrorPagesEnabled) {
technicalInfo.textContent = "";
msg += gPipNSSBundle.formatStringFromName("certErrorNotYetValidNow2",
msg += gPipNSSBundle.formatStringFromName("certErrorNotYetValidNow1",
[hostString], 1);
msg += "\n";
} else {
@ -303,7 +303,7 @@ class NetErrorChild extends ActorChild {
// eslint-disable-next-line no-lonely-if
if (newErrorPagesEnabled) {
technicalInfo.textContent = "";
msg += gPipNSSBundle.formatStringFromName("certErrorExpiredNow2",
msg += gPipNSSBundle.formatStringFromName("certErrorExpiredNow1",
[hostString], 1);
msg += "\n";
} else {

31
browser/base/content/browser-contentblocking.js
View File

@ -15,6 +15,10 @@ var FastBlock = {
XPCOMUtils.defineLazyPreferenceGetter(this, "enabled", this.PREF_ENABLED, false);
XPCOMUtils.defineLazyPreferenceGetter(this, "visible", this.PREF_UI_ENABLED, false);
},
isBlockerActivated(state) {
return state & Ci.nsIWebProgressListener.STATE_BLOCKED_SLOW_TRACKING_CONTENT;
},
};
var TrackingProtection = {
@ -128,6 +132,10 @@ var TrackingProtection = {
}
}
},
isBlockerActivated(state) {
return state & Ci.nsIWebProgressListener.STATE_BLOCKED_TRACKING_CONTENT;
},
};
var ThirdPartyCookies = {
@ -154,6 +162,11 @@ var ThirdPartyCookies = {
get enabled() {
return this.PREF_ENABLED_VALUES.includes(this.behaviorPref);
},
isBlockerActivated(state) {
return (state & Ci.nsIWebProgressListener.STATE_COOKIES_BLOCKED_TRACKER) != 0 ||
(state & Ci.nsIWebProgressListener.STATE_COOKIES_BLOCKED_FOREIGN) != 0;
},
};
@ -434,23 +447,21 @@ var ContentBlocking = {
this.iconBox.removeAttribute("animate");
}
let isBlocking = state & Ci.nsIWebProgressListener.STATE_BLOCKED_TRACKING_CONTENT;
let isAllowing = state & Ci.nsIWebProgressListener.STATE_LOADED_TRACKING_CONTENT;
let detected = isBlocking || isAllowing;
let anyBlockerEnabled = false;
let anyBlockerActivated = false;
for (let blocker of this.blockers) {
blocker.categoryItem.classList.toggle("blocked", this.enabled && blocker.enabled);
blocker.categoryItem.hidden = !blocker.visible;
anyBlockerEnabled = anyBlockerEnabled || blocker.enabled;
anyBlockerActivated = anyBlockerActivated || blocker.isBlockerActivated(state);
}
// We consider the shield state "active" when any kind of blocking-related
// activity occurs on the page (blocking or allowing) and at least one blocker
// is enabled.
// We consider the shield state "active" when some kind of blocking activity
// occurs on the page. Note that merely allowing the loading of content that
// we could have blocked does not trigger the appearance of the shield.
// This state will be overriden later if there's an exception set for this site.
let active = this.enabled && detected && anyBlockerEnabled;
let active = this.enabled && anyBlockerActivated;
let isAllowing = state & Ci.nsIWebProgressListener.STATE_LOADED_TRACKING_CONTENT;
let detected = anyBlockerActivated || isAllowing;
let isBrowserPrivate = PrivateBrowsingUtils.isBrowserPrivate(gBrowser.selectedBrowser);

2
browser/base/content/test/trackingUI/browser.ini
View File

@ -3,6 +3,8 @@ tags = trackingprotection
support-files =
head.js
benignPage.html
cookiePage.html
cookieServer.sjs
trackingPage.html
[browser_trackingUI_3.js]

2
browser/base/content/test/trackingUI/browser_trackingUI_pbmode_exceptions.js
View File

@ -75,7 +75,7 @@ function testTrackingPageUnblocked() {
ok(ContentBlocking.content.hasAttribute("detected"), "trackers are detected");
ok(ContentBlocking.content.hasAttribute("hasException"), "content shows exception");
ok(ContentBlocking.iconBox.hasAttribute("active"), "shield is active");
ok(!ContentBlocking.iconBox.hasAttribute("active"), "shield is active");
ok(ContentBlocking.iconBox.hasAttribute("hasException"), "shield shows exception");
is(ContentBlocking.iconBox.getAttribute("tooltiptext"),
gNavigatorBundle.getString("trackingProtection.icon.disabledTooltip"), "correct tooltip");

226
browser/base/content/test/trackingUI/browser_trackingUI_state.js
View File

@ -18,18 +18,29 @@ const CB_PREF = "browser.contentblocking.enabled";
const CB_UI_PREF = "browser.contentblocking.ui.enabled";
const TP_PREF = "privacy.trackingprotection.enabled";
const TP_PB_PREF = "privacy.trackingprotection.pbmode.enabled";
const FB_PREF = "browser.fastblock.enabled";
const FB_TIMEOUT_PREF = "browser.fastblock.timeout";
const TPC_PREF = "network.cookie.cookieBehavior";
const BENIGN_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/benignPage.html";
const TRACKING_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
const COOKIE_PAGE = "http://not-tracking.example.com/browser/browser/base/content/test/trackingUI/cookiePage.html";
var ContentBlocking = null;
var FastBlock = null;
var TrackingProtection = null;
var ThirdPartyCookies = null;
var tabbrowser = null;
var gTrackingPageURL = TRACKING_PAGE;
registerCleanupFunction(function() {
TrackingProtection = ContentBlocking = tabbrowser = null;
TrackingProtection = ContentBlocking = FastBlock =
ThirdPartyCookies = tabbrowser = null;
UrlClassifierTestUtils.cleanupTestTrackers();
Services.prefs.clearUserPref(TP_PREF);
Services.prefs.clearUserPref(TP_PB_PREF);
Services.prefs.clearUserPref(CB_PREF);
Services.prefs.clearUserPref(FB_PREF);
Services.prefs.clearUserPref(FB_TIMEOUT_PREF);
Services.prefs.clearUserPref(TPC_PREF);
});
// This is a special version of "hidden" that doesn't check for item
@ -98,25 +109,47 @@ function testBenignPageWithException() {
}
}
function areTrackersBlocked(isPrivateBrowsing) {
let cbEnabled = Services.prefs.getBoolPref(CB_PREF);
let blockedByTP = cbEnabled &&
Services.prefs.getBoolPref(isPrivateBrowsing ? TP_PB_PREF : TP_PREF);
let blockedByFB = cbEnabled &&
Services.prefs.getBoolPref(FB_PREF) &&
// The timeout pref is only checked for completeness,
// checking it is technically unneeded for this test.
Services.prefs.getIntPref(FB_TIMEOUT_PREF) == 0;
let blockedByTPC = cbEnabled &&
Services.prefs.getIntPref(TPC_PREF) == Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER;
return blockedByTP || blockedByFB || blockedByTPC;
}
function testTrackingPage(window) {
info("Tracking content must be blocked");
ok(ContentBlocking.content.hasAttribute("detected"), "trackers are detected");
ok(!ContentBlocking.content.hasAttribute("hasException"), "content shows no exception");
ok(BrowserTestUtils.is_visible(ContentBlocking.iconBox), "icon box is visible");
ok(ContentBlocking.iconBox.hasAttribute("active"), "shield is active");
let isPrivateBrowsing = PrivateBrowsingUtils.isWindowPrivate(window);
let blockedByTP = areTrackersBlocked(isPrivateBrowsing);
is(BrowserTestUtils.is_visible(ContentBlocking.iconBox), blockedByTP,
"icon box is" + (blockedByTP ? "" : " not") + " visible");
is(ContentBlocking.iconBox.hasAttribute("active"), blockedByTP,
"shield is" + (blockedByTP ? "" : " not") + " active");
ok(!ContentBlocking.iconBox.hasAttribute("hasException"), "icon box shows no exception");
is(ContentBlocking.iconBox.getAttribute("tooltiptext"),
gNavigatorBundle.getString("trackingProtection.icon.activeTooltip"), "correct tooltip");
blockedByTP ? gNavigatorBundle.getString("trackingProtection.icon.activeTooltip") : "",
"correct tooltip");
ok(hidden("#tracking-action-block"), "blockButton is hidden");
let cbEnabled = Services.prefs.getBoolPref(CB_PREF);
if (PrivateBrowsingUtils.isWindowPrivate(window)) {
ok(hidden("#tracking-action-unblock"), "unblockButton is hidden");
ok(!hidden("#tracking-action-unblock-private"), "unblockButtonPrivate is visible");
is(hidden("#tracking-action-unblock-private"), !cbEnabled,
"unblockButtonPrivate is" + (cbEnabled ? "" : " not") + " visible");
} else {
ok(!hidden("#tracking-action-unblock"), "unblockButton is visible");
ok(hidden("#tracking-action-unblock-private"), "unblockButtonPrivate is hidden");
is(hidden("#tracking-action-unblock-private"), cbEnabled,
"unblockButtonPrivate is" + (cbEnabled ? "" : " not") + " hidden");
}
ok(hidden("#identity-popup-content-blocking-not-detected"), "blocking not detected label is hidden");
@ -124,25 +157,37 @@ function testTrackingPage(window) {
if (Services.prefs.getBoolPref(CB_UI_PREF)) {
ok(!hidden("#identity-popup-content-blocking-category-list"), "category list is visible");
ok(hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-add-blocking"),
"TP category item is not showing add blocking");
ok(!hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-state-label"),
"TP category item is set to blocked");
let category;
if (Services.prefs.getBoolPref(FB_PREF)) {
category = "#identity-popup-content-blocking-category-fastblock";
} else {
category = Services.prefs.getIntPref(TPC_PREF) == Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER ?
"#identity-popup-content-blocking-category-3rdpartycookies" :
"#identity-popup-content-blocking-category-tracking-protection";
}
is(hidden(category + " > .identity-popup-content-blocking-category-add-blocking"), blockedByTP,
"Category item is" + (blockedByTP ? " not" : "") + " showing add blocking");
is(hidden(category + " > .identity-popup-content-blocking-category-state-label"), !blockedByTP,
"Category item is" + (blockedByTP ? "" : " not") + " set to blocked");
}
}
function testTrackingPageUnblocked() {
function testTrackingPageUnblocked(blockedByTP) {
info("Tracking content must be white-listed and not blocked");
ok(ContentBlocking.content.hasAttribute("detected"), "trackers are detected");
ok(ContentBlocking.content.hasAttribute("hasException"), "content shows exception");
ok(ContentBlocking.iconBox.hasAttribute("active"), "shield is active");
ok(ContentBlocking.iconBox.hasAttribute("hasException"), "shield shows exception");
let cbEnabled = Services.prefs.getBoolPref(CB_PREF);
ok(!ContentBlocking.iconBox.hasAttribute("active"), "shield is active");
is(ContentBlocking.iconBox.hasAttribute("hasException"), cbEnabled,
"shield" + (cbEnabled ? " shows" : " doesn't show") + " exception");
is(ContentBlocking.iconBox.getAttribute("tooltiptext"),
gNavigatorBundle.getString("trackingProtection.icon.disabledTooltip"), "correct tooltip");
ok(BrowserTestUtils.is_visible(ContentBlocking.iconBox), "icon box is visible");
ok(!hidden("#tracking-action-block"), "blockButton is visible");
is(BrowserTestUtils.is_visible(ContentBlocking.iconBox), cbEnabled,
"icon box is" + (cbEnabled ? "" : " not") + " visible");
is(hidden("#tracking-action-block"), !cbEnabled,
"blockButton is" + (cbEnabled ? " not" : "") + " visible");
ok(hidden("#tracking-action-unblock"), "unblockButton is hidden");
ok(!hidden("#identity-popup-content-blocking-disabled-label"), "disabled label is visible");
@ -151,8 +196,17 @@ function testTrackingPageUnblocked() {
if (Services.prefs.getBoolPref(CB_UI_PREF)) {
ok(!hidden("#identity-popup-content-blocking-category-list"), "category list is visible");
ok(hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-add-blocking"),
"TP category item is not showing add blocking");
let category;
if (Services.prefs.getBoolPref(FB_PREF)) {
category = "#identity-popup-content-blocking-category-fastblock";
} else {
category = Services.prefs.getIntPref(TPC_PREF) == Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER ?
"#identity-popup-content-blocking-category-3rdpartycookies" :
"#identity-popup-content-blocking-category-tracking-protection";
}
is(hidden(category + " > .identity-popup-content-blocking-category-add-blocking"), blockedByTP,
"Category item is" + (blockedByTP ? " not" : "") + " showing add blocking");
// Always hidden no matter if blockedByTP or not, since we have an exception.
ok(hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-state-label"),
"TP category item is not set to blocked");
}
@ -210,14 +264,15 @@ async function testContentBlockingEnabled(tab) {
}
info("Load a test page containing tracking elements");
await promiseTabLoadEvent(tab, TRACKING_PAGE);
await promiseTabLoadEvent(tab, gTrackingPageURL);
testTrackingPage(tab.ownerGlobal);
info("Disable CB for the page (which reloads the page)");
let tabReloadPromise = promiseTabLoadEvent(tab);
clickButton("#tracking-action-unblock");
await tabReloadPromise;
testTrackingPageUnblocked();
let blockedByTP = areTrackersBlocked(isPrivateBrowsing);
testTrackingPageUnblocked(blockedByTP);
info("Re-enable TP for the page (which reloads the page)");
tabReloadPromise = promiseTabLoadEvent(tab);
@ -252,7 +307,7 @@ async function testContentBlockingDisabled(tab) {
}
info("Load a test page containing tracking elements");
await promiseTabLoadEvent(tab, TRACKING_PAGE);
await promiseTabLoadEvent(tab, gTrackingPageURL);
testTrackingPageWithCBDisabled();
}
@ -269,6 +324,20 @@ add_task(async function testNormalBrowsing() {
is(TrackingProtection.enabled, Services.prefs.getBoolPref(TP_PREF),
"TP.enabled is based on the original pref value");
Services.prefs.setBoolPref(FB_PREF, false);
await testContentBlockingEnabled(tab);
if (Services.prefs.getBoolPref(CB_UI_PREF)) {
Services.prefs.setBoolPref(CB_PREF, false);
ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
} else {
Services.prefs.setBoolPref(TP_PREF, false);
ok(!TrackingProtection.enabled, "TP is disabled after setting the pref");
}
await testContentBlockingDisabled(tab);
Services.prefs.setBoolPref(TP_PREF, true);
ok(TrackingProtection.enabled, "TP is enabled after setting the pref");
Services.prefs.setBoolPref(CB_PREF, true);
@ -287,6 +356,8 @@ add_task(async function testNormalBrowsing() {
await testContentBlockingDisabled(tab);
gBrowser.removeCurrentTab();
Services.prefs.clearUserPref(FB_PREF);
});
add_task(async function testPrivateBrowsing() {
@ -297,6 +368,8 @@ add_task(async function testPrivateBrowsing() {
// Set the normal mode pref to false to check the pbmode pref.
Services.prefs.setBoolPref(TP_PREF, false);
Services.prefs.setBoolPref(FB_PREF, false);
ContentBlocking = tabbrowser.ownerGlobal.ContentBlocking;
ok(ContentBlocking, "CB is attached to the private window");
TrackingProtection = tabbrowser.ownerGlobal.TrackingProtection;
@ -304,6 +377,18 @@ add_task(async function testPrivateBrowsing() {
is(TrackingProtection.enabled, Services.prefs.getBoolPref(TP_PB_PREF),
"TP.enabled is based on the pb pref value");
await testContentBlockingEnabled(tab);
if (Services.prefs.getBoolPref(CB_UI_PREF)) {
Services.prefs.setBoolPref(CB_PREF, false);
ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
} else {
Services.prefs.setBoolPref(TP_PREF, false);
ok(!TrackingProtection.enabled, "TP is disabled after setting the pref");
}
await testContentBlockingDisabled(tab);
Services.prefs.setBoolPref(TP_PB_PREF, true);
ok(TrackingProtection.enabled, "TP is enabled after setting the pref");
Services.prefs.setBoolPref(CB_PREF, true);
@ -322,4 +407,105 @@ add_task(async function testPrivateBrowsing() {
await testContentBlockingDisabled(tab);
privateWin.close();
Services.prefs.clearUserPref(FB_PREF);
});
add_task(async function testFastBlock() {
if (!SpecialPowers.getBoolPref(CB_UI_PREF)) {
info("The FastBlock test is disabled when the Content Blocking UI is disabled");
return;
}
await UrlClassifierTestUtils.addTestTrackers();
tabbrowser = gBrowser;
let tab = tabbrowser.selectedTab = BrowserTestUtils.addTab(tabbrowser);
Services.prefs.setBoolPref(FB_PREF, false);
ContentBlocking = gBrowser.ownerGlobal.ContentBlocking;
ok(ContentBlocking, "CB is attached to the browser window");
FastBlock = gBrowser.ownerGlobal.FastBlock;
ok(FastBlock, "TP is attached to the browser window");
is(FastBlock.enabled, Services.prefs.getBoolPref(FB_PREF),
"FB.enabled is based on the original pref value");
Services.prefs.setBoolPref(CB_PREF, true);
ok(ContentBlocking.enabled, "CB is enabled after setting the pref");
await testContentBlockingEnabled(tab);
ok(Services.prefs.getBoolPref(CB_UI_PREF), "CB UI must be enabled here");
Services.prefs.setBoolPref(CB_PREF, false);
ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
await testContentBlockingDisabled(tab);
Services.prefs.setBoolPref(FB_PREF, true);
Services.prefs.setIntPref(FB_TIMEOUT_PREF, 0);
ok(FastBlock.enabled, "FB is enabled after setting the pref");
Services.prefs.setBoolPref(CB_PREF, true);
ok(ContentBlocking.enabled, "CB is enabled after setting the pref");
await testContentBlockingEnabled(tab);
ok(Services.prefs.getBoolPref(CB_UI_PREF), "CB UI must be enabled here");
Services.prefs.setBoolPref(CB_PREF, false);
ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
await testContentBlockingDisabled(tab);
Services.prefs.clearUserPref(FB_PREF);
Services.prefs.clearUserPref(FB_TIMEOUT_PREF);
gBrowser.removeCurrentTab();
});
add_task(async function testThirdPartyCookies() {
if (!SpecialPowers.getBoolPref(CB_UI_PREF)) {
info("The ThirdPartyCookies test is disabled when the Content Blocking UI is disabled");
return;
}
await UrlClassifierTestUtils.addTestTrackers();
gTrackingPageURL = COOKIE_PAGE;
Services.prefs.setBoolPref(FB_PREF, false);
tabbrowser = gBrowser;
let tab = tabbrowser.selectedTab = BrowserTestUtils.addTab(tabbrowser);
ContentBlocking = gBrowser.ownerGlobal.ContentBlocking;
ok(ContentBlocking, "CB is attached to the browser window");
ThirdPartyCookies = gBrowser.ownerGlobal.ThirdPartyCookies;
ok(ThirdPartyCookies, "TP is attached to the browser window");
is(ThirdPartyCookies.enabled,
Services.prefs.getIntPref(TPC_PREF) == Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER,
"TPC.enabled is based on the original pref value");
Services.prefs.setBoolPref(CB_PREF, true);
ok(ContentBlocking.enabled, "CB is enabled after setting the pref");
await testContentBlockingEnabled(tab);
ok(Services.prefs.getBoolPref(CB_UI_PREF), "CB UI must be enabled here");
Services.prefs.setBoolPref(CB_PREF, false);
ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
await testContentBlockingDisabled(tab);
Services.prefs.setIntPref(TPC_PREF, Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER);
ok(ThirdPartyCookies.enabled, "TPC is enabled after setting the pref");
Services.prefs.setBoolPref(CB_PREF, true);
ok(ContentBlocking.enabled, "CB is enabled after setting the pref");
await testContentBlockingEnabled(tab);
ok(Services.prefs.getBoolPref(CB_UI_PREF), "CB UI must be enabled here");
Services.prefs.setBoolPref(CB_PREF, false);
ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
await testContentBlockingDisabled(tab);
Services.prefs.clearUserPref(FB_PREF);
Services.prefs.clearUserPref(TPC_PREF);
gBrowser.removeCurrentTab();
});

12
browser/base/content/test/trackingUI/cookiePage.html Normal file
View File

@ -0,0 +1,12 @@
<!DOCTYPE HTML>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<html dir="ltr" xml:lang="en-US" lang="en-US">
<head>
<meta charset="utf8">
</head>
<body>
<iframe src="http://trackertest.org/browser/browser/base/content/test/trackingUI/cookieServer.sjs"></iframe>
</body>
</html>

9
browser/base/content/test/trackingUI/cookieServer.sjs Normal file
View File

@ -0,0 +1,9 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
function handleRequest(request, response) {
response.setStatusLine(request.httpVersion, 200);
response.setHeader("Set-Cookie", "foopy=1");
response.write("cookie served");
}

1
browser/components/preferences/in-content/privacy.xul
View File

@ -370,7 +370,6 @@
data-l10n-id="content-blocking-tracking-protection-option-always"
flex="1" />
</radiogroup>
<label id="changeBlockListLink" data-l10n-id="content-blocking-tracking-protection-change-block-list" class="text-link"/>
<label id="changeBlockListLink"
data-l10n-id="content-blocking-tracking-protection-change-block-list"
class="text-link"

20
browser/components/preferences/in-content/tests/browser_contentblocking.js
View File

@ -60,12 +60,26 @@ add_task(async function testContentBlockingToggle() {
add_task(async function testContentBlockingMainCategory() {
SpecialPowers.pushPrefEnv({set: [
[CB_UI_PREF, true],
]});
let prefs = [
[CB_PREF, true],
[FB_PREF, true],
[TP_PREF, false],
[TP_PBM_PREF, true],
[NCB_PREF, Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER],
]});
];
for (let pref of prefs) {
switch (typeof pref[1]) {
case "boolean":
SpecialPowers.setBoolPref(pref[0], pref[1]);
break;
case "number":
SpecialPowers.setIntPref(pref[0], pref[1]);
break;
}
}
let checkboxes = [
"#contentBlockingFastBlockCheckbox",
@ -115,6 +129,10 @@ add_task(async function testContentBlockingMainCategory() {
checkControlStateWorker(doc, alwaysEnabledControls, true);
gBrowser.removeCurrentTab();
for (let pref of prefs) {
SpecialPowers.clearUserPref(pref[0]);
}
});
// Tests that the content blocking "Restore Defaults" button does what it's supposed to.

2
browser/config/version.txt
View File

@ -1 +1 @@
63.0a1
64.0a1

2
browser/config/version_display.txt
View File

@ -1 +1 @@
63.0a1
64.0a1

3
build/macosx/cross-mozconfig.common
View File

@ -10,6 +10,9 @@ if [ "x$IS_NIGHTLY" = "xyes" ]; then
fi
. "$topsrcdir/build/mozconfig.common"
# Rust requires dsymutil into PATH
mk_add_options "export PATH=$topsrcdir/llvm-dsymutil/bin:$PATH"
# ld needs libLTO.so from llvm
mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/clang/lib"

7
build/unix/mozconfig.linux32
View File

@ -6,10 +6,3 @@ CFLAGS="$CFLAGS -march=pentium-m -msse -msse2 -mfpmath=sse"
CXXFLAGS="$CXXFLAGS -march=pentium-m -msse -msse2 -mfpmath=sse"
ac_add_options --target=i686-pc-linux
# The linux32 builds are effectively cross-compilations, and geckodriver
# is not enabled by default on cross-compilations, because in most cases,
# the target is not something we can run binaries of, and geckodriver
# is a target binary instead of a host binary. But for linux32, we actually
# can run the target binaries, so we can manually enable geckodriver.
ac_add_options --enable-geckodriver

6
config/external/icu/data/genicudata.py vendored
View File

@ -6,9 +6,9 @@
def main(output, data_file, data_symbol):
output.write(''' AREA .rdata,ALIGN=4,DATA,READONLY
EXPORT _{data_symbol}[DATA]
_{data_symbol}
output.write(''' AREA |.rdata|,ALIGN=4,DATA,READONLY
EXPORT |{data_symbol}|[DATA]
|{data_symbol}|
INCBIN {data_file}
END
'''.format(data_file=data_file, data_symbol=data_symbol))

2
config/milestone.txt
View File

@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
63.0a1
64.0a1

1
devtools/.eslintrc.mochitests.js
View File

@ -11,7 +11,6 @@ module.exports = {
"synthesizeKeyFromKeyTag": true,
"TargetFactory": true,
"waitForTick": true,
"waitUntilState": true,
},
"parserOptions": {

23
devtools/client/inspector/computed/computed.js
View File

@ -6,11 +6,10 @@
"use strict";
const promise = require("promise");
const flags = require("devtools/shared/flags");
const ToolDefinitions = require("devtools/client/definitions").Tools;
const CssLogic = require("devtools/shared/inspector/css-logic");
const {ELEMENT_STYLE} = require("devtools/shared/specs/styles");
const promise = require("promise");
const OutputParser = require("devtools/client/shared/output-parser");
const {PrefObserver} = require("devtools/client/shared/prefs");
const {createChild} = require("devtools/client/inspector/shared/utils");
@ -184,20 +183,14 @@ function CssComputedView(inspector, document, pageStyle) {
this.styleDocument.addEventListener("mousedown", this.focusWindow);
this.element.addEventListener("click", this._onClick);
this.element.addEventListener("contextmenu", this._onContextMenu);
this.element.addEventListener("mousemove", () => {
this.addHighlightersToView();
}, { once: true });
this.searchField.addEventListener("input", this._onFilterStyles);
this.searchClearButton.addEventListener("click", this._onClearSearch);
this.includeBrowserStylesCheckbox.addEventListener("input",
this._onIncludeBrowserStyles);
if (flags.testing) {
// In tests, we start listening immediately to avoid having to simulate a mousemove.
this.highlighters.addToView(this);
} else {
this.element.addEventListener("mousemove", () => {
this.highlighters.addToView(this);
}, { once: true });
}
this.searchClearButton.hidden = true;
// No results text.
@ -739,6 +732,14 @@ CssComputedView.prototype = {
}
},
/**
* Adds the highlighters overlay to the computed view. This is called by the "mousemove"
* event handler and in shared-head.js when opening and selecting the computed view.
*/
addHighlightersToView() {
this.highlighters.addToView(this);
},
/**
* Destructor for CssComputedView.
*/

159
devtools/client/inspector/flexbox/flexbox.js
View File

@ -5,7 +5,6 @@
"use strict";
const { throttle } = require("devtools/client/inspector/shared/utils");
const flags = require("devtools/shared/flags");
const {
clearFlexbox,
@ -63,16 +62,10 @@ class FlexboxInspector {
return;
}
if (flags.testing) {
// In tests, we start listening immediately to avoid having to simulate a mousemove.
this.document.addEventListener("mousemove", () => {
this.highlighters.on("flexbox-highlighter-hidden", this.onHighlighterHidden);
this.highlighters.on("flexbox-highlighter-shown", this.onHighlighterShown);
} else {
this.document.addEventListener("mousemove", () => {
this.highlighters.on("flexbox-highlighter-hidden", this.onHighlighterHidden);
this.highlighters.on("flexbox-highlighter-shown", this.onHighlighterShown);
}, { once: true });
}
}, { once: true });
this.inspector.sidebar.on("select", this.onSidebarSelect);
@ -311,77 +304,99 @@ class FlexboxInspector {
async update(flexboxFront) {
// Stop refreshing if the inspector or store is already destroyed or no node is
// selected.
if (!this.inspector ||
!this.store ||
!this.inspector.selection.nodeFront ||
!this.hasGetCurrentFlexbox) {
if (!this.inspector || !this.store || !this.inspector.selection.nodeFront) {
return;
}
try {
// Fetch the current flexbox if no flexbox front was passed into this update.
if (!flexboxFront) {
flexboxFront = await this.layoutInspector.getCurrentFlexbox(
this.inspector.selection.nodeFront);
}
// Clear the flexbox panel if there is no flex container for the current node
// selection.
if (!flexboxFront) {
this.store.dispatch(clearFlexbox());
return;
}
// If the FlexboxFront doesn't yet have access to the NodeFront for its container,
// then get it from the walker. This happens when the walker hasn't seen this
// particular DOM Node in the tree yet or when we are connected to an older server.
let containerNodeFront = flexboxFront.containerNodeFront;
if (!containerNodeFront) {
containerNodeFront = await this.walker.getNodeFromActor(flexboxFront.actorID,
["containerEl"]);
}
// Fetch the flex items for the given flex container and the flex item NodeFronts.
const flexItems = [];
const flexItemFronts = await flexboxFront.getFlexItems();
for (const flexItemFront of flexItemFronts) {
let itemNodeFront = flexItemFront.nodeFront;
if (!itemNodeFront) {
itemNodeFront = await this.walker.getNodeFromActor(flexItemFront.actorID,
["element"]);
// Fetch the current flexbox if no flexbox front was passed into this update.
if (!flexboxFront) {
try {
if (!this.hasGetCurrentFlexbox) {
return;
}
flexItems.push({
actorID: flexItemFront.actorID,
shown: false,
flexItemSizing: flexItemFront.flexItemSizing,
nodeFront: itemNodeFront,
properties: flexItemFront.properties,
});
flexboxFront = await this.layoutInspector.getCurrentFlexbox(
this.inspector.selection.nodeFront);
} catch (e) {
// This call might fail if called asynchrously after the toolbox is finished
// closing.
return;
}
}
// Clear the flexbox panel if there is no flex container for the current node
// selection.
if (!flexboxFront) {
try {
this.store.dispatch(clearFlexbox());
} catch (e) {
// This call might fail if called asynchrously after the toolbox is finished
// closing.
}
return;
}
let containerNodeFront = flexboxFront.containerNodeFront;
// If the FlexboxFront doesn't yet have access to the NodeFront for its container,
// then get it from the walker. This happens when the walker hasn't seen this
// particular DOM Node in the tree yet or when we are connected to an older server.
if (!containerNodeFront) {
try {
containerNodeFront = await this.walker.getNodeFromActor(flexboxFront.actorID,
["containerEl"]);
} catch (e) {
// This call might fail if called asynchrously after the toolbox is finished
// closing.
return;
}
}
const highlighted = this._highlighters &&
containerNodeFront == this.highlighters.flexboxHighlighterShown;
// Fetch the flex items for the given flex container and the flex item NodeFronts.
const flexItems = [];
const flexItemFronts = await flexboxFront.getFlexItems();
for (const flexItemFront of flexItemFronts) {
let itemNodeFront = flexItemFront.nodeFront;
if (!itemNodeFront) {
try {
itemNodeFront = await this.walker.getNodeFromActor(flexItemFront.actorID,
["element"]);
} catch (e) {
// This call might fail if called asynchrously after the toolbox is finished
// closing.
return;
}
}
const highlighted = this._highlighters &&
containerNodeFront == this.highlighters.flexboxHighlighterShown;
const currentUrl = this.inspector.target.url;
// Get the hostname, if there is no hostname, fall back on protocol
// ex: `data:` uri, and `about:` pages
const hostname = parseURL(currentUrl).hostname || parseURL(currentUrl).protocol;
const customColors = await this.getCustomFlexboxColors();
const color = customColors[hostname] ? customColors[hostname] : FLEXBOX_COLOR;
this.store.dispatch(updateFlexbox({
actorID: flexboxFront.actorID,
color,
flexItems,
highlighted,
nodeFront: containerNodeFront,
properties: flexboxFront.properties,
}));
} catch (e) {
// This call might fail if called asynchrously after the toolbox is finished
// closing.
flexItems.push({
actorID: flexItemFront.actorID,
shown: false,
flexItemSizing: flexItemFront.flexItemSizing,
nodeFront: itemNodeFront,
properties: flexItemFront.properties,
});
}
const currentUrl = this.inspector.target.url;
// Get the hostname, if there is no hostname, fall back on protocol
// ex: `data:` uri, and `about:` pages
const hostname = parseURL(currentUrl).hostname || parseURL(currentUrl).protocol;
const customColors = await this.getCustomFlexboxColors();
const color = customColors[hostname] ? customColors[hostname] : FLEXBOX_COLOR;
this.store.dispatch(updateFlexbox({
actorID: flexboxFront.actorID,
color,
flexItems,
highlighted,
nodeFront: containerNodeFront,
properties: flexboxFront.properties,
}));
}
}

11
devtools/client/inspector/grids/grid-inspector.js
View File

@ -6,7 +6,6 @@
const Services = require("Services");
const { throttle } = require("devtools/client/inspector/shared/utils");
const flags = require("devtools/shared/flags");
const {
updateGridColor,
@ -98,16 +97,10 @@ class GridInspector {
return;
}
if (flags.testing) {
// In tests, we start listening immediately to avoid having to simulate a mousemove.
this.document.addEventListener("mousemove", () => {
this.highlighters.on("grid-highlighter-hidden", this.onHighlighterHidden);
this.highlighters.on("grid-highlighter-shown", this.onHighlighterShown);
} else {
this.document.addEventListener("mousemove", () => {
this.highlighters.on("grid-highlighter-hidden", this.onHighlighterHidden);
this.highlighters.on("grid-highlighter-shown", this.onHighlighterShown);
}, { once: true });
}
}, { once: true });
this.inspector.sidebar.on("select", this.onSidebarSelect);
this.inspector.on("new-root", this.onNavigate);

3
devtools/client/inspector/grids/test/.eslintrc.js
View File

@ -3,4 +3,7 @@
module.exports = {
// Extend from the shared list of defined globals for mochitests.
"extends": "../../../../.eslintrc.mochitests.js",
"globals": {
"waitUntilState": true
}
};

2
devtools/client/inspector/markup/test/.eslintrc.js
View File

@ -2,5 +2,5 @@
module.exports = {
// Extend from the shared list of defined globals for mochitests.
"extends": "../../../../.eslintrc.mochitests.js",
"extends": "../../../../.eslintrc.mochitests.js"
};

3
devtools/client/inspector/markup/test/browser.ini
View File

@ -73,7 +73,6 @@ support-files =
!/devtools/client/inspector/test/head.js
!/devtools/client/inspector/test/shared-head.js
!/devtools/client/shared/test/shared-head.js
!/devtools/client/shared/test/shared-redux-head.js
!/devtools/client/shared/test/telemetry-test-helpers.js
!/devtools/client/shared/test/test-actor.js
!/devtools/client/shared/test/test-actor-registry.js
@ -131,8 +130,6 @@ skip-if = true # Bug 1177550
[browser_markup_events_react_production_16.2.0_jsx.js]
[browser_markup_events_source_map.js]
[browser_markup_events-windowed-host.js]
[browser_markup_flex_display_badge.js]
[browser_markup_grid_display_badge.js]
[browser_markup_links_01.js]
[browser_markup_links_02.js]
[browser_markup_links_03.js]

2
devtools/client/inspector/markup/test/browser_markup_flex_display_badge.js
View File

@ -17,6 +17,8 @@ const TEST_URI = `
const HIGHLIGHTER_TYPE = "FlexboxHighlighter";
add_task(async function() {
await pushPref("devtools.inspector.flexboxHighlighter.enabled", true);
await pushPref("devtools.flexboxinspector.enabled", true);
await addTab("data:text/html;charset=utf-8," + encodeURIComponent(TEST_URI));
const { inspector } = await openLayoutView();
const { highlighters, store } = inspector;

60
devtools/client/inspector/markup/test/browser_markup_grid_display_badge.js
View File

@ -1,60 +0,0 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Tests that the grid display badge toggles on the grid highlighter.
const TEST_URI = `
<style type="text/css">
#grid {
display: grid;
}
</style>
<div id="grid"></div>
`;
const HIGHLIGHTER_TYPE = "CssGridHighlighter";
add_task(async function() {
await addTab("data:text/html;charset=utf-8," + encodeURIComponent(TEST_URI));
const { inspector } = await openLayoutView();
const { highlighters, store } = inspector;
info("Check the grid display badge is shown and not active.");
await selectNode("#grid", inspector);
const gridContainer = await getContainerForSelector("#grid", inspector);
const gridDisplayBadge = gridContainer.elt.querySelector(".markup-badge[data-display]");
ok(!gridDisplayBadge.classList.contains("active"), "grid display badge is not active.");
info("Check the initial state of the grid highlighter.");
ok(!highlighters.highlighters[HIGHLIGHTER_TYPE],
"No CSS grid highlighter exists in the highlighters overlay.");
ok(!highlighters.gridHighlighterShown, "No CSS grid highlighter is shown.");
info("Toggling ON the CSS grid highlighter from the grid display badge.");
const onHighlighterShown = highlighters.once("grid-highlighter-shown");
let onCheckboxChange = waitUntilState(store, state =>
state.grids.length === 1 &&
state.grids[0].highlighted);
gridDisplayBadge.click();
await onHighlighterShown;
await onCheckboxChange;
info("Check the CSS grid highlighter is created and grid display badge state.");
ok(highlighters.highlighters[HIGHLIGHTER_TYPE],
"CSS grid highlighter is created in the highlighters overlay.");
ok(highlighters.gridHighlighterShown, "CSS grid highlighter is shown.");
ok(gridDisplayBadge.classList.contains("active"), "grid display badge is active.");
info("Toggling OFF the CSS grid highlighter from the grid display badge.");
const onHighlighterHidden = highlighters.once("grid-highlighter-hidden");
onCheckboxChange = waitUntilState(store, state =>
state.grids.length == 1 &&
!state.grids[0].highlighted);
gridDisplayBadge.click();
await onHighlighterHidden;
await onCheckboxChange;
ok(!gridDisplayBadge.classList.contains("active"), "grid display badge is not active.");
});

6
devtools/client/inspector/markup/test/head.js
View File

@ -1,3 +1,4 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@ -10,11 +11,6 @@ Services.scriptloader.loadSubScript(
"chrome://mochitests/content/browser/devtools/client/inspector/test/head.js",
this);
// Load the shared Redux helpers into this compartment.
Services.scriptloader.loadSubScript(
"chrome://mochitests/content/browser/devtools/client/shared/test/shared-redux-head.js",
this);
var {getInplaceEditorForSpan: inplaceEditor} = require("devtools/client/shared/inplace-editor");
var clipboard = require("devtools/shared/platform/clipboard");

21
devtools/client/inspector/rules/rules.js
View File

@ -8,7 +8,6 @@
const promise = require("promise");
const Services = require("Services");
const flags = require("devtools/shared/flags");
const {l10n} = require("devtools/shared/inspector/css-logic");
const {ELEMENT_STYLE} = require("devtools/shared/specs/styles");
const OutputParser = require("devtools/client/shared/output-parser");
@ -152,6 +151,9 @@ function CssRuleView(inspector, document, store, pageStyle) {
this.shortcuts.on("CmdOrCtrl+F", event => this._onShortcut("CmdOrCtrl+F", event));
this.element.addEventListener("copy", this._onCopy);
this.element.addEventListener("contextmenu", this._onContextMenu);
this.element.addEventListener("mousemove", () => {
this.addHighlightersToView();
}, { once: true });
this.addRuleButton.addEventListener("click", this._onAddRule);
this.searchField.addEventListener("input", this._onFilterStyles);
this.searchClearButton.addEventListener("click", this._onClearSearch);
@ -161,15 +163,6 @@ function CssRuleView(inspector, document, store, pageStyle) {
this.activeCheckbox.addEventListener("click", this._onTogglePseudoClass);
this.focusCheckbox.addEventListener("click", this._onTogglePseudoClass);
if (flags.testing) {
// In tests, we start listening immediately to avoid having to simulate a mousemove.
this.highlighters.addToView(this);
} else {
this.element.addEventListener("mousemove", () => {
this.highlighters.addToView(this);
}, { once: true });
}
this._handlePrefChange = this._handlePrefChange.bind(this);
this._handleUAStylePrefChange = this._handleUAStylePrefChange.bind(this);
this._handleDefaultColorUnitPrefChange =
@ -1644,6 +1637,14 @@ CssRuleView.prototype = {
event.stopPropagation();
}
},
/**
* Adds the highlighters overlay to the rule view. This is called by the "mousemove"
* event handler and in shared-head.js when opening and selecting the rule view.
*/
addHighlightersToView() {
this.highlighters.addToView(this);
},
};
/**

13
devtools/client/inspector/test/shared-head.js
View File

@ -91,6 +91,9 @@ function openRuleView() {
// through an additional ".flush()" property.
view.debounce = manualDebounce();
// Adds the highlighters overlay in the rule view.
view.addHighlightersToView();
return {
toolbox: data.toolbox,
inspector: data.inspector,
@ -110,6 +113,8 @@ function openRuleView() {
function openComputedView() {
return openInspectorSidebarTab("computedview").then(data => {
const view = data.inspector.getPanel("computedview").computedView;
// Adds the highlighters overlay in the computed view.
view.addHighlightersToView();
return {
toolbox: data.toolbox,
@ -160,7 +165,9 @@ function openLayoutView() {
* @return {CssRuleView} the rule view
*/
function selectRuleView(inspector) {
return inspector.getPanel("ruleview").view;
const view = inspector.getPanel("ruleview").view;
view.addHighlightersToView();
return view;
}
/**
@ -172,7 +179,9 @@ function selectRuleView(inspector) {
*/
function selectComputedView(inspector) {
inspector.sidebar.select("computedview");
return inspector.getPanel("computedview").computedView;
const view = inspector.getPanel("computedview").computedView;
view.addHighlightersToView();
return view;
}
/**

7
devtools/client/locales/en-US/responsive.properties
View File

@ -124,10 +124,9 @@ responsive.reloadConditions.touchSimulation=Reload when touch simulation is togg
# to select whether to reload when user agent is changed.
responsive.reloadConditions.userAgent=Reload when user agent is changed
# LOCALIZATION NOTE (responsive.reloadNotification.description): Text in notification bar
# shown on first open to clarify that some features need a reload to apply. %1$S is the
# label on the reload conditions menu (responsive.reloadConditions.label).
responsive.reloadNotification.description=Device simulation changes require a reload to fully apply. Automatic reloads are disabled by default to avoid losing any changes in DevTools. You can enable reloading via the “%1$S” menu.
# LOCALIZATION NOTE (responsive.reloadNotification.description2): Text in notification bar
# shown on first open to clarify that some features need a reload to apply.
responsive.reloadNotification.description2=Device simulation changes require a reload to fully apply. Automatic reloads are disabled by default to avoid losing any changes in DevTools. You can enable reloading via the Settings menu.
# LOCALIZATION NOTE (responsive.leftAlignViewport): Label on checkbox used in the settings
# menu.

3
devtools/client/responsive.html/actions/devices.js
View File

@ -4,6 +4,8 @@
"use strict";
const Services = require("Services");
const {
ADD_DEVICE,
ADD_DEVICE_TYPE,
@ -18,7 +20,6 @@ const { removeDeviceAssociation } = require("./viewports");
const { addDevice, getDevices, removeDevice } = require("devtools/client/shared/devices");
const Services = require("Services");
const DISPLAYED_DEVICES_PREF = "devtools.responsive.html.displayedDeviceList";
/**

23
devtools/client/responsive.html/actions/display-pixel-ratio.js
View File

@ -1,23 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const { CHANGE_DISPLAY_PIXEL_RATIO } = require("./index");
module.exports = {
/**
* The pixel ratio of the display has changed. This may be triggered by the user
* when changing the monitor resolution, or when the window is dragged to a different
* display with a different pixel ratio.
*/
changeDisplayPixelRatio(displayPixelRatio) {
return {
type: CHANGE_DISPLAY_PIXEL_RATIO,
displayPixelRatio,
};
},
};

12
devtools/client/responsive.html/actions/index.js
View File

@ -4,9 +4,9 @@
"use strict";
// This file lists all of the actions available in responsive design. This
// This file lists all of the actions available in responsive design. This
// central list of constants makes it easy to see all possible action names at
// a glance. Please add a comment with each new action type.
// a glance. Please add a comment with each new action type.
const { createEnum } = require("devtools/client/shared/enum");
@ -28,7 +28,7 @@ createEnum([
// Change the device displayed in the viewport.
"CHANGE_DEVICE",
// Change the location of the page. This may be triggered by the user
// Change the location of the page. This may be triggered by the user
// directly entering a new URL, navigating with links, etc.
"CHANGE_LOCATION",
@ -48,9 +48,6 @@ createEnum([
// Change one of the reload conditions.
"CHANGE_RELOAD_CONDITION",
// Change the touch simulation state.
"CHANGE_TOUCH_SIMULATION",
// Indicates that the device list is being loaded.
"LOAD_DEVICE_LIST_START",
@ -84,6 +81,9 @@ createEnum([
// Toggles the left alignment of the viewports.
"TOGGLE_LEFT_ALIGNMENT",
// Toggles the touch simulation state of the viewports.
"TOGGLE_TOUCH_SIMULATION",
// Update the device display state in the device selector.
"UPDATE_DEVICE_DISPLAYED",

22
devtools/client/responsive.html/actions/location.js
View File

@ -1,22 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const { CHANGE_LOCATION } = require("./index");
module.exports = {
/**
* The location of the page has changed. This may be triggered by the user
* directly entering a new URL, navigating with links, etc.
*/
changeLocation(location) {
return {
type: CHANGE_LOCATION,
location,
};
},
};

3
devtools/client/responsive.html/actions/moz.build
View File

@ -6,12 +6,9 @@
DevToolsModules(
'devices.js',
'display-pixel-ratio.js',
'index.js',
'location.js',
'reload-conditions.js',
'screenshot.js',
'touch-simulation.js',
'ui.js',
'viewports.js',
)

3
devtools/client/responsive.html/actions/reload-conditions.js
View File

@ -4,13 +4,14 @@
"use strict";
const Services = require("Services");
const {
CHANGE_RELOAD_CONDITION,
LOAD_RELOAD_CONDITIONS_END,
} = require("./index");
const Types = require("../types");
const Services = require("Services");
const PREF_PREFIX = "devtools.responsive.reloadConditions.";

3
devtools/client/responsive.html/actions/screenshot.js
View File

@ -6,6 +6,8 @@
"use strict";
const Services = require("Services");
const {
TAKE_SCREENSHOT_START,
TAKE_SCREENSHOT_END,
@ -14,7 +16,6 @@ const {
const { getFormatStr } = require("../utils/l10n");
const { getTopLevelWindow } = require("../utils/window");
const e10s = require("../utils/e10s");
const Services = require("Services");
const CAMERA_AUDIO_URL = "resource://devtools/client/themes/audio/shutter.wav";

22
devtools/client/responsive.html/actions/touch-simulation.js
View File

@ -1,22 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* eslint-env browser */
"use strict";
const {
CHANGE_TOUCH_SIMULATION
} = require("./index");
module.exports = {
changeTouchSimulation(enabled) {
return {
type: CHANGE_TOUCH_SIMULATION,
enabled,
};
},
};

21
devtools/client/responsive.html/actions/ui.js
View File

@ -5,11 +5,25 @@
"use strict";
const {
CHANGE_DISPLAY_PIXEL_RATIO,
TOGGLE_LEFT_ALIGNMENT,
TOGGLE_TOUCH_SIMULATION,
} = require("./index");
module.exports = {
/**
* The pixel ratio of the display has changed. This may be triggered by the user
* when changing the monitor resolution, or when the window is dragged to a different
* display with a different pixel ratio.
*/
changeDisplayPixelRatio(displayPixelRatio) {
return {
type: CHANGE_DISPLAY_PIXEL_RATIO,
displayPixelRatio,
};
},
toggleLeftAlignment(enabled) {
return {
type: TOGGLE_LEFT_ALIGNMENT,
@ -17,4 +31,11 @@ module.exports = {
};
},
toggleTouchSimulation(enabled) {
return {
type: TOGGLE_TOUCH_SIMULATION,
enabled,
};
},
};

2
devtools/client/responsive.html/browser/swap.js
View File

@ -5,9 +5,9 @@
"use strict";
const { Ci } = require("chrome");
const Services = require("Services");
const { E10SUtils } = require("resource://gre/modules/E10SUtils.jsm");
const { tunnelToInnerBrowser } = require("./tunnel");
const Services = require("Services");
function debug(msg) {
// console.log(`RDM swap: ${msg}`);

1
devtools/client/responsive.html/browser/web-navigation.js
View File

@ -10,6 +10,7 @@ const Services = require("Services");
const { NetUtil } = require("resource://gre/modules/NetUtil.jsm");
const { Utils } = require("resource://gre/modules/sessionstore/Utils.jsm");
const Telemetry = require("devtools/client/shared/telemetry");
const telemetry = new Telemetry();
function readInputStreamToString(stream) {

22
devtools/client/responsive.html/components/App.js
View File

@ -6,7 +6,7 @@
"use strict";
const { Component, createFactory } = require("devtools/client/shared/vendor/react");
const { createFactory, PureComponent } = require("devtools/client/shared/vendor/react");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
const { connect } = require("devtools/client/shared/vendor/react-redux");
@ -27,8 +27,10 @@ const {
} = require("../actions/devices");
const { changeReloadCondition } = require("../actions/reload-conditions");
const { takeScreenshot } = require("../actions/screenshot");
const { changeTouchSimulation } = require("../actions/touch-simulation");
const { toggleLeftAlignment } = require("../actions/ui");
const {
toggleTouchSimulation,
toggleLeftAlignment,
} = require("../actions/ui");
const {
changeDevice,
changePixelRatio,
@ -39,16 +41,14 @@ const {
const Types = require("../types");
class App extends Component {
class App extends PureComponent {
static get propTypes() {
return {
devices: PropTypes.shape(Types.devices).isRequired,
dispatch: PropTypes.func.isRequired,
displayPixelRatio: Types.pixelRatio.value.isRequired,
networkThrottling: PropTypes.shape(Types.networkThrottling).isRequired,
reloadConditions: PropTypes.shape(Types.reloadConditions).isRequired,
screenshot: PropTypes.shape(Types.screenshot).isRequired,
touchSimulation: PropTypes.shape(Types.touchSimulation).isRequired,
viewports: PropTypes.arrayOf(PropTypes.shape(Types.viewport)).isRequired,
};
}
@ -93,7 +93,7 @@ class App extends Component {
device,
}, "*");
this.props.dispatch(changeDevice(id, device.name, deviceType));
this.props.dispatch(changeTouchSimulation(device.touch));
this.props.dispatch(toggleTouchSimulation(device.touch));
this.props.dispatch(changePixelRatio(id, device.pixelRatio));
}
@ -123,7 +123,7 @@ class App extends Component {
type: "change-touch-simulation",
enabled,
}, "*");
this.props.dispatch(changeTouchSimulation(enabled));
this.props.dispatch(toggleTouchSimulation(enabled));
}
onContentResize({ width, height }) {
@ -150,7 +150,7 @@ class App extends Component {
// TODO: Bug 1332754: Move messaging and logic into the action creator so that device
// property changes are sent from there instead of this function.
this.props.dispatch(removeDeviceAssociation(id));
this.props.dispatch(changeTouchSimulation(false));
this.props.dispatch(toggleTouchSimulation(false));
this.props.dispatch(changePixelRatio(id, 0));
}
@ -181,11 +181,9 @@ class App extends Component {
render() {
const {
devices,
displayPixelRatio,
networkThrottling,
reloadConditions,
screenshot,
touchSimulation,
viewports,
} = this.props;
@ -226,13 +224,11 @@ class App extends Component {
dom.div({ id: "app" },
Toolbar({
devices,
displayPixelRatio,
networkThrottling,
reloadConditions,
screenshot,
selectedDevice,
selectedPixelRatio,
touchSimulation,
viewport: viewports[0],
onChangeDevice,
onChangeNetworkThrottling,

10
devtools/client/responsive.html/components/DevicePixelRatioMenu.js
View File

@ -21,10 +21,10 @@ class DevicePixelRatioMenu extends PureComponent {
static get propTypes() {
return {
devices: PropTypes.shape(Types.devices).isRequired,
displayPixelRatio: Types.pixelRatio.value.isRequired,
displayPixelRatio: PropTypes.number.isRequired,
onChangePixelRatio: PropTypes.func.isRequired,
selectedDevice: PropTypes.string.isRequired,
selectedPixelRatio: PropTypes.shape(Types.pixelRatio).isRequired,
selectedPixelRatio: PropTypes.number.isRequired,
};
}
@ -44,8 +44,8 @@ class DevicePixelRatioMenu extends PureComponent {
return {
label: getFormatStr("responsive.devicePixelRatioOption", value),
type: "checkbox",
checked: selectedPixelRatio.value > 0 ?
selectedPixelRatio.value === value :
checked: selectedPixelRatio > 0 ?
selectedPixelRatio === value :
displayPixelRatio === value,
click: () => onChangePixelRatio(+value),
};
@ -86,7 +86,7 @@ class DevicePixelRatioMenu extends PureComponent {
},
dom.span({ className: "title" },
getFormatStr("responsive.devicePixelRatioOption",
selectedPixelRatio.value || displayPixelRatio)
selectedPixelRatio || displayPixelRatio)
)
)
);

4
devtools/client/responsive.html/components/ResizableViewport.js
View File

@ -6,7 +6,7 @@
"use strict";
const { Component, createFactory } = require("devtools/client/shared/vendor/react");
const { createFactory, PureComponent } = require("devtools/client/shared/vendor/react");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
@ -18,7 +18,7 @@ const Types = require("../types");
const VIEWPORT_MIN_WIDTH = Constants.MIN_VIEWPORT_DIMENSION;
const VIEWPORT_MIN_HEIGHT = Constants.MIN_VIEWPORT_DIMENSION;
class ResizableViewport extends Component {
class ResizableViewport extends PureComponent {
static get propTypes() {
return {
leftAlignmentEnabled: PropTypes.bool.isRequired,

16
devtools/client/responsive.html/components/Toolbar.js
View File

@ -22,7 +22,7 @@ class Toolbar extends PureComponent {
static get propTypes() {
return {
devices: PropTypes.shape(Types.devices).isRequired,
displayPixelRatio: Types.pixelRatio.value.isRequired,
displayPixelRatio: PropTypes.number.isRequired,
leftAlignmentEnabled: PropTypes.bool.isRequired,
networkThrottling: PropTypes.shape(Types.networkThrottling).isRequired,
onChangeDevice: PropTypes.func.isRequired,
@ -40,8 +40,8 @@ class Toolbar extends PureComponent {
reloadConditions: PropTypes.shape(Types.reloadConditions).isRequired,
screenshot: PropTypes.shape(Types.screenshot).isRequired,
selectedDevice: PropTypes.string.isRequired,
selectedPixelRatio: PropTypes.shape(Types.pixelRatio).isRequired,
touchSimulation: PropTypes.shape(Types.touchSimulation).isRequired,
selectedPixelRatio: PropTypes.number.isRequired,
touchSimulationEnabled: PropTypes.bool.isRequired,
viewport: PropTypes.shape(Types.viewport).isRequired,
};
}
@ -68,7 +68,7 @@ class Toolbar extends PureComponent {
screenshot,
selectedDevice,
selectedPixelRatio,
touchSimulation,
touchSimulationEnabled,
viewport,
} = this.props;
@ -121,10 +121,10 @@ class Toolbar extends PureComponent {
dom.button({
id: "touch-simulation-button",
className: "devtools-button" +
(touchSimulation.enabled ? " checked" : ""),
title: (touchSimulation.enabled ?
(touchSimulationEnabled ? " checked" : ""),
title: (touchSimulationEnabled ?
getStr("responsive.disableTouch") : getStr("responsive.enableTouch")),
onClick: () => onChangeTouchSimulation(!touchSimulation.enabled),
onClick: () => onChangeTouchSimulation(!touchSimulationEnabled),
})
),
dom.div(
@ -156,7 +156,9 @@ class Toolbar extends PureComponent {
const mapStateToProps = state => {
return {
displayPixelRatio: state.ui.displayPixelRatio,
leftAlignmentEnabled: state.ui.leftAlignmentEnabled,
touchSimulationEnabled: state.ui.touchSimulationEnabled,
};
};

4
devtools/client/responsive.html/components/ViewportDimension.js
View File

@ -4,7 +4,7 @@
"use strict";
const { Component } = require("devtools/client/shared/vendor/react");
const { PureComponent } = require("devtools/client/shared/vendor/react");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
@ -12,7 +12,7 @@ const { isKeyIn } = require("../utils/key");
const { MIN_VIEWPORT_DIMENSION } = require("../constants");
const Types = require("../types");
class ViewportDimension extends Component {
class ViewportDimension extends PureComponent {
static get propTypes() {
return {
onResizeViewport: PropTypes.func.isRequired,

6
devtools/client/responsive.html/components/Viewports.js
View File

@ -4,16 +4,16 @@
"use strict";
const { connect } = require("devtools/client/shared/vendor/react-redux");
const { Component, createFactory } = require("devtools/client/shared/vendor/react");
const { createFactory, PureComponent } = require("devtools/client/shared/vendor/react");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
const { connect } = require("devtools/client/shared/vendor/react-redux");
const ResizableViewport = createFactory(require("./ResizableViewport"));
const Types = require("../types");
class Viewports extends Component {
class Viewports extends PureComponent {
static get propTypes() {
return {
leftAlignmentEnabled: PropTypes.bool.isRequired,

4
devtools/client/responsive.html/index.js
View File

@ -23,10 +23,9 @@ const message = require("./utils/message");
const App = createFactory(require("./components/App"));
const Store = require("./store");
const { loadDevices } = require("./actions/devices");
const { changeDisplayPixelRatio } = require("./actions/display-pixel-ratio");
const { changeLocation } = require("./actions/location");
const { loadReloadConditions } = require("./actions/reload-conditions");
const { addViewport, resizeViewport } = require("./actions/viewports");
const { changeDisplayPixelRatio } = require("./actions/ui");
// Exposed for use by tests
window.require = require;
@ -117,7 +116,6 @@ function onDevicePixelRatioChange() {
window.addInitialViewport = ({ uri, userContextId }) => {
try {
onDevicePixelRatioChange();
bootstrap.dispatch(changeLocation(uri));
bootstrap.dispatch(changeDisplayPixelRatio(window.devicePixelRatio));
bootstrap.dispatch(addViewport(userContextId));
} catch (e) {

5
devtools/client/responsive.html/manager.js
View File

@ -491,8 +491,7 @@ ResponsiveUI.prototype = {
showReloadNotification() {
if (Services.prefs.getBoolPref(RELOAD_NOTIFICATION_PREF, false)) {
showNotification(this.browserWindow, this.tab, {
msg: l10n.getFormatStr("responsive.reloadNotification.description",
l10n.getStr("responsive.reloadConditions.label")),
msg: l10n.getFormatStr("responsive.reloadNotification.description2"),
});
Services.prefs.setBoolPref(RELOAD_NOTIFICATION_PREF, false);
}
@ -581,7 +580,7 @@ ResponsiveUI.prototype = {
async onChangeTouchSimulation(event) {
const { enabled } = event.data;
const reloadNeeded = await this.updateTouchSimulation(enabled) &&
this.reloadOnChange("touchSimulation");
this.reloadOnChange("touchSimulation");
if (reloadNeeded) {
this.getViewportBrowser().reload();
}

3
devtools/client/responsive.html/reducers.js
View File

@ -5,11 +5,8 @@
"use strict";
exports.devices = require("./reducers/devices");
exports.displayPixelRatio = require("./reducers/display-pixel-ratio");
exports.location = require("./reducers/location");
exports.networkThrottling = require("devtools/client/shared/components/throttling/reducer");
exports.reloadConditions = require("./reducers/reload-conditions");
exports.screenshot = require("./reducers/screenshot");
exports.touchSimulation = require("./reducers/touch-simulation");
exports.ui = require("./reducers/ui");
exports.viewports = require("./reducers/viewports");

4
devtools/client/responsive.html/reducers/devices.js
View File

@ -18,10 +18,10 @@ const {
const Types = require("../types");
const INITIAL_DEVICES = {
types: [],
isModalOpen: false,
modalOpenedFromViewport: null,
listState: Types.loadableState.INITIALIZED,
modalOpenedFromViewport: null,
types: [],
};
const reducers = {

26
devtools/client/responsive.html/reducers/display-pixel-ratio.js
View File

@ -1,26 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* eslint-env browser */
"use strict";
const { CHANGE_DISPLAY_PIXEL_RATIO } = require("../actions/index");
const INITIAL_DISPLAY_PIXEL_RATIO = 0;
const reducers = {
[CHANGE_DISPLAY_PIXEL_RATIO](_, action) {
return action.displayPixelRatio;
},
};
module.exports = function(displayPixelRatio = INITIAL_DISPLAY_PIXEL_RATIO, action) {
const reducer = reducers[action.type];
if (!reducer) {
return displayPixelRatio;
}
return reducer(displayPixelRatio, action);
};

25
devtools/client/responsive.html/reducers/location.js
View File

@ -1,25 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const { CHANGE_LOCATION } = require("../actions/index");
const INITIAL_LOCATION = "about:blank";
const reducers = {
[CHANGE_LOCATION](_, action) {
return action.location;
},
};
module.exports = function(location = INITIAL_LOCATION, action) {
const reducer = reducers[action.type];
if (!reducer) {
return location;
}
return reducer(location, action);
};

3
devtools/client/responsive.html/reducers/moz.build
View File

@ -6,11 +6,8 @@
DevToolsModules(
'devices.js',
'display-pixel-ratio.js',
'location.js',
'reload-conditions.js',
'screenshot.js',
'touch-simulation.js',
'ui.js',
'viewports.js',
)

4
devtools/client/responsive.html/reducers/screenshot.js
View File

@ -9,7 +9,9 @@ const {
TAKE_SCREENSHOT_START,
} = require("../actions/index");
const INITIAL_SCREENSHOT = { isCapturing: false };
const INITIAL_SCREENSHOT = {
isCapturing: false,
};
const reducers = {

31
devtools/client/responsive.html/reducers/touch-simulation.js
View File

@ -1,31 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const {
CHANGE_TOUCH_SIMULATION,
} = require("../actions/index");
const INITIAL_TOUCH_SIMULATION = {
enabled: false,
};
const reducers = {
[CHANGE_TOUCH_SIMULATION](touchSimulation, { enabled }) {
return Object.assign({}, touchSimulation, {
enabled,
});
},
};
module.exports = function(touchSimulation = INITIAL_TOUCH_SIMULATION, action) {
const reducer = reducers[action.type];
if (!reducer) {
return touchSimulation;
}
return reducer(touchSimulation, action);
};

18
devtools/client/responsive.html/reducers/ui.js
View File

@ -7,18 +7,30 @@
const Services = require("Services");
const {
CHANGE_DISPLAY_PIXEL_RATIO,
TOGGLE_LEFT_ALIGNMENT,
TOGGLE_TOUCH_SIMULATION,
} = require("../actions/index");
const LEFT_ALIGNMENT_ENABLED = "devtools.responsive.leftAlignViewport.enabled";
const INITIAL_UI = {
// The pixel ratio of the display.
displayPixelRatio: 0,
// Whether or not the viewports are left aligned.
leftAlignmentEnabled: Services.prefs.getBoolPref(LEFT_ALIGNMENT_ENABLED),
// Whether or not touch simulation is enabled.
touchSimulationEnabled: false,
};
const reducers = {
[CHANGE_DISPLAY_PIXEL_RATIO](ui, { displayPixelRatio }) {
return Object.assign({}, ui, {
displayPixelRatio,
});
},
[TOGGLE_LEFT_ALIGNMENT](ui, { enabled }) {
const leftAlignmentEnabled = enabled !== undefined ?
enabled : !ui.leftAlignmentEnabled;
@ -30,6 +42,12 @@ const reducers = {
});
},
[TOGGLE_TOUCH_SIMULATION](ui, { enabled }) {
return Object.assign({}, ui, {
touchSimulationEnabled: enabled,
});
},
};
module.exports = function(ui = INITIAL_UI, action) {

8
devtools/client/responsive.html/reducers/viewports.js
View File

@ -22,9 +22,7 @@ const INITIAL_VIEWPORT = {
deviceType: "",
width: 320,
height: 480,
pixelRatio: {
value: 0,
},
pixelRatio: 0,
userContextId: 0,
};
@ -60,9 +58,7 @@ const reducers = {
}
return Object.assign({}, viewport, {
pixelRatio: {
value: pixelRatio
},
pixelRatio,
});
});
},

8
devtools/client/responsive.html/test/unit/test_change_display_pixel_ratio.js
View File

@ -5,18 +5,18 @@
// Test changing the display pixel ratio.
const { changeDisplayPixelRatio } =
require("devtools/client/responsive.html/actions/display-pixel-ratio");
const { changeDisplayPixelRatio } = require("devtools/client/responsive.html/actions/ui");
const NEW_PIXEL_RATIO = 5.5;
add_task(async function() {
const store = Store();
const { getState, dispatch } = store;
equal(getState().displayPixelRatio, 0,
equal(getState().ui.displayPixelRatio, 0,
"Defaults to 0 at startup");
dispatch(changeDisplayPixelRatio(NEW_PIXEL_RATIO));
equal(getState().displayPixelRatio, NEW_PIXEL_RATIO,
equal(getState().ui.displayPixelRatio, NEW_PIXEL_RATIO,
`Display Pixel Ratio changed to ${NEW_PIXEL_RATIO}`);
});

22
devtools/client/responsive.html/test/unit/test_change_location.js
View File

@ -1,22 +0,0 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Test changing the location of the displayed page.
const { changeLocation } =
require("devtools/client/responsive.html/actions/location");
const TEST_URL = "http://example.com";
add_task(async function() {
const store = Store();
const { getState, dispatch } = store;
equal(getState().location, "about:blank",
"Defaults to about:blank at startup");
dispatch(changeLocation(TEST_URL));
equal(getState().location, TEST_URL, "Location changed to TEST_URL");
});

2
devtools/client/responsive.html/test/unit/test_change_pixel_ratio.js
View File

@ -17,6 +17,6 @@ add_task(async function() {
dispatch(changePixelRatio(0, NEW_PIXEL_RATIO));
const viewport = getState().viewports[0];
equal(viewport.pixelRatio.value, NEW_PIXEL_RATIO,
equal(viewport.pixelRatio, NEW_PIXEL_RATIO,
`Viewport's pixel ratio changed to ${NEW_PIXEL_RATIO}`);
});

10
devtools/client/responsive.html/test/unit/test_update_touch_simulation_enabled.js
View File

@ -5,19 +5,17 @@
// Test updating the touch simulation `enabled` property
const {
changeTouchSimulation,
} = require("devtools/client/responsive.html/actions/touch-simulation");
const { toggleTouchSimulation } = require("devtools/client/responsive.html/actions/ui");
add_task(async function() {
const store = Store();
const { getState, dispatch } = store;
ok(!getState().touchSimulation.enabled,
ok(!getState().ui.touchSimulationEnabled,
"Touch simulation is disabled by default.");
dispatch(changeTouchSimulation(true));
dispatch(toggleTouchSimulation(true));
ok(getState().touchSimulation.enabled,
ok(getState().ui.touchSimulationEnabled,
"Touch simulation is enabled.");
});

1
devtools/client/responsive.html/test/unit/xpcshell.ini
View File

@ -8,7 +8,6 @@ firefox-appdir = browser
[test_add_viewport.js]
[test_change_device.js]
[test_change_display_pixel_ratio.js]
[test_change_location.js]
[test_change_network_throttling.js]
[test_change_pixel_ratio.js]
[test_resize_viewport.js]

17
devtools/client/responsive.html/types.js
View File

@ -24,11 +24,6 @@ exports.loadableState = createEnum([
/* GLOBAL */
/**
* The location of the document displayed in the viewport(s).
*/
exports.location = PropTypes.string;
/**
* Whether to reload the page automatically when certain actions occur.
*/
@ -130,16 +125,6 @@ exports.networkThrottling = {
};
/**
* Device pixel ratio for a given viewport.
*/
const pixelRatio = exports.pixelRatio = {
// The device pixel ratio value
value: PropTypes.number,
};
/**
* Touch simulation state for a given viewport.
*/
@ -171,7 +156,7 @@ exports.viewport = {
height: PropTypes.number,
// The device pixel ratio of the viewport
pixelRatio: PropTypes.shape(pixelRatio),
pixelRatio: PropTypes.number,
// The user context (container) ID for the viewport
// Defaults to 0 meaning the default context

1
devtools/client/shared/redux/middleware/test/.eslintrc.js
View File

@ -8,6 +8,7 @@ module.exports = {
"run_next_test": true,
"equal": true,
"do_print": true,
"waitUntilState": true
},
"rules": {
// Stop giving errors for run_test

6
devtools/client/webaudioeditor/test/doc_bug_1112378.html
View File

@ -14,11 +14,11 @@
"use strict";
const ctx = new AudioContext();
const osc = ctx.createStereoPanner();
const panner = ctx.createStereoPanner();
function throwError() {
try {
osc.connect({});
panner.connect({});
} catch (e) {
return {
lineNumber: e.lineNumber,
@ -34,7 +34,7 @@
function throwDOMException() {
try {
osc.channelCount = 3;
panner.channelCount = 3;
} catch (e) {
return {
lineNumber: e.lineNumber,

4
devtools/server/tests/unit/test_objectgrips-21.js
View File

@ -178,8 +178,8 @@ const nullPrincipalTests = [{
property: descriptor({value: "Error"}),
afterTest: `trapDidRun === false`,
}, {
// Like the previous test, but now the object has a Function class.
string: "[object Function]",
// Like the previous test, but now the object is a callable Proxy.
string: "function () {\n [native code]\n}",
isFunction: true,
hasPreview: false,
code: `

48
docshell/base/nsDocShell.cpp
View File

@ -145,7 +145,7 @@
#include "nsIWritablePropertyBag2.h"
#include "nsIWyciwygChannel.h"
#include "nsPICommandUpdater.h"
#include "nsCommandManager.h"
#include "nsPIDOMWindow.h"
#include "nsPILoadGroupInternal.h"
#include "nsPIWindowRoot.h"
@ -1550,6 +1550,14 @@ nsDocShell::GetHasTrackingContentBlocked(bool* aHasTrackingContentBlocked)
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::GetHasSlowTrackingContentBlocked(bool* aHasSlowTrackingContentBlocked)
{
nsCOMPtr<nsIDocument> doc(GetDocument());
*aHasSlowTrackingContentBlocked = doc && doc->GetHasSlowTrackingContentBlocked();
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::GetHasTrackingContentLoaded(bool* aHasTrackingContentLoaded)
{
@ -1558,6 +1566,38 @@ nsDocShell::GetHasTrackingContentLoaded(bool* aHasTrackingContentLoaded)
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::GetHasCookiesBlockedByPermission(bool* aHasCookiesBlockedByPermission)
{
nsCOMPtr<nsIDocument> doc(GetDocument());
*aHasCookiesBlockedByPermission = doc && doc->GetHasCookiesBlockedByPermission();
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::GetHasCookiesBlockedDueToTrackers(bool* aHasCookiesBlockedDueToTrackers)
{
nsCOMPtr<nsIDocument> doc(GetDocument());
*aHasCookiesBlockedDueToTrackers = doc && doc->GetHasTrackingCookiesBlocked();
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::GetHasAllCookiesBeenBlocked(bool* aHasAllCookiesBeenBlocked)
{
nsCOMPtr<nsIDocument> doc(GetDocument());
*aHasAllCookiesBeenBlocked = doc && doc->GetHasAllCookiesBlocked();
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::GetHasForeignCookiesBeenBlocked(bool* aHasForeignCookiesBeenBlocked)
{
nsCOMPtr<nsIDocument> doc(GetDocument());
*aHasForeignCookiesBeenBlocked = doc && doc->GetHasForeignCookiesBlocked();
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::GetAllowPlugins(bool* aAllowPlugins)
{
@ -13245,11 +13285,7 @@ nsresult
nsDocShell::EnsureCommandHandler()
{
if (!mCommandManager) {
nsCOMPtr<nsPICommandUpdater> commandUpdater =
do_CreateInstance("@mozilla.org/embedcomp/command-manager;1");
if (!commandUpdater) {
return NS_ERROR_OUT_OF_MEMORY;
}
nsCOMPtr<nsPICommandUpdater> commandUpdater = new nsCommandManager();
nsCOMPtr<nsPIDOMWindowOuter> domWindow = GetWindow();
nsresult rv = commandUpdater->Init(domWindow);

30
docshell/base/nsIDocShell.idl
View File

@ -625,6 +625,36 @@ interface nsIDocShell : nsIDocShellTreeItem
*/
[infallible] readonly attribute boolean hasTrackingContentLoaded;
/**
* This attribute determines whether a document has Slow Tracking Content
* that has been blocked from loading.
*/
[infallible] readonly attribute boolean hasSlowTrackingContentBlocked;
/**
* This attribute determines whether a document seen cookies or storage
* blocked due to a site permission being denied.
*/
[infallible] readonly attribute boolean hasCookiesBlockedByPermission;
/**
* This attribute determines whether a document seen cookies or storage
* blocked due to a the request being made by a tracker.
*/
[infallible] readonly attribute boolean hasCookiesBlockedDueToTrackers;
/**
* This attribute determines whether a document seen cookies or storage
* blocked due to cookie behavior settings blocking all cookies.
*/
[infallible] readonly attribute boolean hasAllCookiesBeenBlocked;
/**
* This attribute determines whether a document seen cookies or storage
* blocked due to cookie behavior settings blocking all third-party cookies.
*/
[infallible] readonly attribute boolean hasForeignCookiesBeenBlocked;
/**
* Disconnects this docshell's editor from its window, and stores the
* editor data in the open document's session history entry. This

37
dom/base/Element.h
View File

@ -2044,23 +2044,54 @@ Element::AttrValueIs(int32_t aNameSpaceID,
} // namespace dom
} // namespace mozilla
inline mozilla::dom::Element* nsINode::AsElement()
inline mozilla::dom::Element*
nsINode::AsElement()
{
MOZ_ASSERT(IsElement());
return static_cast<mozilla::dom::Element*>(this);
}
inline const mozilla::dom::Element* nsINode::AsElement() const
inline const mozilla::dom::Element*
nsINode::AsElement() const
{
MOZ_ASSERT(IsElement());
return static_cast<const mozilla::dom::Element*>(this);
}
inline mozilla::dom::Element* nsINode::GetParentElement() const
inline mozilla::dom::Element*
nsINode::GetParentElement() const
{
return mozilla::dom::Element::FromNodeOrNull(mParent);
}
inline mozilla::dom::Element*
nsINode::GetPreviousElementSibling() const
{
nsIContent* previousSibling = GetPreviousSibling();
while (previousSibling) {
if (previousSibling->IsElement()) {
return previousSibling->AsElement();
}
previousSibling = previousSibling->GetPreviousSibling();
}
return nullptr;
}
inline mozilla::dom::Element*
nsINode::GetNextElementSibling() const
{
nsIContent* nextSibling = GetNextSibling();
while (nextSibling) {
if (nextSibling->IsElement()) {
return nextSibling->AsElement();
}
nextSibling = nextSibling->GetNextSibling();
}
return nullptr;
}
/**
* Macros to implement Clone(). _elementName is the class for which to implement
* Clone.

16
dom/base/Link.cpp
View File

@ -9,10 +9,10 @@
#include "mozilla/EventStates.h"
#include "mozilla/MemoryReporting.h"
#include "mozilla/dom/Element.h"
#ifdef ANDROID
#include "mozilla/IHistory.h"
#else
#if defined(MOZ_PLACES)
#include "mozilla/places/History.h"
#else
#include "mozilla/IHistory.h"
#endif
#include "nsIURL.h"
#include "nsIURIMutator.h"
@ -35,7 +35,7 @@
namespace mozilla {
namespace dom {
#ifndef ANDROID
#if defined(MOZ_PLACES)
using places::History;
#endif
@ -381,8 +381,10 @@ Link::LinkState() const
if (mHistory && hrefURI) {
#ifdef ANDROID
nsCOMPtr<IHistory> history = services::GetHistoryService();
#else
#elif defined(MOZ_PLACES)
History* history = History::GetService();
#else
nsCOMPtr<IHistory> history;
#endif
if (history) {
nsresult rv = history->RegisterVisitedCallback(hrefURI, self);
@ -846,8 +848,10 @@ Link::UnregisterFromHistory()
if (mHistory && mCachedURI) {
#ifdef ANDROID
nsCOMPtr<IHistory> history = services::GetHistoryService();
#else
#elif defined(MOZ_PLACES)
History* history = History::GetService();
#else
nsCOMPtr<IHistory> history;
#endif
if (history) {
nsresult rv = history->UnregisterVisitedCallback(mCachedURI, this);

5
dom/base/nsDocument.cpp
View File

@ -1415,6 +1415,11 @@ nsIDocument::nsIDocument()
mHasUnsafeEvalCSP(false),
mHasUnsafeInlineCSP(false),
mHasTrackingContentBlocked(false),
mHasSlowTrackingContentBlocked(false),
mHasAllCookiesBlocked(false),
mHasTrackingCookiesBlocked(false),
mHasForeignCookiesBlocked(false),
mHasCookiesBlockedByPermission(false),
mHasTrackingContentLoaded(false),
mBFCacheDisallowed(false),
mHasHadDefaultView(false),

8
dom/base/nsGlobalWindowOuter.cpp
View File

@ -5291,8 +5291,16 @@ nsGlobalWindowOuter::NotifyContentBlockingState(unsigned aState,
securityUI->GetState(&state);
if (aState == nsIWebProgressListener::STATE_BLOCKED_TRACKING_CONTENT) {
doc->SetHasTrackingContentBlocked(true);
} else if (aState == nsIWebProgressListener::STATE_BLOCKED_SLOW_TRACKING_CONTENT) {
doc->SetHasSlowTrackingContentBlocked(true);
} else if (aState == nsIWebProgressListener::STATE_COOKIES_BLOCKED_BY_PERMISSION) {
doc->SetHasCookiesBlockedByPermission(true);
} else if (aState == nsIWebProgressListener::STATE_COOKIES_BLOCKED_TRACKER) {
doc->SetHasTrackingCookiesBlocked(true);
} else if (aState == nsIWebProgressListener::STATE_COOKIES_BLOCKED_ALL) {
doc->SetHasAllCookiesBlocked(true);
} else if (aState == nsIWebProgressListener::STATE_COOKIES_BLOCKED_FOREIGN) {
doc->SetHasForeignCookiesBlocked(true);
} else {
// Ignore nsIWebProgressListener::STATE_BLOCKED_UNSAFE_CONTENT;
}

76
dom/base/nsIDocument.h
View File

@ -977,6 +977,22 @@ public:
return mHasTrackingContentBlocked;
}
/**
* Get slow tracking content blocked flag for this document.
*/
bool GetHasSlowTrackingContentBlocked()
{
return mHasSlowTrackingContentBlocked;
}
/**
* Get all cookies blocked flag for this document.
*/
bool GetHasAllCookiesBlocked()
{
return mHasAllCookiesBlocked;
}
/**
* Get tracking cookies blocked flag for this document.
*/
@ -985,6 +1001,22 @@ public:
return mHasTrackingCookiesBlocked;
}
/**
* Get third-party cookies blocked flag for this document.
*/
bool GetHasForeignCookiesBlocked()
{
return mHasForeignCookiesBlocked;
}
/**
* Get cookies blocked by site permission flag for this document.
*/
bool GetHasCookiesBlockedByPermission()
{
return mHasCookiesBlockedByPermission;
}
/**
* Set the tracking content blocked flag for this document.
*/
@ -993,6 +1025,22 @@ public:
mHasTrackingContentBlocked = aHasTrackingContentBlocked;
}
/**
* Set the slow tracking content blocked flag for this document.
*/
void SetHasSlowTrackingContentBlocked(bool aHasSlowTrackingContentBlocked)
{
mHasSlowTrackingContentBlocked = aHasSlowTrackingContentBlocked;
}
/**
* Set the all cookies blocked flag for this document.
*/
void SetHasAllCookiesBlocked(bool aHasAllCookiesBlocked)
{
mHasAllCookiesBlocked = aHasAllCookiesBlocked;
}
/**
* Set the tracking cookies blocked flag for this document.
*/
@ -1001,6 +1049,22 @@ public:
mHasTrackingCookiesBlocked = aHasTrackingCookiesBlocked;
}
/**
* Set the third-party cookies blocked flag for this document.
*/
void SetHasForeignCookiesBlocked(bool aHasForeignCookiesBlocked)
{
mHasForeignCookiesBlocked = aHasForeignCookiesBlocked;
}
/**
* Set the cookies blocked by site permission flag for this document.
*/
void SetHasCookiesBlockedByPermission(bool aHasCookiesBlockedByPermission)
{
mHasCookiesBlockedByPermission = aHasCookiesBlockedByPermission;
}
/**
* Get tracking content loaded flag for this document.
*/
@ -4003,9 +4067,21 @@ protected:
// True if a document has blocked Tracking Content
bool mHasTrackingContentBlocked : 1;
// True if a document has blocked Slow Tracking Content
bool mHasSlowTrackingContentBlocked : 1;
// True if a document has blocked All Cookies
bool mHasAllCookiesBlocked : 1;
// True if a document has blocked Tracking Cookies
bool mHasTrackingCookiesBlocked : 1;
// True if a document has blocked Foreign Cookies
bool mHasForeignCookiesBlocked : 1;
// True if a document has blocked Cookies By Site Permission
bool mHasCookiesBlockedByPermission : 1;
// True if a document has loaded Tracking Content
bool mHasTrackingContentLoaded : 1;

28
dom/base/nsINode.cpp
View File

@ -1571,34 +1571,6 @@ nsINode::ComputeIndexOf(const nsINode* aChild) const
return -1;
}
Element*
nsINode::GetPreviousElementSibling() const
{
nsIContent* previousSibling = GetPreviousSibling();
while (previousSibling) {
if (previousSibling->IsElement()) {
return previousSibling->AsElement();
}
previousSibling = previousSibling->GetPreviousSibling();
}
return nullptr;
}
Element*
nsINode::GetNextElementSibling() const
{
nsIContent* nextSibling = GetNextSibling();
while (nextSibling) {
if (nextSibling->IsElement()) {
return nextSibling->AsElement();
}
nextSibling = nextSibling->GetNextSibling();
}
return nullptr;
}
static already_AddRefed<nsINode>
GetNodeFromNodeOrString(const OwningNodeOrString& aNode,
nsIDocument* aDocument)

4
dom/base/nsINode.h
View File

@ -1836,8 +1836,8 @@ public:
}
// ChildNode methods
mozilla::dom::Element* GetPreviousElementSibling() const;
mozilla::dom::Element* GetNextElementSibling() const;
inline mozilla::dom::Element* GetPreviousElementSibling() const;
inline mozilla::dom::Element* GetNextElementSibling() const;
MOZ_CAN_RUN_SCRIPT void Before(const Sequence<OwningNodeOrString>& aNodes,
ErrorResult& aRv);

23
dom/base/nsJSEnvironment.cpp
View File

@ -120,6 +120,11 @@ const size_t gStackSize = 8192;
#define NS_CC_SKIPPABLE_DELAY 250 // ms
// In case the cycle collector isn't run at all, we don't want
// forget skippables to run too often. So limit the forget skippable cycle to
// start at earliest 2000 ms after the end of the previous cycle.
#define NS_TIME_BETWEEN_FORGET_SKIPPABLE_CYCLES 2000 // ms
// ForgetSkippable is usually fast, so we can use small budgets.
// This isn't a real budget but a hint to IdleTaskRunner whether there
// is enough time to call ForgetSkippable.
@ -161,6 +166,8 @@ static StaticRefPtr<IdleTaskRunner> sInterSliceGCRunner;
static TimeStamp sLastCCEndTime;
static TimeStamp sLastForgetSkippableCycleEndTime;
static bool sCCLockedOut;
static PRTime sCCLockedOutTime;
@ -2014,6 +2021,10 @@ CCRunnerFired(TimeStamp aDeadline)
// next time, so kill the timer.
sPreviousSuspectedCount = 0;
nsJSContext::KillCCRunner();
if (!didDoWork) {
sLastForgetSkippableCycleEndTime = TimeStamp::Now();
}
}
return didDoWork;
@ -2228,6 +2239,17 @@ nsJSContext::MaybePokeCC()
return;
}
// If GC hasn't run recently and forget skippable only cycle was run,
// don't start a new cycle too soon.
if (sCleanupsSinceLastGC > NS_MAJOR_FORGET_SKIPPABLE_CALLS) {
uint32_t sinceLastForgetSkippableCycle =
TimeUntilNow(sLastForgetSkippableCycleEndTime);
if (sinceLastForgetSkippableCycle &&
sinceLastForgetSkippableCycle < NS_TIME_BETWEEN_FORGET_SKIPPABLE_CYCLES) {
return;
}
}
if (ShouldTriggerCC(nsCycleCollector_suspectedCount())) {
sCCRunnerFireCount = 0;
@ -2490,6 +2512,7 @@ mozilla::dom::StartupJSEnvironment()
sCCLockedOut = false;
sCCLockedOutTime = 0;
sLastCCEndTime = TimeStamp();
sLastForgetSkippableCycleEndTime = TimeStamp();
sHasRunGC = false;
sPendingLoadCount = 0;
sLoadingInProgress = false;

12
dom/bindings/Errors.msg
View File

@ -106,9 +106,9 @@ MSG_DEF(MSG_CACHE_OPEN_FAILED, 0, JSEXN_TYPEERR, "CacheStorage.open() failed to
MSG_DEF(MSG_MATRIX_INIT_LENGTH_WRONG, 1, JSEXN_TYPEERR, "Matrix init sequence must have a length of 6 or 16 (actual value: {0})")
MSG_DEF(MSG_INVALID_MEDIA_VIDEO_CONFIGURATION, 0, JSEXN_TYPEERR, "Invalid VideoConfiguration.")
MSG_DEF(MSG_INVALID_MEDIA_AUDIO_CONFIGURATION, 0, JSEXN_TYPEERR, "Invalid AudioConfiguration.")
MSG_DEF(MSG_INVALID_CURVE_DURATION_ERROR, 0, JSEXN_RANGEERR, "The curve duration for SetValueCurve must be strictly positive.")
MSG_DEF(MSG_INVALID_AUDIOPARAM_METHOD_START_TIME_ERROR, 0, JSEXN_RANGEERR, "The start time for an AudioParam method must be positive.")
MSG_DEF(MSG_INVALID_AUDIOPARAM_METHOD_END_TIME_ERROR, 0, JSEXN_RANGEERR, "The end time for an AudioParam method must be positive.")
MSG_DEF(MSG_INVALID_AUDIOPARAM_EXPONENTIAL_VALUE_ERROR, 0, JSEXN_RANGEERR, "The value passed to exponentialCurveToValueAtTime must be positive.")
MSG_DEF(MSG_INVALID_AUDIOPARAM_EXPONENTIAL_CONSTANT_ERROR, 0, JSEXN_RANGEERR, "The exponential constant passed to setTargetAtTime must be positive.")
MSG_DEF(MSG_VALUE_OUT_OF_RANGE, 1, JSEXN_RANGEERR, "The value for the {0} is outside the valid range.")
MSG_DEF(MSG_INVALID_CURVE_DURATION_ERROR, 0, JSEXN_RANGEERR, "The curve duration for setValueCurveAtTime must be strictly positive.")
MSG_DEF(MSG_INVALID_AUDIOPARAM_METHOD_START_TIME_ERROR, 0, JSEXN_RANGEERR, "The start time for an AudioParam method must be non-negative.")
MSG_DEF(MSG_INVALID_AUDIOPARAM_METHOD_END_TIME_ERROR, 0, JSEXN_RANGEERR, "The end time for an AudioParam method must be non-negative.")
MSG_DEF(MSG_INVALID_AUDIOPARAM_EXPONENTIAL_VALUE_ERROR, 0, JSEXN_RANGEERR, "The value passed to exponentialRampToValueAtTime must be positive.")
MSG_DEF(MSG_INVALID_AUDIOPARAM_EXPONENTIAL_CONSTANT_ERROR, 0, JSEXN_RANGEERR, "The exponential constant passed to setTargetAtTime must be non-negative.")
MSG_DEF(MSG_VALUE_OUT_OF_RANGE, 1, JSEXN_RANGEERR, "The value for the {0} is outside the valid range.")

2
dom/commandhandler/moz.build
View File

@ -8,6 +8,8 @@ with Files("**"):
BUG_COMPONENT = ("Core", "Embedding: APIs")
EXPORTS += [
'nsBaseCommandController.h',
'nsCommandManager.h',
'nsCommandParams.h',
]

5
dom/commandhandler/nsBaseCommandController.h
View File

@ -7,11 +7,6 @@
#ifndef nsBaseCommandController_h__
#define nsBaseCommandController_h__
#define NS_BASECOMMANDCONTROLLER_CID \
{ 0xbf88b48c, 0xfd8e, 0x40b4, { 0xba, 0x36, 0xc7, 0xc3, 0xad, 0x6d, 0x8a, 0xc9 } }
#define NS_BASECOMMANDCONTROLLER_CONTRACTID \
"@mozilla.org/embedcomp/base-command-controller;1"
#include "nsIController.h"
#include "nsIControllerContext.h"
#include "nsIControllerCommandTable.h"

11
dom/commandhandler/nsICommandManager.idl
View File

@ -105,14 +105,3 @@ Arguments to observers "Observe" method are as follows:
*/
// {64edb481-0c04-11d5-a73c-e964b968b0bc}
%{C++
#define NS_COMMAND_MANAGER_CID \
{ 0x64edb481, 0x0c04, 0x11d5, { 0xa7, 0x3c, 0xe9, 0x64, 0xb9, 0x68, 0xb0, 0xbc } }
#define NS_COMMAND_MANAGER_CONTRACTID \
"@mozilla.org/embedcomp/command-manager;1"
%}

48
dom/media/webaudio/AudioEventTimeline.cpp
View File

@ -116,7 +116,7 @@ AudioEventTimeline::GetValuesAtTimeHelper(TimeType aTime, float* aBuffer,
MOZ_ASSERT(aSize);
auto TimeOf = [](const AudioTimelineEvent& aEvent) -> TimeType {
return aEvent.template Time<TimeType>();
return aEvent.Time<TimeType>();
};
size_t eventIndex = 0;
@ -186,7 +186,7 @@ AudioEventTimeline::GetValuesAtTimeHelper(int64_t aTime, float* aBuffer,
template<class TimeType> float
AudioEventTimeline::GetValueAtTimeOfEvent(const AudioTimelineEvent* aNext)
{
TimeType time = aNext->template Time<TimeType>();
TimeType time = aNext->Time<TimeType>();
switch (aNext->mType) {
case AudioTimelineEvent::SetTarget:
// SetTarget nodes can be handled no matter what their next node is
@ -225,9 +225,9 @@ AudioEventTimeline::GetValuesAtTimeHelperInternal(TimeType aTime,
// Otherwise, this returns the time of the event.
auto TimeOf = [](const AudioTimelineEvent* aEvent) -> TimeType {
if (aEvent->mType == AudioTimelineEvent::SetValueCurve) {
return aEvent->template Time<TimeType>() + aEvent->mDuration;
return aEvent->Time<TimeType>() + aEvent->mDuration;
}
return aEvent->template Time<TimeType>();
return aEvent->Time<TimeType>();
};
// Value for an event. For a ValueCurve event, this is the value of the last
@ -243,17 +243,21 @@ AudioEventTimeline::GetValuesAtTimeHelperInternal(TimeType aTime,
// they have one)
if (aPrevious->mType == AudioTimelineEvent::SetTarget) {
return ExponentialApproach(TimeOf(aPrevious),
mLastComputedValue, ValueOf(aPrevious),
aPrevious->mTimeConstant, aTime);
mLastComputedValue,
ValueOf(aPrevious),
aPrevious->mTimeConstant,
aTime);
}
// SetValueCurve events can be handled no matter what their next node is
// (if they have one), when aTime is in the curve region.
if (aPrevious->mType == AudioTimelineEvent::SetValueCurve &&
aTime <= aPrevious->template Time<TimeType>() + aPrevious->mDuration) {
return ExtractValueFromCurve(aPrevious->template Time<TimeType>(),
aPrevious->mCurve, aPrevious->mCurveLength,
aPrevious->mDuration, aTime);
aTime <= aPrevious->Time<TimeType>() + aPrevious->mDuration) {
return ExtractValueFromCurve(aPrevious->Time<TimeType>(),
aPrevious->mCurve,
aPrevious->mCurveLength,
aPrevious->mDuration,
aTime);
}
// If the requested time is after all of the existing events
@ -265,9 +269,11 @@ AudioEventTimeline::GetValuesAtTimeHelperInternal(TimeType aTime,
// The value will be constant after the last event
return aPrevious->mValue;
case AudioTimelineEvent::SetValueCurve:
return ExtractValueFromCurve(aPrevious->template Time<TimeType>(),
aPrevious->mCurve, aPrevious->mCurveLength,
aPrevious->mDuration, aTime);
return ExtractValueFromCurve(aPrevious->Time<TimeType>(),
aPrevious->mCurve,
aPrevious->mCurveLength,
aPrevious->mDuration,
aTime);
case AudioTimelineEvent::SetTarget:
MOZ_FALLTHROUGH_ASSERT("AudioTimelineEvent::SetTarget");
case AudioTimelineEvent::SetValue:
@ -286,13 +292,15 @@ AudioEventTimeline::GetValuesAtTimeHelperInternal(TimeType aTime,
return LinearInterpolate(TimeOf(aPrevious),
ValueOf(aPrevious),
TimeOf(aNext),
ValueOf(aNext), aTime);
ValueOf(aNext),
aTime);
case AudioTimelineEvent::ExponentialRamp:
return ExponentialInterpolate(TimeOf(aPrevious),
ValueOf(aPrevious),
TimeOf(aNext),
ValueOf(aNext), aTime);
ValueOf(aNext),
aTime);
case AudioTimelineEvent::SetValueAtTime:
case AudioTimelineEvent::SetTarget:
@ -313,9 +321,11 @@ AudioEventTimeline::GetValuesAtTimeHelperInternal(TimeType aTime,
// value is constant.
return aPrevious->mValue;
case AudioTimelineEvent::SetValueCurve:
return ExtractValueFromCurve(aPrevious->template Time<TimeType>(),
aPrevious->mCurve, aPrevious->mCurveLength,
aPrevious->mDuration, aTime);
return ExtractValueFromCurve(aPrevious->Time<TimeType>(),
aPrevious->mCurve,
aPrevious->mCurveLength,
aPrevious->mDuration,
aTime);
case AudioTimelineEvent::SetTarget:
MOZ_FALLTHROUGH_ASSERT("AudioTimelineEvent::SetTarget");
case AudioTimelineEvent::SetValue:
@ -343,7 +353,7 @@ AudioEventTimeline::GetPreviousEvent(double aTime) const
const AudioTimelineEvent* next = nullptr;
auto TimeOf = [](const AudioTimelineEvent& aEvent) -> double {
return aEvent.template Time<double>();
return aEvent.Time<double>();
};
bool bailOut = false;

52
dom/media/webaudio/AudioEventTimeline.h
View File

@ -131,32 +131,28 @@ public:
MOZ_ASSERT(NS_IsMainThread());
auto TimeOf = [](const AudioTimelineEvent& aEvent) -> double {
return aEvent.template Time<double>();
return aEvent.Time<double>();
};
// Validate the event itself
if (!WebAudioUtils::IsTimeValid(TimeOf(aEvent))) {
aRv.template ThrowRangeError<
aRv.ThrowRangeError<
MSG_INVALID_AUDIOPARAM_METHOD_START_TIME_ERROR>();
return false;
}
if (!WebAudioUtils::IsTimeValid(aEvent.mTimeConstant)) {
aRv.template ThrowRangeError<
aRv.ThrowRangeError<
MSG_INVALID_AUDIOPARAM_EXPONENTIAL_CONSTANT_ERROR>();
return false;
}
if (aEvent.mType == AudioTimelineEvent::SetValueCurve) {
if (!aEvent.mCurve || !aEvent.mCurveLength) {
aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
return false;
}
if (aEvent.mCurveLength < 2) {
if (!aEvent.mCurve || aEvent.mCurveLength < 2) {
aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
return false;
}
if (aEvent.mDuration <= 0) {
aRv.template ThrowRangeError<MSG_INVALID_CURVE_DURATION_ERROR>();
aRv.ThrowRangeError<MSG_INVALID_CURVE_DURATION_ERROR>();
return false;
}
}
@ -174,12 +170,12 @@ public:
}
}
// Make sure that new curve events don't fall in a range which includes other
// events.
// Make sure that new curve events don't fall in a range which includes
// other events.
if (aEvent.mType == AudioTimelineEvent::SetValueCurve) {
for (unsigned i = 0; i < mEvents.Length(); ++i) {
if (TimeOf(aEvent) < TimeOf(mEvents[i]) &&
TimeOf(aEvent) + aEvent.mDuration >= TimeOf(mEvents[i])) {
TimeOf(aEvent) + aEvent.mDuration > TimeOf(mEvents[i])) {
aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
return false;
}
@ -189,7 +185,7 @@ public:
// Make sure that invalid values are not used for exponential curves
if (aEvent.mType == AudioTimelineEvent::ExponentialRamp) {
if (aEvent.mValue <= 0.f) {
aRv.template ThrowRangeError<
aRv.ThrowRangeError<
MSG_INVALID_AUDIOPARAM_EXPONENTIAL_VALUE_ERROR>();
return false;
}
@ -213,18 +209,18 @@ public:
void InsertEvent(const AudioTimelineEvent& aEvent)
{
for (unsigned i = 0; i < mEvents.Length(); ++i) {
if (aEvent.template Time<TimeType>() == mEvents[i].template Time<TimeType>()) {
// If two events happen at the same time, have them in chronological
// order of insertion.
do {
++i;
} while (i < mEvents.Length() &&
aEvent.mType != mEvents[i].mType &&
aEvent.template Time<TimeType>() == mEvents[i].template Time<TimeType>());
mEvents.InsertElementAt(i, aEvent);
if (aEvent.Time<TimeType>() == mEvents[i].Time<TimeType>()) {
// If two events happen at the same time, have them in chronological
// order of insertion.
do {
++i;
} while (i < mEvents.Length() && aEvent.mType != mEvents[i].mType &&
aEvent.Time<TimeType>() == mEvents[i].Time<TimeType>());
mEvents.InsertElementAt(i, aEvent);
return;
}
// Otherwise, place the event right after the latest existing event
if (aEvent.template Time<TimeType>() < mEvents[i].template Time<TimeType>()) {
if (aEvent.Time<TimeType>() < mEvents[i].Time<TimeType>()) {
mEvents.InsertElementAt(i, aEvent);
return;
}
@ -308,12 +304,12 @@ public:
void CancelScheduledValues(TimeType aStartTime)
{
for (unsigned i = 0; i < mEvents.Length(); ++i) {
if (mEvents[i].template Time<TimeType>() >= aStartTime) {
if (mEvents[i].Time<TimeType>() >= aStartTime) {
#ifdef DEBUG
// Sanity check: the array should be sorted, so all of the following
// events should have a time greater than aStartTime too.
for (unsigned j = i + 1; j < mEvents.Length(); ++j) {
MOZ_ASSERT(mEvents[j].template Time<TimeType>() >= aStartTime);
MOZ_ASSERT(mEvents[j].Time<TimeType>() >= aStartTime);
}
#endif
mEvents.TruncateLength(i);
@ -364,13 +360,11 @@ public:
template<class TimeType>
void CleanupEventsOlderThan(TimeType aTime)
{
while (mEvents.Length() > 1 &&
aTime > mEvents[1].template Time<TimeType>()) {
while (mEvents.Length() > 1 && aTime > mEvents[1].Time<TimeType>()) {
if (mEvents[1].mType == AudioTimelineEvent::SetTarget) {
mLastComputedValue = GetValuesAtTimeHelperInternal(
mEvents[1].template Time<TimeType>(),
&mEvents[0], nullptr);
mEvents[1].Time<TimeType>(), &mEvents[0], nullptr);
}
mEvents.RemoveElementAt(0);

15
dom/media/webaudio/AudioParam.h
View File

@ -51,14 +51,13 @@ public:
ErrorResult& aRv)
{
if (!WebAudioUtils::IsTimeValid(aStartTime)) {
aRv.template ThrowRangeError<
aRv.ThrowRangeError<
MSG_INVALID_AUDIOPARAM_METHOD_START_TIME_ERROR>();
return this;
}
aStartTime = std::max(aStartTime, GetParentObject()->CurrentTime());
EventInsertionHelper(aRv, AudioTimelineEvent::SetValueCurve,
aStartTime, 0.0f,
0.0f, aDuration, aValues.Elements(),
aStartTime, 0.0f, 0.0f, aDuration, aValues.Elements(),
aValues.Length());
return this;
@ -83,7 +82,7 @@ public:
AudioParam* SetValueAtTime(float aValue, double aStartTime, ErrorResult& aRv)
{
if (!WebAudioUtils::IsTimeValid(aStartTime)) {
aRv.template ThrowRangeError<
aRv.ThrowRangeError<
MSG_INVALID_AUDIOPARAM_METHOD_START_TIME_ERROR>();
return this;
}
@ -98,7 +97,7 @@ public:
ErrorResult& aRv)
{
if (!WebAudioUtils::IsTimeValid(aEndTime)) {
aRv.template ThrowRangeError<
aRv.ThrowRangeError<
MSG_INVALID_AUDIOPARAM_METHOD_END_TIME_ERROR>();
return this;
}
@ -111,7 +110,7 @@ public:
ErrorResult& aRv)
{
if (!WebAudioUtils::IsTimeValid(aEndTime)) {
aRv.template ThrowRangeError<
aRv.ThrowRangeError<
MSG_INVALID_AUDIOPARAM_METHOD_END_TIME_ERROR>();
return this;
}
@ -126,7 +125,7 @@ public:
{
if (!WebAudioUtils::IsTimeValid(aStartTime) ||
!WebAudioUtils::IsTimeValid(aTimeConstant)) {
aRv.template ThrowRangeError<
aRv.ThrowRangeError<
MSG_INVALID_AUDIOPARAM_METHOD_START_TIME_ERROR>();
return this;
}
@ -141,7 +140,7 @@ public:
AudioParam* CancelScheduledValues(double aStartTime, ErrorResult& aRv)
{
if (!WebAudioUtils::IsTimeValid(aStartTime)) {
aRv.template ThrowRangeError<
aRv.ThrowRangeError<
MSG_INVALID_AUDIOPARAM_METHOD_START_TIME_ERROR>();
return this;
}

2
dom/media/webaudio/AudioParamTimeline.h
View File

@ -53,7 +53,7 @@ public:
void InsertEvent(const AudioTimelineEvent& aEvent)
{
if (aEvent.mType == AudioTimelineEvent::Cancel) {
CancelScheduledValues(aEvent.template Time<TimeType>());
CancelScheduledValues(aEvent.Time<TimeType>());
return;
}
if (aEvent.mType == AudioTimelineEvent::Stream) {

6
editor/composer/nsComposerRegistration.cpp
View File

@ -9,6 +9,7 @@
#include "mozilla/ModuleUtils.h"
#include "mozilla/mozalloc.h" // for operator new
#include "nsCOMPtr.h" // for nsCOMPtr, getter_AddRefs, etc
#include "nsBaseCommandController.h" // for nsBaseCommandController
#include "nsComponentManagerUtils.h" // for do_CreateInstance
#include "nsComposeTxtSrvFilter.h" // for nsComposeTxtSrvFilter, etc
#include "nsDebug.h" // for NS_ENSURE_SUCCESS
@ -99,10 +100,9 @@ nsComposeTxtSrvFilterConstructorForMail(nsISupports *aOuter,
static nsresult
CreateControllerWithSingletonCommandTable(const nsCID& inCommandTableCID, nsIController **aResult)
{
nsresult rv;
nsCOMPtr<nsIController> controller = do_CreateInstance("@mozilla.org/embedcomp/base-command-controller;1", &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIController> controller = new nsBaseCommandController();
nsresult rv;
nsCOMPtr<nsIControllerCommandTable> composerCommandTable = do_GetService(inCommandTableCID, &rv);
NS_ENSURE_SUCCESS(rv, rv);

1
js/src/gc/Allocator.cpp
View File

@ -291,7 +291,6 @@ GCRuntime::checkAllocatorState(JSContext* cx, AllocKind kind)
kind != AllocKind::ATOM &&
kind != AllocKind::FAT_INLINE_ATOM);
MOZ_ASSERT(!JS::RuntimeHeapIsBusy());
MOZ_ASSERT(cx->isAllocAllowed());
#endif
// Crash if we perform a GC action when it is not safe.

2
js/src/gc/GC.cpp
View File

@ -7689,8 +7689,6 @@ GCRuntime::checkCanCallAPI()
/* If we attempt to invoke the GC while we are running in the GC, assert. */
MOZ_RELEASE_ASSERT(!JS::RuntimeHeapIsBusy());
MOZ_ASSERT(rt->mainContextFromOwnThread()->isAllocAllowed());
}
bool

5
js/src/jit-test/lib/wasm-binary.js
View File

@ -24,7 +24,6 @@ const startId = 8;
const elemId = 9;
const codeId = 10;
const dataId = 11;
const gcFeatureOptInId = 42;
// User-defined section names
const nameName = "name";
@ -178,10 +177,6 @@ function moduleWithSections(sectionArray) {
return toU8(bytes);
}
function gcFeatureOptInSection(version) {
return { name: gcFeatureOptInId, body: [ version & 0x7F ] }
}
function sigSection(sigs) {
var body = [];
body.push(...varU32(sigs.length));

7
js/src/jit-test/tests/basic/bug807623.js
View File

@ -3,12 +3,7 @@ var functionProxy = new Proxy(function() {}, {});
assertEq(Object.prototype.toString.call(objectProxy), '[object Object]');
assertEq(Object.prototype.toString.call(functionProxy), '[object Function]');
try {
Function.prototype.toString.call(functionProxy);
assertEq(true, false);
} catch (e) {
assertEq(!!/incompatible/.exec(e), true);
}
try {
Function.prototype.toString.call(objectProxy);
assertEq(true, false);

4
js/src/jit-test/tests/debug/bug-1260725.js
View File

@ -1,7 +1,5 @@
// |jit-test| error: out of memory
if (!('oomTest' in this))
throw new Error("out of memory");
quit()
var dbg = new Debugger;
dbg.onNewGlobalObject = function(global) {

4
js/src/jit-test/tests/debug/bug1251919.js
View File

@ -1,7 +1,5 @@
// |jit-test| error: out of memory
if (!('oomTest' in this))
throw new Error("out of memory");
quit();
// jsfunfuzz-generated
fullcompartmentchecks(true);

4
js/src/jit-test/tests/debug/bug1254123.js
View File

@ -1,7 +1,5 @@
// |jit-test| error: boom
if (!('oomTest' in this))
throw new Error("boom");
quit();
evaluate(`
function ERROR(msg) {

4
js/src/jit-test/tests/debug/bug1254190.js
View File

@ -1,7 +1,7 @@
// |jit-test| error: out of memory; slow;
// |jit-test| slow
if (!('oomTest' in this))
throw new Error("out of memory");
quit();
var g = newGlobal();
var dbg = new Debugger(g);

4
js/src/jit-test/tests/debug/bug1254578.js
View File

@ -1,7 +1,7 @@
// |jit-test| error:ReferenceError; slow
// |jit-test| slow
if (!('oomTest' in this))
throw (new ReferenceError);
quit();
var g = newGlobal();
g.debuggeeGlobal = this;

6
js/src/jit-test/tests/debug/bug1264961.js
View File

@ -20,9 +20,7 @@ function loadFile(lfVarx) {
var k = 0;
oomTest(function() {
// In practice a crash occurs before iteration 4000.
if (k++ > 4000)
quit();
eval(lfVarx);
if (k++ <= 4000)
eval(lfVarx);
})
}

9
js/src/jit-test/tests/debug/bug1272908.js
View File

@ -1,12 +1,15 @@
// |jit-test| error: out of memory; slow;
// |jit-test| slow
if (!('oomTest' in this))
quit();
// Adapted from randomly chosen test: js/src/jit-test/tests/modules/bug-1233915.js
g = newGlobal();
g.parent = this;
g.eval("(" + function() {
Debugger(parent).onExceptionUnwind = function(frame)
Debugger(parent).onExceptionUnwind = function(frame) {
frame.eval("")
} + ")()");
} } + ")()");
// Adapted from randomly chosen test: js/src/jit-test/tests/debug/bug1254123.js
function ERROR(msg) {
throw new Error("boom");

3
js/src/jit-test/tests/debug/bug1404710.js
View File

@ -1,6 +1,5 @@
// |jit-test| error:InternalError
if (!('stackTest' in this))
throw InternalError();
quit();
stackTest(new Function(`
var g = newGlobal();
var dbg = new Debugger(g);

4
js/src/jit-test/tests/ion/bug1484905.js Normal file
View File

@ -0,0 +1,4 @@
// |jit-test| --ion-limit-script-size=off; --ion-gvn=off
for (var i = 0; i < 1; ++i) {
"".replace(/x/, "").replace(/y/, "12");
}

8
js/src/jit-test/tests/proxy/function-toString.js
View File

@ -1,10 +1,10 @@
load(libdir + 'asserts.js');
// Function.prototype.toString doesn't accept ES6 proxies.
var nativeCode = "function () {\n [native code]\n}";
var proxy = new Proxy(function() {}, {});
assertThrowsInstanceOf(() => Function.prototype.toString.call(proxy), TypeError);
assertEq(Function.prototype.toString.call(proxy), nativeCode);
var o = Proxy.revocable(function() {}, {});
assertThrowsInstanceOf(() => Function.prototype.toString.call(o.proxy), TypeError);
assertEq(Function.prototype.toString.call(o.proxy), nativeCode);
o.revoke();
assertThrowsInstanceOf(() => Function.prototype.toString.call(o.proxy), TypeError);
assertEq(Function.prototype.toString.call(o.proxy), nativeCode);

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