Attachment 361797 Details for Bug 194541 – Patch

[patch] Patch

bug-194541-20190212084958.patch (text/plain), 4.71 KB, created by youenn fablet on 2019-02-12 08:50:01 PST

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2019-02-12 08:50:01 PST

Size: 4.71 KB

patch

obsolete

>Subversion Revision: 241264
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index cbd8aee2494cd1f90aa1848f2940208f5e36bc1b..c150fb390a42eb161336221b33e6990bc059d240 100644
>--- 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 NOBODY (OOPS!).
>+
>+        No change of behavior.
>+
>+        * inspector/agents/InspectorNetworkAgent.cpp:
>+        (WebCore::InspectorNetworkAgent::didReceiveResponse):
>+        * loader/SubresourceLoader.h:
>+        (isType):
>+
> 2019-02-11  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] FormattingContext::Geometry::floatingHeightAndMargin should take UsedHorizontalValues
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 5530f165400f3f8e17ba92afe964a0d721d4917a..bf96746c25f9b788abf00d710fbfbe86e9952048 100644
>--- 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 NOBODY (OOPS!).
>+
>+        * WebProcess/Network/WebLoaderStrategy.cpp:
>+        (WebKit::WebLoaderStrategy::scheduleLoadFromNetworkProcess):
>+
> 2019-02-11  Youenn Fablet  <youenn@apple.com>
> 
>         Filter out Overconstrainederror.constraint when getUserMedia is not granted
>diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
>index 866b36d2cf3075bad6bad4205fc718314fb96757..8316756cfde4e7afca49497abd3ef6f2c18b15ac 100644
>--- 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
>index 71fe39207eccb7fe2aa62476790331a79f588851..dec8d0bacccf7b585e8b7d08f7c5bd92d621270c 100644
>--- a/Source/WebCore/loader/SubresourceLoader.h
>+++ b/Source/WebCore/loader/SubresourceLoader.h
>@@ -137,3 +137,7 @@ private:
> };
> 
> }
>+
>+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/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
>index 506d166a15d0e75934d720e7f8de6152b1705d31..7678b0c65c9b53bc5474aa8ba020c267f35719c4 100644
>--- 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();

Actions: View | Formatted Diff | Diff

Attachments on bug 194541: 361797