Title: [181883] trunk/Source/WebCore
- Revision
- 181883
- Author
- [email protected]
- Date
- 2015-03-23 18:01:55 -0700 (Mon, 23 Mar 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (181882 => 181883)
--- trunk/Source/WebCore/ChangeLog 2015-03-24 00:44:22 UTC (rev 181882)
+++ trunk/Source/WebCore/ChangeLog 2015-03-24 01:01:55 UTC (rev 181883)
@@ -1,3 +1,14 @@
+2015-03-23 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
Timelines are sharing the same canvas background
Modified: trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp (181882 => 181883)
--- trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2015-03-24 00:44:22 UTC (rev 181882)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2015-03-24 01:01:55 UTC (rev 181883)
@@ -99,7 +99,7 @@
finalActions.append(action);
}
- if (!sawIgnorePreviousRules && contentExtension->globalDisplayNoneStyleSheet())
+ if (!sawIgnorePreviousRules)
finalActions.append(Action(ActionType::CSSDisplayNoneStyleSheet, contentExtension->identifier()));
}
}
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (181882 => 181883)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-03-24 00:44:22 UTC (rev 181882)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-03-24 01:01:55 UTC (rev 181883)
@@ -538,13 +538,12 @@
break;
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;
}
case ContentExtensions::ActionType::IgnorePreviousRules:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
