зеркало из https://github.com/mozilla/gecko-dev.git
Bug 897811 - fix uses of browser.pagethumbnails.capturing_disabled to reflect the pref controls if it is *disabled* rather than enabled. r=gavin
This commit is contained in:
Родитель
6729d618ab
Коммит
a459f7acd2
|
@ -96,7 +96,7 @@
|
|||
"set": [
|
||||
["dom.ipc.browser_frames.oop_by_default", true],
|
||||
["dom.mozBrowserFramesEnabled", true],
|
||||
["browser.pagethumbnails.capturing_disabled", false]
|
||||
["browser.pagethumbnails.capturing_disabled", true]
|
||||
]
|
||||
}, runTests);
|
||||
});
|
||||
|
|
|
@ -181,7 +181,7 @@
|
|||
|
||||
["dom.ipc.browser_frames.oop_by_default", true],
|
||||
["dom.mozBrowserFramesEnabled", true],
|
||||
["browser.pagethumbnails.capturing_disabled", false]
|
||||
["browser.pagethumbnails.capturing_disabled", true]
|
||||
]
|
||||
}, runTests);
|
||||
});
|
||||
|
|
|
@ -206,7 +206,7 @@ function expectMozbrowserEvent(iframe, eventName) {
|
|||
|
||||
// Set some prefs:
|
||||
//
|
||||
// * browser.pagethumbnails.capturing_disabled: false
|
||||
// * browser.pagethumbnails.capturing_disabled: true
|
||||
//
|
||||
// Disable tab view; it seriously messes us up.
|
||||
//
|
||||
|
@ -244,7 +244,7 @@ function expectMozbrowserEvent(iframe, eventName) {
|
|||
|
||||
browserElementTestHelpers.lockTestReady();
|
||||
SpecialPowers.setBoolPref("network.disable.ipc.security", true);
|
||||
SpecialPowers.pushPrefEnv({set: [["browser.pagethumbnails.capturing_disabled", false],
|
||||
SpecialPowers.pushPrefEnv({set: [["browser.pagethumbnails.capturing_disabled", true],
|
||||
["dom.ipc.browser_frames.oop_by_default", oop],
|
||||
["dom.ipc.tabs.disabled", false],
|
||||
["security.mixed_content.block_active_content", false]]},
|
||||
|
|
|
@ -158,7 +158,7 @@
|
|||
|
||||
["dom.ipc.browser_frames.oop_by_default", true],
|
||||
["dom.mozBrowserFramesEnabled", true],
|
||||
["browser.pagethumbnails.capturing_disabled", false]
|
||||
["browser.pagethumbnails.capturing_disabled", true]
|
||||
]
|
||||
}, runTests);
|
||||
});
|
||||
|
|
|
@ -106,7 +106,7 @@ RefTestCmdLineHandler.prototype =
|
|||
// Setting this pref makes tests run much faster there.
|
||||
branch.setBoolPref("security.fileuri.strict_origin_policy", false);
|
||||
// Disable the thumbnailing service
|
||||
branch.setBoolPref("browser.pagethumbnails.capturing_disabled", false);
|
||||
branch.setBoolPref("browser.pagethumbnails.capturing_disabled", true);
|
||||
|
||||
var wwatch = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
|
||||
.getService(nsIWindowWatcher);
|
||||
|
|
|
@ -147,4 +147,4 @@ user_pref("geo.provider.testing", true);
|
|||
|
||||
// Background thumbnails in particular cause grief, and disabling thumbnails
|
||||
// in general can't hurt - we re-enable them when tests need them.
|
||||
user_pref("browser.pagethumbnails.capturing_disabled", false);
|
||||
user_pref("browser.pagethumbnails.capturing_disabled", true);
|
||||
|
|
|
@ -465,7 +465,7 @@ this.PageThumbs = {
|
|||
|
||||
_prefEnabled: function PageThumbs_prefEnabled() {
|
||||
try {
|
||||
return Services.prefs.getBoolPref("browser.pagethumbnails.capturing_disabled");
|
||||
return !Services.prefs.getBoolPref("browser.pagethumbnails.capturing_disabled");
|
||||
}
|
||||
catch (e) {
|
||||
return true;
|
||||
|
|
|
@ -11,7 +11,7 @@ let {PageThumbs, PageThumbsStorage, SessionStore, FileUtils, OS} = tmp;
|
|||
Cu.import("resource://gre/modules/PlacesUtils.jsm");
|
||||
|
||||
let oldEnabledPref = Services.prefs.getBoolPref("browser.pagethumbnails.capturing_disabled");
|
||||
Services.prefs.setBoolPref("browser.pagethumbnails.capturing_disabled", true);
|
||||
Services.prefs.setBoolPref("browser.pagethumbnails.capturing_disabled", false);
|
||||
|
||||
registerCleanupFunction(function () {
|
||||
while (gBrowser.tabs.length > 1)
|
||||
|
|
Загрузка…
Ссылка в новой задаче