Attachment 201254 Details for Bug 314288

[patch] Patch rv2.0

patch.txt (text/plain), 2.50 KB, created by Masayuki Nakano [:masayuki] (he/him)(JST, +0900)

(hide)

Description:

Filename:

MIME Type:

Creator: Masayuki Nakano [:masayuki] (he/him)(JST, +0900)

Size: 2.50 KB

patch

obsolete

>Index: toolkit/content/widgets/browser.xml
>===================================================================
>RCS file: /cvsroot/mozilla/toolkit/content/widgets/browser.xml,v
>retrieving revision 1.80
>diff -u -8 -p -r1.80 browser.xml
>--- toolkit/content/widgets/browser.xml	17 Oct 2005 17:08:11 -0000	1.80
>+++ toolkit/content/widgets/browser.xml	29 Oct 2005 13:09:02 -0000
>@@ -238,28 +238,36 @@
>         <![CDATA[
>           if (!this._webBrowserFind)
>             this._webBrowserFind = this.docShell.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIWebBrowserFind);
>           return this._webBrowserFind;
>         ]]>
>         </getter>
>       </property>
> 
>+      <method name="getTabBrowser">
>+        <body>
>+          <![CDATA[
>+            var tabBrowser = this.parentNode;
>+            while (tabBrowser && tabBrowser.localName != "tabbrowser")
>+              tabBrowser = tabBrowser.parentNode;
>+            return tabBrowser;
>+          ]]>
>+        </body>
>+      </method>
>+
>       <field name="_fastFind">null</field>
>       <property name="fastFind"
>                 readonly="true">
>         <getter>
>         <![CDATA[
>           if (!this._fastFind) {
>-            var n = this.parentNode;
>-            while (n && n.localName != "tabbrowser")
>-              n = n.parentNode;
>-
>-            if (n && n.mCurrentBrowser == this)
>-              return this._fastFind = n.fastFind
>+            var tabBrowser = this.getTabBrowser();
>+            if (tabBrowser && tabBrowser.mCurrentBrowser == this)
>+              return this._fastFind = tabBrowser.fastFind;
> 
>             this._fastFind = Components.classes["@mozilla.org/typeaheadfind;1"]
>                                        .createInstance(Components.interfaces.nsITypeAheadFind);                                
>             this._fastFind.init(this.docShell);
>           }
>           return this._fastFind;
>         ]]>
>         </getter>
>@@ -437,16 +445,19 @@
>       <method name="onPageHide">
>         <parameter name="aEvent"/>
>         <body>
>           <![CDATA[
>             if (this.pageReport) {
>               this.pageReport = null;
>               this.updatePageReport();
>             }
>+            var tabBrowser = this.getTabBrowser();
>+            if (!tabBrowser || tabBrowser.mCurrentBrowser == this)
>+              this.fastFind.setDocShell(this.docShell);
>          ]]>
>         </body>
>       </method>
> 
>       <method name="updatePageReport">
>         <body>
>           <![CDATA[
>             var n = this.parentNode;

Flags:

mconnor: review+
bzbarsky: superreview+
asa: approval1.8rc2-

Actions: View | Diff | Review

Attachments on bug 314288: 201233 | 201254 | 229667