Issue 4199 - Track Safari tabs properly in Content Blocking mode

safari/ext/content.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 60 matching lines @@
   // We must notify the background page when this page is first loadeding (now)
   // but also when it is re-shown (if the user uses the back button to return to
   // this page in the future).
   notifyFrameLoading();
   window.addEventListener("pageshow", function(event)
   {
     if (event.persisted)
       notifyFrameLoading();
   });
 
-  if (!usingContentBlockerAPI)
+  // Notify the background page when a prerendered page is displayed. That way
+  // the existing page of the tab can be replaced with this new one.
+  if (isTopLevel && isPrerendered)
   {
-    // Notify the background page when a prerendered page is displayed. That way
-    // the existing page of the tab can be replaced with this new one.
-    if (isTopLevel && isPrerendered)
+    var onVisibilitychange = function()
     {
-      var onVisibilitychange = function()
-      {
-        safari.self.tab.dispatchMessage("replaced", {documentId: documentId});
-        document.removeEventListener("visibilitychange", onVisibilitychange);
-      };
-      document.addEventListener("visibilitychange", onVisibilitychange);
-    }
+      safari.self.tab.dispatchMessage("replaced", {documentId: documentId});
+      document.removeEventListener("visibilitychange", onVisibilitychange);
+    };
+    document.addEventListener("visibilitychange", onVisibilitychange);
+  }
 
   /* Web requests */
 
+  if (!usingContentBlockerAPI)
+  {
     document.addEventListener("beforeload", function(event)
     {
       // we don't block non-HTTP requests anyway, so we can bail out
       // without asking the background page. This is even necessary
       // because passing large data (like a photo encoded as data: URL)
       // to the background page, freezes Safari.
       if (/^(?!https?:)[\w-]+:/.test(event.url))
         return;
 
       var type = "OTHER";
@@ skipping 116 matching lines @@
   });
 
 
   /* Detecting extension reload/disable/uninstall (not supported on Safari) */
 
   ext.onExtensionUnloaded = {
     addListener: function() {},
     removeListener: function() {}
   };
 })();