Attachment 368319 Details for Bug 197165 – Patch

[patch] Patch

bug-197165-20190426085352.patch (text/plain), 19.31 KB, created by Alex Christensen on 2019-04-26 08:53:54 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-04-26 08:53:54 PDT

Size: 19.31 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 244663)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,51 @@
>+2019-04-25  Alex Christensen  <achristensen@webkit.org>
>+
>+        Add ENABLE(CONTENT_EXTENSIONS) and namespace ContentExtensions to ResourceLoadInfo.h
>+        https://bugs.webkit.org/show_bug.cgi?id=197165
>+
>+        Reviewed by Youenn Fablet.
>+
>+        No change in behavior.  This will just make it harder for people working on the loader to mistake
>+        these ContentExtension specific structures for other structures general to loading.
>+        One such mistake was made in r244248.
>+
>+        * Modules/websockets/WebSocketChannel.cpp:
>+        (WebCore::WebSocketChannel::connect):
>+        * contentextensions/ContentExtensionsBackend.h:
>+        * css/StyleSheetContents.cpp:
>+        (WebCore::StyleSheetContents::subresourcesAllowReuse const):
>+        * html/HTMLMediaElement.cpp:
>+        (WebCore::HTMLMediaElement::loadResource):
>+        * loader/FrameLoader.cpp:
>+        (WebCore::FrameLoader::loadResourceSynchronously):
>+        * loader/NetscapePlugInStreamLoader.cpp:
>+        (WebCore::NetscapePlugInStreamLoader::NetscapePlugInStreamLoader):
>+        * loader/PingLoader.cpp:
>+        (WebCore::processContentRuleListsForLoad):
>+        (WebCore::PingLoader::loadImage):
>+        (WebCore::PingLoader::sendPing):
>+        (WebCore::PingLoader::sendViolationReport):
>+        * loader/ResourceLoadInfo.cpp:
>+        (WebCore::toResourceType): Deleted.
>+        (WebCore::readResourceType): Deleted.
>+        (WebCore::readLoadType): Deleted.
>+        (WebCore::ResourceLoadInfo::isThirdParty const): Deleted.
>+        (WebCore::ResourceLoadInfo::getResourceFlags const): Deleted.
>+        * loader/ResourceLoadInfo.h:
>+        * loader/ResourceLoader.cpp:
>+        (WebCore::ResourceLoader::willSendRequestInternal):
>+        * loader/ResourceLoader.h:
>+        * loader/SubresourceLoader.cpp:
>+        (WebCore::SubresourceLoader::SubresourceLoader):
>+        * loader/cache/CachedResourceLoader.cpp:
>+        (WebCore::CachedResourceLoader::requestResource):
>+        * page/DOMWindow.cpp:
>+        (WebCore::DOMWindow::open):
>+        * page/UserContentProvider.cpp:
>+        (WebCore::UserContentProvider::processContentRuleListsForLoad):
>+        (WebCore::UserContentProvider::actionsForResourceLoad):
>+        * page/UserContentProvider.h:
>+
> 2019-04-25  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix more Windows builds after r244653
>Index: Source/WebCore/Modules/websockets/WebSocketChannel.cpp
>===================================================================
>--- Source/WebCore/Modules/websockets/WebSocketChannel.cpp	(revision 244662)
>+++ Source/WebCore/Modules/websockets/WebSocketChannel.cpp	(working copy)
>@@ -89,7 +89,7 @@ void WebSocketChannel::connect(const URL
> #if ENABLE(CONTENT_EXTENSIONS)
>     if (auto* page = m_document->page()) {
>         if (auto* documentLoader = m_document->loader()) {
>-            auto results = page->userContentProvider().processContentRuleListsForLoad(url, ResourceType::Raw, *documentLoader);
>+            auto results = page->userContentProvider().processContentRuleListsForLoad(url, ContentExtensions::ResourceType::Raw, *documentLoader);
>             if (results.summary.blockedLoad) {
>                 Ref<WebSocketChannel> protectedThis(*this);
>                 callOnMainThread([protectedThis = WTFMove(protectedThis)] {
>Index: Source/WebCore/contentextensions/ContentExtensionsBackend.h
>===================================================================
>--- Source/WebCore/contentextensions/ContentExtensionsBackend.h	(revision 244662)
>+++ Source/WebCore/contentextensions/ContentExtensionsBackend.h	(working copy)
>@@ -38,11 +38,10 @@ namespace WebCore {
> class DocumentLoader;
> class ResourceRequest;
> 
>-struct ResourceLoadInfo;
>-
> namespace ContentExtensions {
> 
> class CompiledContentExtension;
>+struct ResourceLoadInfo;
> 
> // The ContentExtensionsBackend is the internal model of all the content extensions.
> //
>Index: Source/WebCore/css/StyleSheetContents.cpp
>===================================================================
>--- Source/WebCore/css/StyleSheetContents.cpp	(revision 244662)
>+++ Source/WebCore/css/StyleSheetContents.cpp	(working copy)
>@@ -512,7 +512,7 @@ bool StyleSheetContents::subresourcesAll
>         auto* documentLoader = loader.documentLoader();
>         if (page && documentLoader) {
>             const auto& request = resource.resourceRequest();
>-            auto results = page->userContentProvider().processContentRuleListsForLoad(request.url(), toResourceType(resource.type()), *documentLoader);
>+            auto results = page->userContentProvider().processContentRuleListsForLoad(request.url(), ContentExtensions::toResourceType(resource.type()), *documentLoader);
>             if (results.summary.blockedLoad || results.summary.madeHTTPS)
>                 return true;
>         }
>Index: Source/WebCore/dom/ExtensionStyleSheets.cpp
>===================================================================
>--- Source/WebCore/dom/ExtensionStyleSheets.cpp	(revision 244662)
>+++ Source/WebCore/dom/ExtensionStyleSheets.cpp	(working copy)
>@@ -47,7 +47,9 @@
> 
> namespace WebCore {
> 
>+#if ENABLE(CONTENT_EXTENSIONS)
> using namespace ContentExtensions;
>+#endif
> using namespace HTMLNames;
> 
> ExtensionStyleSheets::ExtensionStyleSheets(Document& document)
>Index: Source/WebCore/html/HTMLMediaElement.cpp
>===================================================================
>--- Source/WebCore/html/HTMLMediaElement.cpp	(revision 244662)
>+++ Source/WebCore/html/HTMLMediaElement.cpp	(working copy)
>@@ -1521,7 +1521,7 @@ void HTMLMediaElement::loadResource(cons
> 
> #if ENABLE(CONTENT_EXTENSIONS)
>     if (auto documentLoader = makeRefPtr(frame->loader().documentLoader())) {
>-        if (page->userContentProvider().processContentRuleListsForLoad(url, ResourceType::Media, *documentLoader).summary.blockedLoad) {
>+        if (page->userContentProvider().processContentRuleListsForLoad(url, ContentExtensions::ResourceType::Media, *documentLoader).summary.blockedLoad) {
>             mediaLoadingFailed(MediaPlayer::FormatError);
>             return;
>         }
>Index: Source/WebCore/loader/FrameLoader.cpp
>===================================================================
>--- Source/WebCore/loader/FrameLoader.cpp	(revision 244662)
>+++ Source/WebCore/loader/FrameLoader.cpp	(working copy)
>@@ -3069,7 +3069,7 @@ unsigned long FrameLoader::loadResourceS
>     if (error.isNull()) {
>         if (auto* page = m_frame.page()) {
>             if (m_documentLoader) {
>-                auto results = page->userContentProvider().processContentRuleListsForLoad(newRequest.url(), ResourceType::Raw, *m_documentLoader);
>+                auto results = page->userContentProvider().processContentRuleListsForLoad(newRequest.url(), ContentExtensions::ResourceType::Raw, *m_documentLoader);
>                 bool blockedLoad = results.summary.blockedLoad;
>                 ContentExtensions::applyResultsToRequest(WTFMove(results), page, newRequest);
>                 if (blockedLoad) {
>Index: Source/WebCore/loader/NetscapePlugInStreamLoader.cpp
>===================================================================
>--- Source/WebCore/loader/NetscapePlugInStreamLoader.cpp	(revision 244662)
>+++ Source/WebCore/loader/NetscapePlugInStreamLoader.cpp	(working copy)
>@@ -60,7 +60,7 @@ NetscapePlugInStreamLoader::NetscapePlug
>     , m_client(&client)
> {
> #if ENABLE(CONTENT_EXTENSIONS)
>-    m_resourceType = ResourceType::PlugInStream;
>+    m_resourceType = ContentExtensions::ResourceType::PlugInStream;
> #endif
> }
> 
>Index: Source/WebCore/loader/PingLoader.cpp
>===================================================================
>--- Source/WebCore/loader/PingLoader.cpp	(revision 244662)
>+++ Source/WebCore/loader/PingLoader.cpp	(working copy)
>@@ -57,18 +57,10 @@
> 
> namespace WebCore {
> 
>-#if !ENABLE(CONTENT_EXTENSIONS)
>+#if ENABLE(CONTENT_EXTENSIONS)
> 
> // Returns true if we should block the load.
>-static inline bool processContentRuleListsForLoad(const Frame&, ResourceRequest&, ResourceType)
>-{
>-    return false;
>-}
>-
>-#else
>-
>-// Returns true if we should block the load.
>-static bool processContentRuleListsForLoad(const Frame& frame, ResourceRequest& request, ResourceType resourceType)
>+static bool processContentRuleListsForLoad(const Frame& frame, ResourceRequest& request, ContentExtensions::ResourceType resourceType)
> {
>     auto* documentLoader = frame.loader().documentLoader();
>     if (!documentLoader)
>@@ -95,8 +87,10 @@ void PingLoader::loadImage(Frame& frame,
>     }
> 
>     ResourceRequest request(url);
>-    if (processContentRuleListsForLoad(frame, request, ResourceType::Image))
>+#if ENABLE(CONTENT_EXTENSIONS)
>+    if (processContentRuleListsForLoad(frame, request, ContentExtensions::ResourceType::Image))
>         return;
>+#endif
> 
>     document.contentSecurityPolicy()->upgradeInsecureRequestIfNeeded(request, ContentSecurityPolicy::InsecureRequestType::Load);
> 
>@@ -121,8 +115,10 @@ void PingLoader::sendPing(Frame& frame, 
>         return;
> 
>     ResourceRequest request(pingURL);
>-    if (processContentRuleListsForLoad(frame, request, ResourceType::Raw))
>+#if ENABLE(CONTENT_EXTENSIONS)
>+    if (processContentRuleListsForLoad(frame, request, ContentExtensions::ResourceType::Raw))
>         return;
>+#endif
> 
>     auto& document = *frame.document();
>     document.contentSecurityPolicy()->upgradeInsecureRequestIfNeeded(request, ContentSecurityPolicy::InsecureRequestType::Load);
>@@ -156,8 +152,10 @@ void PingLoader::sendViolationReport(Fra
>     ASSERT(frame.document());
> 
>     ResourceRequest request(reportURL);
>-    if (processContentRuleListsForLoad(frame, request, ResourceType::Raw))
>+#if ENABLE(CONTENT_EXTENSIONS)
>+    if (processContentRuleListsForLoad(frame, request, ContentExtensions::ResourceType::Raw))
>         return;
>+#endif
> 
>     auto& document = *frame.document();
>     document.contentSecurityPolicy()->upgradeInsecureRequestIfNeeded(request, ContentSecurityPolicy::InsecureRequestType::Load);
>Index: Source/WebCore/loader/ResourceLoadInfo.cpp
>===================================================================
>--- Source/WebCore/loader/ResourceLoadInfo.cpp	(revision 244662)
>+++ Source/WebCore/loader/ResourceLoadInfo.cpp	(working copy)
>@@ -29,7 +29,10 @@
> #include "ContentExtensionActions.h"
> #include "SecurityOrigin.h"
> 
>+#if ENABLE(CONTENT_EXTENSIONS)
>+
> namespace WebCore {
>+namespace ContentExtensions {
> 
> ResourceType toResourceType(CachedResource::Type type)
> {
>@@ -127,4 +130,7 @@ ResourceFlags ResourceLoadInfo::getResou
>     return flags;
> }
> 
>+} // namespace ContentExtensions
> } // namespace WebCore
>+
>+#endif // ENABLE(CONTENT_EXTENSIONS)
>Index: Source/WebCore/loader/ResourceLoadInfo.h
>===================================================================
>--- Source/WebCore/loader/ResourceLoadInfo.h	(revision 244662)
>+++ Source/WebCore/loader/ResourceLoadInfo.h	(working copy)
>@@ -25,10 +25,13 @@
> 
> #pragma once
> 
>+#if ENABLE(CONTENT_EXTENSIONS)
>+
> #include "CachedResource.h"
> #include <wtf/URL.h>
> 
> namespace WebCore {
>+namespace ContentExtensions {
> 
> enum class ResourceType : uint16_t {
>     Invalid = 0x0000,
>@@ -77,4 +80,7 @@ struct ResourceLoadInfo {
>     ResourceFlags getResourceFlags() const;
> };
> 
>+} // namespace ContentExtensions
> } // namespace WebCore
>+
>+#endif
>Index: Source/WebCore/loader/ResourceLoader.cpp
>===================================================================
>--- Source/WebCore/loader/ResourceLoader.cpp	(revision 244662)
>+++ Source/WebCore/loader/ResourceLoader.cpp	(working copy)
>@@ -342,7 +342,7 @@ void ResourceLoader::willSendRequestInte
> 
>     ASSERT(!m_reachedTerminalState);
> #if ENABLE(CONTENT_EXTENSIONS)
>-    ASSERT(m_resourceType != ResourceType::Invalid);
>+    ASSERT(m_resourceType != ContentExtensions::ResourceType::Invalid);
> #endif
> 
>     // We need a resource identifier for all requests, even if FrameLoader is never going to see it (such as with CORS preflight requests).
>Index: Source/WebCore/loader/ResourceLoader.h
>===================================================================
>--- Source/WebCore/loader/ResourceLoader.h	(revision 244662)
>+++ Source/WebCore/loader/ResourceLoader.h	(working copy)
>@@ -244,7 +244,7 @@ private:
> 
> #if ENABLE(CONTENT_EXTENSIONS)
> protected:
>-    ResourceType m_resourceType { ResourceType::Invalid };
>+    ContentExtensions::ResourceType m_resourceType { ContentExtensions::ResourceType::Invalid };
> #endif
> };
> 
>Index: Source/WebCore/loader/SubresourceLoader.cpp
>===================================================================
>--- Source/WebCore/loader/SubresourceLoader.cpp	(revision 244662)
>+++ Source/WebCore/loader/SubresourceLoader.cpp	(working copy)
>@@ -98,7 +98,7 @@ SubresourceLoader::SubresourceLoader(Fra
>     subresourceLoaderCounter.increment();
> #endif
> #if ENABLE(CONTENT_EXTENSIONS)
>-    m_resourceType = toResourceType(resource.type());
>+    m_resourceType = ContentExtensions::toResourceType(resource.type());
> #endif
>     m_canCrossOriginRequestsAskUserForCredentials = resource.type() == CachedResource::Type::MainResource || frame.settings().allowCrossOriginSubresourcesToAskForCredentials();
> }
>Index: Source/WebCore/loader/cache/CachedResourceLoader.cpp
>===================================================================
>--- Source/WebCore/loader/cache/CachedResourceLoader.cpp	(revision 244662)
>+++ Source/WebCore/loader/cache/CachedResourceLoader.cpp	(working copy)
>@@ -809,7 +809,7 @@ ResourceErrorOr<CachedResourceHandle<Cac
>     if (frame() && frame()->page() && m_documentLoader) {
>         const auto& resourceRequest = request.resourceRequest();
>         auto* page = frame()->page();
>-        auto results = page->userContentProvider().processContentRuleListsForLoad(resourceRequest.url(), toResourceType(type), *m_documentLoader);
>+        auto results = page->userContentProvider().processContentRuleListsForLoad(resourceRequest.url(), ContentExtensions::toResourceType(type), *m_documentLoader);
>         bool blockedLoad = results.summary.blockedLoad;
>         bool madeHTTPS = results.summary.madeHTTPS;
>         request.applyResults(WTFMove(results), page);
>Index: Source/WebCore/page/DOMWindow.cpp
>===================================================================
>--- Source/WebCore/page/DOMWindow.cpp	(revision 244662)
>+++ Source/WebCore/page/DOMWindow.cpp	(working copy)
>@@ -2357,7 +2357,7 @@ ExceptionOr<RefPtr<WindowProxy>> DOMWind
>         && firstFrame->page()
>         && firstFrame->mainFrame().document()
>         && firstFrame->mainFrame().document()->loader()) {
>-        auto results = firstFrame->page()->userContentProvider().processContentRuleListsForLoad(firstFrame->document()->completeURL(urlString), ResourceType::Popup, *firstFrame->mainFrame().document()->loader());
>+        auto results = firstFrame->page()->userContentProvider().processContentRuleListsForLoad(firstFrame->document()->completeURL(urlString), ContentExtensions::ResourceType::Popup, *firstFrame->mainFrame().document()->loader());
>         if (results.summary.blockedLoad)
>             return RefPtr<WindowProxy> { nullptr };
>     }
>Index: Source/WebCore/page/UserContentProvider.cpp
>===================================================================
>--- Source/WebCore/page/UserContentProvider.cpp	(revision 244662)
>+++ Source/WebCore/page/UserContentProvider.cpp	(working copy)
>@@ -102,7 +102,7 @@ static bool contentExtensionsEnabled(con
>     return true;
> }
>     
>-ContentRuleListResults UserContentProvider::processContentRuleListsForLoad(const URL& url, ResourceType resourceType, DocumentLoader& initiatingDocumentLoader)
>+ContentRuleListResults UserContentProvider::processContentRuleListsForLoad(const URL& url, ContentExtensions::ResourceType resourceType, DocumentLoader& initiatingDocumentLoader)
> {
>     if (!contentExtensionsEnabled(initiatingDocumentLoader))
>         return { };
>@@ -110,7 +110,7 @@ ContentRuleListResults UserContentProvid
>     return userContentExtensionBackend().processContentRuleListsForLoad(url, resourceType, initiatingDocumentLoader);
> }
> 
>-Vector<ContentExtensions::ActionsFromContentRuleList> UserContentProvider::actionsForResourceLoad(const ResourceLoadInfo& resourceLoadInfo, DocumentLoader& initiatingDocumentLoader)
>+Vector<ContentExtensions::ActionsFromContentRuleList> UserContentProvider::actionsForResourceLoad(const ContentExtensions::ResourceLoadInfo& resourceLoadInfo, DocumentLoader& initiatingDocumentLoader)
> {
>     if (!contentExtensionsEnabled(initiatingDocumentLoader))
>         return { };
>Index: Source/WebCore/page/UserContentProvider.h
>===================================================================
>--- Source/WebCore/page/UserContentProvider.h	(revision 244662)
>+++ Source/WebCore/page/UserContentProvider.h	(working copy)
>@@ -46,14 +46,13 @@ class UserMessageHandlerDescriptor;
> class UserScript;
> class UserStyleSheet;
> 
>-enum class ResourceType : uint16_t;
>-
>-struct ResourceLoadInfo;
>-
>+#if ENABLE(CONTENT_EXTENSIONS)
> namespace ContentExtensions {
> class ContentExtensionsBackend;
>-struct Action;
>+enum class ResourceType : uint16_t;
>+struct ResourceLoadInfo;
> }
>+#endif
> 
> class UserContentProvider;
> 
>@@ -89,8 +88,8 @@ public:
> #if ENABLE(CONTENT_EXTENSIONS)
>     // FIXME: These don't really belong here. They should probably bundled up in the ContentExtensionsBackend
>     // which should always exist.
>-    ContentRuleListResults processContentRuleListsForLoad(const URL&, ResourceType, DocumentLoader& initiatingDocumentLoader);
>-    Vector<ContentExtensions::ActionsFromContentRuleList> actionsForResourceLoad(const ResourceLoadInfo&, DocumentLoader& initiatingDocumentLoader);
>+    ContentRuleListResults processContentRuleListsForLoad(const URL&, ContentExtensions::ResourceType, DocumentLoader& initiatingDocumentLoader);
>+    Vector<ContentExtensions::ActionsFromContentRuleList> actionsForResourceLoad(const ContentExtensions::ResourceLoadInfo&, DocumentLoader& initiatingDocumentLoader);
>     WEBCORE_EXPORT void forEachContentExtension(const Function<void(const String&, ContentExtensions::ContentExtension&)>&, DocumentLoader& initiatingDocumentLoader);
> #endif
> 
>Index: Source/WebCore/style/StyleScope.cpp
>===================================================================
>--- Source/WebCore/style/StyleScope.cpp	(revision 244662)
>+++ Source/WebCore/style/StyleScope.cpp	(working copy)
>@@ -54,7 +54,6 @@
> 
> namespace WebCore {
> 
>-using namespace ContentExtensions;
> using namespace HTMLNames;
> 
> namespace Style {
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 244662)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2019-04-25  Alex Christensen  <achristensen@webkit.org>
>+
>+        Add ENABLE(CONTENT_EXTENSIONS) and namespace ContentExtensions to ResourceLoadInfo.h
>+        https://bugs.webkit.org/show_bug.cgi?id=197165
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
>+
> 2019-04-25  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix test-webkitpy after r244653
>Index: Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp	(revision 244662)
>+++ Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp	(working copy)
>@@ -67,9 +67,9 @@ inline std::ostream& operator<<(std::ost
> }
> }
> 
>-using namespace WebCore;
>-
> namespace TestWebKitAPI {
>+using namespace WebCore;
>+using namespace WebCore::ContentExtensions;
> 
> class ContentExtensionTest : public testing::Test {
> public:

Flags:

commit-queue: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 197165: 367948 | 367950 | 367963 | 367992 | 368300 | 368319