Title: [241308] trunk/Source
- Revision
- 241308
- Author
- [email protected]
- Date
- 2019-02-12 11:53:24 -0800 (Tue, 12 Feb 2019)
Log Message
Make use of is<SubresourceLoader>
https://bugs.webkit.org/show_bug.cgi?id=194541
Reviewed by Alex Christensen.
Source/WebCore:
No change of behavior.
* inspector/agents/InspectorNetworkAgent.cpp:
(WebCore::InspectorNetworkAgent::didReceiveResponse):
* loader/SubresourceLoader.h:
(isType):
Source/WebKit:
* WebProcess/Network/WebLoaderStrategy.cpp:
(WebKit::WebLoaderStrategy::scheduleLoadFromNetworkProcess):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (241307 => 241308)
--- trunk/Source/WebCore/ChangeLog 2019-02-12 19:51:02 UTC (rev 241307)
+++ trunk/Source/WebCore/ChangeLog 2019-02-12 19:53:24 UTC (rev 241308)
@@ -1,3 +1,17 @@
+2019-02-12 Youenn Fablet <[email protected]>
+
+ Make use of is<SubresourceLoader>
+ https://bugs.webkit.org/show_bug.cgi?id=194541
+
+ Reviewed by Alex Christensen.
+
+ No change of behavior.
+
+ * inspector/agents/InspectorNetworkAgent.cpp:
+ (WebCore::InspectorNetworkAgent::didReceiveResponse):
+ * loader/SubresourceLoader.h:
+ (isType):
+
2019-02-12 Mark Lam <[email protected]>
Add some null checks in JSNodeCustom.h's root() and generated isReachableFromOpaqueRoots() functions.
Modified: trunk/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp (241307 => 241308)
--- trunk/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp 2019-02-12 19:51:02 UTC (rev 241307)
+++ trunk/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp 2019-02-12 19:53:24 UTC (rev 241308)
@@ -500,8 +500,8 @@
bool isNotModified = response.httpStatusCode() == 304;
CachedResource* cachedResource = nullptr;
- if (resourceLoader && resourceLoader->isSubresourceLoader() && !isNotModified)
- cachedResource = static_cast<SubresourceLoader*>(resourceLoader)->cachedResource();
+ if (is<SubresourceLoader>(resourceLoader) && !isNotModified)
+ cachedResource = downcast<SubresourceLoader>(resourceLoader)->cachedResource();
if (!cachedResource && loader)
cachedResource = InspectorPageAgent::cachedResource(loader->frame(), response.url());
Modified: trunk/Source/WebCore/loader/SubresourceLoader.h (241307 => 241308)
--- trunk/Source/WebCore/loader/SubresourceLoader.h 2019-02-12 19:51:02 UTC (rev 241307)
+++ trunk/Source/WebCore/loader/SubresourceLoader.h 2019-02-12 19:53:24 UTC (rev 241308)
@@ -137,3 +137,7 @@
};
}
+
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::SubresourceLoader)
+static bool isType(const WebCore::ResourceLoader& loader) { return loader.isSubresourceLoader(); }
+SPECIALIZE_TYPE_TRAITS_END()
Modified: trunk/Source/WebKit/ChangeLog (241307 => 241308)
--- trunk/Source/WebKit/ChangeLog 2019-02-12 19:51:02 UTC (rev 241307)
+++ trunk/Source/WebKit/ChangeLog 2019-02-12 19:53:24 UTC (rev 241308)
@@ -1,3 +1,13 @@
+2019-02-12 Youenn Fablet <[email protected]>
+
+ Make use of is<SubresourceLoader>
+ https://bugs.webkit.org/show_bug.cgi?id=194541
+
+ Reviewed by Alex Christensen.
+
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::scheduleLoadFromNetworkProcess):
+
2019-02-12 Alex Christensen <[email protected]>
WebPage::close needs to remove all message receivers associated with that WebPage, not WebPage::~WebPage
Modified: trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp (241307 => 241308)
--- trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2019-02-12 19:51:02 UTC (rev 241307)
+++ trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2019-02-12 19:53:24 UTC (rev 241308)
@@ -292,11 +292,6 @@
loadParameters.cspResponseHeaders = contentSecurityPolicy->responseHeaders();
}
- if (resourceLoader.isSubresourceLoader()) {
- if (auto* headers = static_cast<SubresourceLoader&>(resourceLoader).originalHeaders())
- loadParameters.originalRequestHeaders = *headers;
- }
-
#if ENABLE(CONTENT_EXTENSIONS)
if (document) {
loadParameters.mainDocumentURL = document->topDocument().url();
@@ -311,9 +306,14 @@
// FIXME: All loaders should provide their origin if navigation mode is cors/no-cors/same-origin.
// As a temporary approach, we use the document origin if available or the HTTP Origin header otherwise.
- if (resourceLoader.isSubresourceLoader())
- loadParameters.sourceOrigin = static_cast<SubresourceLoader&>(resourceLoader).origin();
+ if (is<SubresourceLoader>(resourceLoader)) {
+ auto& loader = downcast<SubresourceLoader>(resourceLoader);
+ loadParameters.sourceOrigin = loader.origin();
+ if (auto* headers = loader.originalHeaders())
+ loadParameters.originalRequestHeaders = *headers;
+ }
+
if (!loadParameters.sourceOrigin && document)
loadParameters.sourceOrigin = &document->securityOrigin();
if (!loadParameters.sourceOrigin) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes