[Try to] Create a place to store applicable rules to this page

pde · pde · commit 35b53047ce66 · 2011-06-23T12:33:04.000-07:00
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -180,7 +180,7 @@ const RuleWriter = {
     try {
       var xmlrules = XML(data);
     } catch(e) { // file has been corrupted; XXX: handle error differently
-      this.log(WARN,"Error in XML file: " + file + "\n" + e);
+      this.log(WARN,"Error in XML file: " + file.path + "\n" + e);
       return null;
     }
 
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -210,6 +210,24 @@ HTTPSEverywhere.prototype = {
     }
   },
 
+  // We use onLocationChange to make a fresh list of rulesets that could have
+  // applied to the content in the current page.  This will be appended to as
+  // various content is embedded / requested by JavaScript
+  onLocationChange: function(wp, req, uri) {
+    this.log(WARN,"onLocationChange");
+    if (wp instanceof CI.nsIWebProgress) {
+      var x = wp.DOMWindow;
+      if (x instanceof CI.nsIDOMWindow) {
+        var top_window = x.top;                        // climb out of iframes
+        top_window.https_everywhere_applicable_rules = {};
+      } else {
+        this.log(WARN,"onLocationChange: no nsIDOMWindow");
+      }
+    } else {
+      this.log(WARN,"onLocationChange: no nsIWebProgress");
+    }
+  },
+
   observe: function(subject, topic, data) {
     // Top level glue for the nsIObserver API
     var channel = subject;
@@ -244,7 +262,8 @@ HTTPSEverywhere.prototype = {
       OS.addObserver(this, "http-on-examine-response", false);
       var dls = CC['@mozilla.org/docloaderservice;1']
         .getService(CI.nsIWebProgress);
-      dls.addProgressListener(this, CI.nsIWebProgress.NOTIFY_STATE_REQUEST);
+      dls.addProgressListener(this, CI.nsIWebProgress.NOTIFY_STATE_REQUEST |
+                                    CI.nsIWebProgress.NOTIFY_LOCATION);
       this.log(INFO,"ChannelReplacement.supported = "+ChannelReplacement.supported);
       try {
         // Firefox >= 4

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ const RuleWriter = {`
`180`	`180`	`try {`
`181`	`181`	`var xmlrules = XML(data);`
`182`	`182`	`} catch(e) { // file has been corrupted; XXX: handle error differently`
`183`		`- this.log(WARN,"Error in XML file: " + file + "\n" + e);`
	`183`	`+ this.log(WARN,"Error in XML file: " + file.path + "\n" + e);`
`184`	`184`	`return null;`
`185`	`185`	`}`
`186`	`186`