Bug 1257887 - Make windows opened through window.open() be scrollable by default. r=smaug

This commit is contained in:
Ben Tian 2016-05-17 11:25:47 +08:00
Родитель f71af76062
Коммит 7b7d04ca34
5 изменённых файлов: 9 добавлений и 8 удалений

Просмотреть файл

@ -6,7 +6,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=369370
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Test for Bug 369370</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
@ -141,7 +141,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=369370
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set":[["browser.enable_automatic_image_resizing", true]]}, function() {
kidWin = window.open("bug369370-popup.png", "bug369370", "width=400,height=300");
kidWin = window.open("bug369370-popup.png", "bug369370", "width=400,height=300,scrollbars=no");
// will init onload
ok(kidWin, "opened child window");
kidWin.onload = childLoaded;

Просмотреть файл

@ -58,7 +58,6 @@ function testWindow(w)
checkFeature('menubar');
checkFeature('toolbar');
checkFeature('personalbar');
checkFeature('scrollbars');
checkFeature('statusbar', 'status');
checkFeature('locationbar', 'location');

Просмотреть файл

@ -1543,7 +1543,7 @@ nsWindowWatcher::URIfromURL(const char* aURL,
#define NS_CALCULATE_CHROME_FLAG_FOR(feature, flag) \
prefBranch->GetBoolPref(feature, &forceEnable); \
if (forceEnable && !(aDialog && !openedFromContentScript) && \
!(!openedFromContentScript && aHasChromeParent) && !aChromeURL) { \
!(!openedFromContentScript && aHasChromeParent) && !aChromeURL) { \
chromeFlags |= flag; \
} else { \
chromeFlags |= \
@ -1658,13 +1658,16 @@ nsWindowWatcher::CalculateChromeFlags(mozIDOMWindowProxy* aParent,
nsIWebBrowserChrome::CHROME_STATUSBAR);
NS_CALCULATE_CHROME_FLAG_FOR("menubar",
nsIWebBrowserChrome::CHROME_MENUBAR);
NS_CALCULATE_CHROME_FLAG_FOR("scrollbars",
nsIWebBrowserChrome::CHROME_SCROLLBARS);
NS_CALCULATE_CHROME_FLAG_FOR("resizable",
nsIWebBrowserChrome::CHROME_WINDOW_RESIZE);
NS_CALCULATE_CHROME_FLAG_FOR("minimizable",
nsIWebBrowserChrome::CHROME_WINDOW_MIN);
// default scrollbar to "on," unless explicitly turned off
if (WinHasOption(aFeatures, "scrollbars", 1, &presenceFlag) || !presenceFlag) {
chromeFlags |= nsIWebBrowserChrome::CHROME_SCROLLBARS;
}
chromeFlags |= WinHasOption(aFeatures, "popup", 0, &presenceFlag) ?
nsIWebBrowserChrome::CHROME_WINDOW_POPUP : 0;

Просмотреть файл

@ -15,7 +15,7 @@ SpecialPowers.pushPrefEnv(
{"set": [["layers.single-tile.enabled", false]]},
function() {
window.open("transformed_scrolling_repaints_3_window.html", "transformed_scrolling_repaints_3",
"chrome,width=300,height=400");
"chrome,width=300,height=400,scrollbars=no");
}
);
</script>

Просмотреть файл

@ -1072,7 +1072,6 @@ pref("dom.disable_window_open_feature.toolbar", false);
pref("dom.disable_window_open_feature.location", false);
pref("dom.disable_window_open_feature.personalbar", false);
pref("dom.disable_window_open_feature.menubar", false);
pref("dom.disable_window_open_feature.scrollbars", false);
pref("dom.disable_window_open_feature.resizable", true);
pref("dom.disable_window_open_feature.minimizable", false);
pref("dom.disable_window_open_feature.status", true);