Attachment #201254: Patch rv2.0 for bug #314288

View | Details | Raw Unified | Return to bug 314288
Collapse All | Expand All

(-)toolkit/content/widgets/browser.xml (-6 / +17 lines)
Line     Link Here 
 Lines 238-265    Link Here 
238
        <![CDATA[
238
        <![CDATA[
239
          if (!this._webBrowserFind)
239
          if (!this._webBrowserFind)
240
            this._webBrowserFind = this.docShell.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIWebBrowserFind);
240
            this._webBrowserFind = this.docShell.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIWebBrowserFind);
241
          return this._webBrowserFind;
241
          return this._webBrowserFind;
242
        ]]>
242
        ]]>
243
        </getter>
243
        </getter>
244
      </property>
244
      </property>
245
245
246
      <method name="getTabBrowser">
247
        <body>
248
          <![CDATA[
249
            var tabBrowser = this.parentNode;
250
            while (tabBrowser && tabBrowser.localName != "tabbrowser")
251
              tabBrowser = tabBrowser.parentNode;
252
            return tabBrowser;
253
          ]]>
254
        </body>
255
      </method>
256
246
      <field name="_fastFind">null</field>
257
      <field name="_fastFind">null</field>
247
      <property name="fastFind"
258
      <property name="fastFind"
248
                readonly="true">
259
                readonly="true">
249
        <getter>
260
        <getter>
250
        <![CDATA[
261
        <![CDATA[
251
          if (!this._fastFind) {
262
          if (!this._fastFind) {
252
            var n = this.parentNode;
263
            var tabBrowser = this.getTabBrowser();
253
            while (n && n.localName != "tabbrowser")
264
            if (tabBrowser && tabBrowser.mCurrentBrowser == this)
254
              n = n.parentNode;
265
              return this._fastFind = tabBrowser.fastFind;
255
256
            if (n && n.mCurrentBrowser == this)
257
              return this._fastFind = n.fastFind
258
266
259
            this._fastFind = Components.classes["@mozilla.org/typeaheadfind;1"]
267
            this._fastFind = Components.classes["@mozilla.org/typeaheadfind;1"]
260
                                       .createInstance(Components.interfaces.nsITypeAheadFind);                                
268
                                       .createInstance(Components.interfaces.nsITypeAheadFind);                                
261
            this._fastFind.init(this.docShell);
269
            this._fastFind.init(this.docShell);
262
          }
270
          }
263
          return this._fastFind;
271
          return this._fastFind;
264
        ]]>
272
        ]]>
265
        </getter>
273
        </getter>
 Lines 437-452    Link Here 
437
      <method name="onPageHide">
445
      <method name="onPageHide">
438
        <parameter name="aEvent"/>
446
        <parameter name="aEvent"/>
439
        <body>
447
        <body>
440
          <![CDATA[
448
          <![CDATA[
441
            if (this.pageReport) {
449
            if (this.pageReport) {
442
              this.pageReport = null;
450
              this.pageReport = null;
443
              this.updatePageReport();
451
              this.updatePageReport();
444
            }
452
            }
453
            var tabBrowser = this.getTabBrowser();
454
            if (!tabBrowser || tabBrowser.mCurrentBrowser == this)
455
              this.fastFind.setDocShell(this.docShell);
445
         ]]>
456
         ]]>
446
        </body>
457
        </body>
447
      </method>
458
      </method>
448
459
449
      <method name="updatePageReport">
460
      <method name="updatePageReport">
450
        <body>
461
        <body>
451
          <![CDATA[
462
          <![CDATA[
452
            var n = this.parentNode;
463
            var n = this.parentNode;

Return to bug 314288