mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 451286 - 'Highlight all' does not seem to work at all across frames; r=mano
This commit is contained in:
parent
4087344078
commit
b82214fc9e
@ -57,6 +57,8 @@ _TEST_FILES = findbar_window.xul \
|
||||
test_bug331215.xul \
|
||||
bug263683_window.xul \
|
||||
test_bug263683.xul \
|
||||
bug451286_window.xul \
|
||||
test_bug451286.xul \
|
||||
test_popup_preventdefault_chrome.xul \
|
||||
window_popup_preventdefault_chrome.xul \
|
||||
test_largemenu.xul \
|
||||
|
131
toolkit/content/tests/chrome/bug451286_window.xul
Normal file
131
toolkit/content/tests/chrome/bug451286_window.xul
Normal file
@ -0,0 +1,131 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<!-- ***** 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 Findbar Test code
|
||||
-
|
||||
- The Initial Developer of the Original Code is
|
||||
- Mozilla Corporation.
|
||||
- Portions created by the Initial Developer are Copyright (C) 2008
|
||||
- the Initial Developer. All Rights Reserved.
|
||||
-
|
||||
- Contributor(s):
|
||||
- Graeme McCutcheon <graememcc_firefox@graeme-online.co.uk>
|
||||
-
|
||||
- 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 ***** -->
|
||||
|
||||
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
|
||||
|
||||
<window id="451286test"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
width="600"
|
||||
height="600"
|
||||
onload="onLoad();"
|
||||
title="451286 test">
|
||||
|
||||
<script type="application/javascript"><![CDATA[
|
||||
const Ci = Components.interfaces;
|
||||
const Cc = Components.classes;
|
||||
const Cr = Components.results;
|
||||
|
||||
var gFindBar = null;
|
||||
var gBrowser;
|
||||
|
||||
var imports = [ "SimpleTest", "ok", "snapshotWindow", "compareSnapshots"];
|
||||
for each (var import in imports) {
|
||||
window[import] = window.opener.wrappedJSObject[import];
|
||||
}
|
||||
|
||||
function finish() {
|
||||
window.close();
|
||||
window.opener.wrappedJSObject.SimpleTest.finish();
|
||||
}
|
||||
|
||||
function onLoad() {
|
||||
var _delayedOnLoad = function() {
|
||||
gFindBar = document.getElementById("FindToolbar");
|
||||
gBrowser = document.getElementById("content");
|
||||
gBrowser.addEventListener("pageshow", onPageShow, false);
|
||||
gBrowser.loadURI("data:text/html,<iframe id='if' src='data:text/html,text'></iframe>");
|
||||
}
|
||||
let tm = Cc["@mozilla.org/thread-manager;1"].
|
||||
getService(Ci.nsIThreadManager);
|
||||
tm.mainThread.dispatch({
|
||||
run: function() _delayedOnLoad()
|
||||
}, Ci.nsIThread.DISPATCH_NORMAL);
|
||||
}
|
||||
|
||||
function onPageShow() {
|
||||
gBrowser.removeEventListener("pageshow", onPageShow, false);
|
||||
gFindBar.open();
|
||||
var search = "text";
|
||||
gFindBar._findField.value = search;
|
||||
var matchCase = gFindBar.getElement("find-case-sensitive");
|
||||
if (matchCase.checked)
|
||||
matchCase.doCommand();
|
||||
|
||||
// Test findbar highlighting
|
||||
// Turn on highlighting
|
||||
gFindBar.toggleHighlight(true);
|
||||
gFindBar.close();
|
||||
|
||||
// Take snapshot
|
||||
var gWin = gBrowser.contentWindow;
|
||||
var findSnapshot = snapshotWindow(gWin);
|
||||
|
||||
// Now, perform the same selections manually
|
||||
gFindBar.open();
|
||||
gFindBar.toggleHighlight(false);
|
||||
gFindBar.close();
|
||||
|
||||
var doc = gBrowser.contentDocument;
|
||||
var iframe = doc.getElementById("if");
|
||||
var ifBody = iframe.contentDocument.body;
|
||||
var range = iframe.contentDocument.createRange();
|
||||
range.selectNodeContents(ifBody.childNodes[0]);
|
||||
var ifWindow = gWin.frames[0];
|
||||
var ifDocShell = ifWindow.QueryInterface(Ci.nsIInterfaceRequestor)
|
||||
.getInterface(Ci.nsIWebNavigation)
|
||||
.QueryInterface(Ci.nsIDocShell);
|
||||
|
||||
var ifController = ifDocShell.QueryInterface(Ci.nsIInterfaceRequestor)
|
||||
.getInterface(Ci.nsISelectionDisplay)
|
||||
.QueryInterface(Ci.nsISelectionController);
|
||||
|
||||
var findSelection = ifController.getSelection(ifController.SELECTION_FIND);
|
||||
findSelection.addRange(range);
|
||||
|
||||
//Take snapshots
|
||||
var manualSnapshot = snapshotWindow(gBrowser.contentWindow);
|
||||
var res = compareSnapshots(findSnapshot, manualSnapshot);
|
||||
ok(res[0], "Matches found in iframe correctly highlighted");
|
||||
finish();
|
||||
}
|
||||
]]></script>
|
||||
|
||||
<browser type="content-primary" flex="1" id="content" src="about:blank"/>
|
||||
<findbar id="FindToolbar" browserid="content"/>
|
||||
</window>
|
45
toolkit/content/tests/chrome/test_bug451286.xul
Normal file
45
toolkit/content/tests/chrome/test_bug451286.xul
Normal file
@ -0,0 +1,45 @@
|
||||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
|
||||
<?xml-stylesheet
|
||||
href="chrome://mochikit/content/tests/SimpleTest/test.css"
|
||||
type="text/css"?>
|
||||
<!--
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=451286
|
||||
-->
|
||||
<window title="Mozilla Bug 451286"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<title>Test for Bug 451286</title>
|
||||
<script type="application/javascript"
|
||||
src="chrome://mochikit/content/MochiKit/packed.js"></script>
|
||||
<script type="application/javascript"
|
||||
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<script type="application/javascript"
|
||||
src="chrome://mochikit/content/tests/SimpleTest/WindowSnapshot.js"></script>
|
||||
|
||||
<body xmlns="http://www.w3.org/1999/xhtml">
|
||||
<a target="_blank"
|
||||
href="https://bugzilla.mozilla.org/show_bug.cgi?id=451286">
|
||||
Mozilla Bug 451286
|
||||
</a>
|
||||
|
||||
<p id="display"></p>
|
||||
<div id="content" style="display: none">
|
||||
</div>
|
||||
<pre id="test">
|
||||
</pre>
|
||||
</body>
|
||||
|
||||
<script class="testbody" type="application/javascript">
|
||||
<![CDATA[
|
||||
|
||||
/** Test for Bug 451286 **/
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
window.open("bug451286_window.xul", "451286test",
|
||||
"chrome,width=600,height=600");
|
||||
|
||||
]]>
|
||||
</script>
|
||||
|
||||
</window>
|
@ -435,13 +435,17 @@
|
||||
- Gets the selection controller for the current browser
|
||||
-->
|
||||
<method name="_getSelectionController">
|
||||
<parameter name="aWindow"/>
|
||||
<body><![CDATA[
|
||||
// Yuck. See bug 138068.
|
||||
var Ci = Components.interfaces;
|
||||
var controller = this.browser.docShell
|
||||
.QueryInterface(Ci.nsIInterfaceRequestor)
|
||||
.getInterface(Ci.nsISelectionDisplay)
|
||||
.QueryInterface(Ci.nsISelectionController);
|
||||
var docShell = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
|
||||
.getInterface(Ci.nsIWebNavigation)
|
||||
.QueryInterface(Ci.nsIDocShell);
|
||||
|
||||
var controller = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
|
||||
.getInterface(Ci.nsISelectionDisplay)
|
||||
.QueryInterface(Ci.nsISelectionController);
|
||||
return controller;
|
||||
]]></body>
|
||||
</method>
|
||||
@ -532,7 +536,7 @@
|
||||
this._endPt.setStart(body, count);
|
||||
this._endPt.setEnd(body, count);
|
||||
|
||||
var controller = this._getSelectionController();
|
||||
var controller = this._getSelectionController(win);
|
||||
if (!controller) {
|
||||
// Without the selection controller,
|
||||
// we are unable to (un)highlight any matches
|
||||
|
Loading…
Reference in New Issue
Block a user