Merge r241308 - 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):
WebKit · Feb 13, 2019 · 1cd969d · 1cd969d
1 parent a2c8bdd
commit 1cd969d
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 9 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2019-02-12  Youenn Fablet  <youenn@apple.com>
+
+        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  <mark.lam@apple.com>
 
         Add some null checks in JSNodeCustom.h's root() and generated isReachableFromOpaqueRoots() functions.

diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
@@ -500,8 +500,8 @@ void InspectorNetworkAgent::didReceiveResponse(unsigned long identifier, Documen
     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());
 

diff --git a/Source/WebCore/loader/SubresourceLoader.h b/Source/WebCore/loader/SubresourceLoader.h
@@ -137,3 +137,7 @@ class SubresourceLoader final : public ResourceLoader {
 };
 
 }
+
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::SubresourceLoader)
+static bool isType(const WebCore::ResourceLoader& loader) { return loader.isSubresourceLoader(); }
+SPECIALIZE_TYPE_TRAITS_END()
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2019-02-12  Youenn Fablet  <youenn@apple.com>
+
+        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  <achristensen@webkit.org>
 
         WebPage::close needs to remove all message receivers associated with that WebPage, not WebPage::~WebPage

diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
@@ -292,11 +292,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
             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,8 +306,13 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
 
     // 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();