wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 495495 - Entering Private Browsing mode prohibits keyboard focus on URL location bar; r=mconnor,zeniko

Browse Source
This commit is contained in:
Ehsan Akhgari 2009-06-01 21:30:02 +04:30
parent 60fc72e742
commit d3a50429b6
5 changed files with 209 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/components/privatebrowsing/test/browser/Makefile.in
View File

@ -59,6 +59,7 @@ _BROWSER_TEST_FILES = \
browser_privatebrowsing_urlbarfocus.js \
browser_privatebrowsing_forgetthissite.js \
browser_privatebrowsing_pageinfo.js \
browser_privatebrowsing_popupmode.js \
$(NULL)
# Test for bug 463256 disabled until we figure why it fails intermittently (bug 486640)
# browser_privatebrowsing_sslsite_transition.js \

107
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_popupmode.js Normal file
View File

@ -0,0 +1,107 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Private Browsing Tests.
*
* The Initial Developer of the Original Code is
* Ehsan Akhgari.
* Portions created by the Initial Developer are Copyright (C) 2009
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Ehsan Akhgari <ehsan.akhgari@gmail.com> (Original Author)
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
// This test makes sure that the URL bar is enabled after entering the private
// browsing mode, even if it's disabled before that (see bug 495495).
function test() {
// initialization
let pb = Cc["@mozilla.org/privatebrowsing;1"].
getService(Ci.nsIPrivateBrowsingService);
let ss = Cc["@mozilla.org/browser/sessionstore;1"].
getService(Ci.nsISessionStore);
// backup our state
let stateBackup = ss.getWindowState(window);
function pretendToBeAPopup(whatToPretend) {
let state = whatToPretend ?
'{"windows":[{"tabs":[{"entries":[],"attributes":{}}],"isPopup":true,"hidden":"toolbar"}]}' :
'{"windows":[{"tabs":[{"entries":[],"attributes":{}}],"isPopup":false}]}';
ss.setWindowState(window, state, true);
if (whatToPretend) {
ok(gURLBar.readOnly, "pretendToBeAPopup correctly made the URL bar read-only");
is(gURLBar.getAttribute("enablehistory"), "false",
"pretendToBeAPopup correctly disabled autocomplete on the URL bar");
}
else {
ok(!gURLBar.readOnly, "pretendToBeAPopup correctly made the URL bar read-write");
is(gURLBar.getAttribute("enablehistory"), "true",
"pretendToBeAPopup correctly enabled autocomplete on the URL bar");
}
}
// first, test the case of entering the PB mode when a popup window is active
// pretend we're a popup window
pretendToBeAPopup(true);
// enter private browsing mode
pb.privateBrowsingEnabled = true;
// make sure that the url bar status is correctly restored
ok(!gURLBar.readOnly,
"URL bar should not be read-only after entering the private browsing mode");
is(gURLBar.getAttribute("enablehistory"), "true",
"URL bar autocomplete should be enabled after entering the private browsing mode");
// leave private browsing mode
pb.privateBrowsingEnabled = false;
// we're no longer a popup window
pretendToBeAPopup(false);
// then, test the case of leaving the PB mode when a popup window is active
// start from within the private browsing mode
pb.privateBrowsingEnabled = true;
// pretend we're a popup window
pretendToBeAPopup(true);
// leave private browsing mode
pb.privateBrowsingEnabled = false;
// make sure that the url bar status is correctly restored
ok(!gURLBar.readOnly,
"URL bar should not be read-only after leaving the private browsing mode");
is(gURLBar.getAttribute("enablehistory"), "true",
"URL bar autocomplete should be enabled after leaving the private browsing mode");
// cleanup
ss.setWindowState(window, stateBackup, true);
}

16
browser/components/sessionstore/src/nsSessionStore.js
View File

@ -2272,11 +2272,21 @@ SessionStoreService.prototype = {
aWindow[aItem].visible = hidden.indexOf(aItem) == -1;
});
if (aWinData.isPopup)
if (aWinData.isPopup) {
this._windows[aWindow.__SSi].isPopup = true;
else
if (aWindow.gURLBar) {
aWindow.gURLBar.readOnly = true;
aWindow.gURLBar.setAttribute("enablehistory", "false");
}
}
else {
delete this._windows[aWindow.__SSi].isPopup;
if (aWindow.gURLBar) {
aWindow.gURLBar.readOnly = false;
aWindow.gURLBar.setAttribute("enablehistory", "true");
}
}
var _this = this;
aWindow.setTimeout(function() {
_this.restoreDimensions.apply(_this, [aWindow, aWinData.width || 0,

1
browser/components/sessionstore/test/browser/Makefile.in
View File

@ -88,6 +88,7 @@ _BROWSER_TEST_FILES = \
browser_485563.js \
browser_490040.js \
browser_493467.js \
browser_495495.js \
$(NULL)
libs:: $(_BROWSER_TEST_FILES)

87
browser/components/sessionstore/test/browser/browser_495495.js Normal file
View File

@ -0,0 +1,87 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is sessionstore test code.
*
* The Initial Developer of the Original Code is
* Ehsan Akhgari <ehsan.akhgari@gmail.com>.
* Portions created by the Initial Developer are Copyright (C) 2009
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
function test() {
/** Test for Bug 495495 **/
let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
waitForExplicitFinish();
let newWin = openDialog(location, "_blank", "chrome,all,dialog=no,toolbar=yes");
newWin.addEventListener("load", function() {
newWin.removeEventListener("load", arguments.callee, false);
executeSoon(function() {
let state1 = ss.getWindowState(newWin);
newWin.close();
newWin = openDialog(location, "_blank",
"chrome,extrachrome,menubar,resizable,scrollbars,status,toolbar=no,location,personal,directories,dialog=no");
newWin.addEventListener("load", function() {
newWin.removeEventListener("load", arguments.callee, false);
executeSoon(function() {
let state2 = ss.getWindowState(newWin);
newWin.close();
function testState(state, expected, callback) {
let win = openDialog(location, "_blank", "chrome,all,dialog=no");
win.addEventListener("load", function() {
win.removeEventListener("load", arguments.callee, false);
is(win.gURLBar.readOnly, false,
"URL bar should not be read-only before setting the state");
is(win.gURLBar.getAttribute("enablehistory"), "true",
"URL bar autocomplete should be enabled before setting the state");
ss.setWindowState(win, state, true);
is(win.gURLBar.readOnly, expected.readOnly,
"URL bar read-only state should be restored correctly");
is(win.gURLBar.getAttribute("enablehistory"), expected.enablehistory,
"URL bar autocomplete state should be restored correctly");
win.close();
callback();
}, false);
}
testState(state1, {readOnly: false, enablehistory: "true"}, function() {
testState(state2, {readOnly: true, enablehistory: "false"}, finish);
});
});
}, false);
});
}, false);
}