383001 - Include a minimal G_TabbedBrowserWatcher at the single place it's actually needed

Status: RESOLVED FIXED

(Toolkit :: Safe Browsing, defect)

Description

[Simon Bünzli]

(From bug 382991 comment #2)
> We could probably inline G_TabbedBrowserWatcher as well since all it does is
> watch for tabswitch (original code did a lot more).

Comment 1

[Simon Bünzli]

Attachment: integrate it where needed

This patch completely integrates those bits of G_TabbedBrowserWatcher which are actually needed at the closest spot where they're needed. Most of this is pretty straight-forward, except for the changes to PROT_BrowserView.prototype.tryToHandleProblemRequest which significantly simplify the code (I've removed four subroutines which AFAICT did several things twice and were more general than actually needed). Please double check that this method still behaves exactly as before.

Comment 2

[Tony Chang (Google)]

Attachment: small bug fixes from previous patch

This is basically the same.  Just some small typo bug fixes.  Manually trying the test page and switching between tabs around seems to work as before.

Comment 3

[Tony Chang (Google)]

on trunk

Checking in browser/components/safebrowsing/content/application.js;
/cvsroot/mozilla/browser/components/safebrowsing/content/application.js,v  <--  application.js
new revision: 1.9; previous revision: 1.8
done
Checking in browser/components/safebrowsing/content/browser-view.js;
/cvsroot/mozilla/browser/components/safebrowsing/content/browser-view.js,v  <--  browser-view.js
new revision: 1.5; previous revision: 1.4
done
Checking in browser/components/safebrowsing/content/controller.js;
/cvsroot/mozilla/browser/components/safebrowsing/content/controller.js,v  <--  controller.js
new revision: 1.9; previous revision: 1.8
done
Checking in browser/components/safebrowsing/content/sb-loader.js;
/cvsroot/mozilla/browser/components/safebrowsing/content/sb-loader.js,v  <--  sb-loader.js
new revision: 1.16; previous revision: 1.15
done
Removing browser/components/safebrowsing/content/moz/tabbedbrowserwatcher.js;
/cvsroot/mozilla/browser/components/safebrowsing/content/moz/tabbedbrowserwatcher.js,v  <--  tabbedbrowserwatcher.js
new revision: delete; previous revision: 1.4
done
Checking in browser/components/safebrowsing/src/nsSafebrowsingApplication.js;
/cvsroot/mozilla/browser/components/safebrowsing/src/nsSafebrowsingApplication.js,v  <--  nsSafebrowsingApplication.js
new revision: 1.7; previous revision: 1.6
done