Changeset 181883 in webkit

Timestamp:

Mar 23, 2015, 6:01:55 PM (10 years ago)

Author:

achristensen@apple.com

Message:

Fix api tests after r181876.

• contentextensions/ContentExtensionsBackend.cpp:

(WebCore::ContentExtensions::ContentExtensionsBackend::actionsForResourceLoad):
Always append a CSSDisplayNoneStyleSheet action if no ignore-previous-rules is seen.

• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::requestResource):
Changed an assertion to a null check.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• contentextensions/ContentExtensionsBackend.cpp (modified) (1 diff)
• loader/cache/CachedResourceLoader.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-23  Alex Christensen  <achristensen@webkit.org>
+
+        Fix api tests after r181876.
+
+        * contentextensions/ContentExtensionsBackend.cpp:
+        (WebCore::ContentExtensions::ContentExtensionsBackend::actionsForResourceLoad):
+        Always append a CSSDisplayNoneStyleSheet action if no ignore-previous-rules is seen.
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::requestResource):
+        Changed an assertion to a null check.
+
 2015-03-23  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp

@@ -100 +100 @@
             }
 
-            if (!sawIgnorePreviousRules && contentExtension->globalDisplayNoneStyleSheet())
+            if (!sawIgnorePreviousRules)
                 finalActions.append(Action(ActionType::CSSDisplayNoneStyleSheet, contentExtension->identifier()));
         }

trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -539 +539 @@
         case ContentExtensions::ActionType::CSSDisplayNoneStyleSheet: {
             StyleSheetContents* styleSheetContents = userContentController->globalDisplayNoneStyleSheet(action.stringArgument());
-            RELEASE_ASSERT(styleSheetContents);
-
-            if (type == CachedResource::MainResource && request.initiatingDocumentLoader())
-                request.initiatingDocumentLoader()->addPendingContentExtensionSheet(action.stringArgument(), *styleSheetContents);
-            else if (m_document)
-                m_document->styleSheetCollection().maybeAddContentExtensionSheet(action.stringArgument(), *styleSheetContents);
-
+            if (styleSheetContents) {
+                if (type == CachedResource::MainResource && request.initiatingDocumentLoader())
+                    request.initiatingDocumentLoader()->addPendingContentExtensionSheet(action.stringArgument(), *styleSheetContents);
+                else if (m_document)
+                    m_document->styleSheetCollection().maybeAddContentExtensionSheet(action.stringArgument(), *styleSheetContents);
+            }
             break;
         }