Changeset 191460 in webkit

Timestamp:

Oct 22, 2015 11:36:01 AM (9 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r191223. rdar://problem/22900764

Location:

branches/safari-601.1.46-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/UserContentController.cpp (modified) (3 diffs)

branches/safari-601.1.46-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-10-20  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r191223. rdar://problem/22900764
+
+    2015-10-16  Alex Christensen  <achristensen@webkit.org>
+
+            Disabled content blockers should not block any loads
+            https://bugs.webkit.org/show_bug.cgi?id=150261
+
+            Reviewed by Brady Eidson.
+
+            This fix was tested manually by reloading without content blockers
+            on websites with iframes and content blockers that block the contents of the iframes.
+
+            * page/UserContentController.cpp:
+            (WebCore::UserContentController::removeAllUserContentExtensions):
+            (WebCore::contentExtensionsEnabled):
+            (WebCore::UserContentController::processContentExtensionRulesForLoad):
+            (WebCore::UserContentController::actionsForResourceLoad):
+            Check the DocumentLoader of the main frame when checking if content extensions are disabled,
+            because that is the DocumentLoader that has the flag from reloading without content blockers.
+
 2015-10-20  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1.46-branch/Source/WebCore/page/UserContentController.cpp

@@ -206 +206 @@
 }
 
+static bool contentExtensionsEnabled(const DocumentLoader& documentLoader)
+{
+    if (auto frame = documentLoader.frame()) {
+        if (frame->isMainFrame())
+            return documentLoader.userContentExtensionsEnabled();
+        if (auto mainDocumentLoader = frame->mainFrame().loader().documentLoader())
+            return mainDocumentLoader->userContentExtensionsEnabled();
+    }
+
+    return true;
+}
+
 void UserContentController::processContentExtensionRulesForLoad(ResourceRequest& request, ResourceType resourceType, DocumentLoader& initiatingDocumentLoader)
 {
@@ -211 +223 @@
         return;
 
-    if (!initiatingDocumentLoader.userContentExtensionsEnabled())
+    if (!contentExtensionsEnabled(initiatingDocumentLoader))
         return;
 
@@ -222 +234 @@
         return Vector<ContentExtensions::Action>();
     
-    if (!initiatingDocumentLoader.userContentExtensionsEnabled())
+    if (!contentExtensionsEnabled(initiatingDocumentLoader))
         return Vector<ContentExtensions::Action>();