Attachment 365697 Details for Bug 195623 – Patch

[patch] Patch

bug-195623-20190322100735.patch (text/plain), 27.64 KB, created by Rob Buis on 2019-03-22 02:07:38 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2019-03-22 02:07:38 PDT

Size: 27.64 KB

patch

obsolete

>Subversion Revision: 243291
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 5796158bc2dada22b39f9112d32b9c98872851f7..ec8fe497d2c61783f73e41937d12fe593924a6cf 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,25 @@
>+2019-03-21  Rob Buis  <rbuis@igalia.com>
>+
>+        Link prefetch not useful for top-level navigation
>+        https://bugs.webkit.org/show_bug.cgi?id=195623
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Cache top-level prefetches in a dedicated cache. Ignore prefetches
>+        for content extension checks.
>+
>+        Test: http/tests/cache/link-prefetch-main-resource.php
>+
>+        * loader/LinkLoader.cpp:
>+        (WebCore::LinkLoader::prefetchIfNeeded):
>+        * loader/ResourceLoadInfo.cpp:
>+        (WebCore::toResourceType):
>+        * loader/ResourceLoadInfo.h:
>+        * loader/ResourceLoader.cpp:
>+        (WebCore::ResourceLoader::willSendRequestInternal):
>+        * loader/cache/CachedResourceLoader.cpp:
>+        (WebCore::CachedResourceLoader::requestResource):
>+
> 2019-03-21  Cathie Chen  <cathiechen@igalia.com>
> 
>         Fixed ContentChangeObserver build error.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index a11b8800b2a5a029151a7e5687d13b667b358cae..93722c95ed4e09cda88c9f5780e05ffa06e0e5ca 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,37 @@
>+2019-03-21  Rob Buis  <rbuis@igalia.com>
>+
>+        Link prefetch not useful for top-level navigation
>+        https://bugs.webkit.org/show_bug.cgi?id=195623
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Cache top-level prefetches in a dedicated cache. When a navigation
>+        to the same url is done within a threshold (5 seconds), reuse the
>+        prefetch cache entry, move it to the disk cache and navigate to
>+        the url, meaning no extra network trip is needed. When not used within
>+        the threshold period, the prefetch entry will be erased using a timer.
>+
>+        * NetworkProcess/NetworkProcess.h:
>+        (WebKit::NetworkProcess::prefetchCache):
>+        * NetworkProcess/NetworkResourceLoader.cpp:
>+        (WebKit::NetworkResourceLoader::retrieveCacheEntry):
>+        (WebKit::NetworkResourceLoader::willSendRedirectedRequest):
>+        (WebKit::NetworkResourceLoader::tryStoreAsCacheEntry):
>+        * NetworkProcess/cache/PrefetchCache.cpp: Added.
>+        (WebKit::PrefetchEntry::PrefetchEntry):
>+        (WebKit::PrefetchCache::PrefetchCache):
>+        (WebKit::PrefetchCache::take):
>+        (WebKit::PrefetchCache::store):
>+        (WebKit::PrefetchCache::sessionPrefetchMap const):
>+        (WebKit::PrefetchCache::ensureSessionPrefetchMap):
>+        (WebKit::PrefetchCache::expiration):
>+        * NetworkProcess/cache/PrefetchCache.h: Added.
>+        (WebKit::PrefetchEntry::response const):
>+        (WebKit::PrefetchEntry::releaseBuffer const):
>+        * Shared/WebPreferences.yaml:
>+        * Sources.txt:
>+        * WebKit.xcodeproj/project.pbxproj:
>+
> 2019-03-21  Brent Fulgham  <bfulgham@apple.com>
> 
>         Fix possible memory leak when dismissing a color picker
>diff --git a/Source/WebCore/loader/LinkLoader.cpp b/Source/WebCore/loader/LinkLoader.cpp
>index 9f55ae8a325b7e3ff315a4616a5415e91b716477..63b6ce76b6ab0ef81b82aa73a132b2a25815212b 100644
>--- a/Source/WebCore/loader/LinkLoader.cpp
>+++ b/Source/WebCore/loader/LinkLoader.cpp
>@@ -278,6 +278,11 @@ void LinkLoader::prefetchIfNeeded(const LinkRelAttribute& relAttribute, const UR
>     }
>     ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
>     options.contentSecurityPolicyImposition = ContentSecurityPolicyImposition::SkipPolicyCheck;
>+    options.certificateInfoPolicy = CertificateInfoPolicy::IncludeCertificateInfo;
>+    options.credentials = FetchOptions::Credentials::Omit;
>+    options.redirect = FetchOptions::Redirect::Manual;
>+    options.mode = FetchOptions::Mode::Cors;
>+    options.serviceWorkersMode = ServiceWorkersMode::None;
>     m_cachedLinkResource = document.cachedResourceLoader().requestLinkResource(type, CachedResourceRequest(ResourceRequest(document.completeURL(href)), options, priority)).value_or(nullptr);
>     if (m_cachedLinkResource)
>         m_cachedLinkResource->addClient(*this);
>diff --git a/Source/WebCore/loader/ResourceLoadInfo.cpp b/Source/WebCore/loader/ResourceLoadInfo.cpp
>index 9d92dba8c0184cd85b6d214888f1234f13cf4586..8b74ed5af697e75d4a54f05d451aa436b73d91be 100644
>--- a/Source/WebCore/loader/ResourceLoadInfo.cpp
>+++ b/Source/WebCore/loader/ResourceLoadInfo.cpp
>@@ -68,8 +68,7 @@ ResourceType toResourceType(CachedResource::Type type)
>         return ResourceType::Media;
> #endif
>     case CachedResource::Type::LinkPrefetch:
>-        ASSERT_NOT_REACHED();
>-        break;
>+        return ResourceType::Prefetch;
> #if ENABLE(APPLICATION_MANIFEST)
>     case CachedResource::Type::ApplicationManifest:
>         return ResourceType::Raw;
>diff --git a/Source/WebCore/loader/ResourceLoadInfo.h b/Source/WebCore/loader/ResourceLoadInfo.h
>index 1c123d06f7ad675229d6c5e01f9251a68b16225b..21432aeaf0818438ac00601cbf427345edcd2fc3 100644
>--- a/Source/WebCore/loader/ResourceLoadInfo.h
>+++ b/Source/WebCore/loader/ResourceLoadInfo.h
>@@ -42,6 +42,7 @@ enum class ResourceType : uint16_t {
>     Media = 0x0080,
>     PlugInStream = 0x0100,
>     Popup = 0x0200,
>+    Prefetch = 0x0400,
> };
> const uint16_t ResourceTypeMask = 0x03FF;
> 
>diff --git a/Source/WebCore/loader/ResourceLoader.cpp b/Source/WebCore/loader/ResourceLoader.cpp
>index 6c2b131cb9a8d26347a0a7c8e5985419e36c5933..f09ce6d747542c7d9309c3eae52f06c8ad3c652b 100644
>--- a/Source/WebCore/loader/ResourceLoader.cpp
>+++ b/Source/WebCore/loader/ResourceLoader.cpp
>@@ -341,7 +341,7 @@ void ResourceLoader::willSendRequestInternal(ResourceRequest&& request, const Re
> 
>     ASSERT(!m_reachedTerminalState);
> #if ENABLE(CONTENT_EXTENSIONS)
>-    ASSERT(m_resourceType != ResourceType::Invalid);
>+    ASSERT(m_resourceType != ResourceType::Invalid || m_resourceType == ResourceType::Prefetch);
> #endif
> 
>     // We need a resource identifier for all requests, even if FrameLoader is never going to see it (such as with CORS preflight requests).
>@@ -352,7 +352,7 @@ void ResourceLoader::willSendRequestInternal(ResourceRequest&& request, const Re
>     }
> 
> #if ENABLE(CONTENT_EXTENSIONS)
>-    if (!redirectResponse.isNull() && frameLoader()) {
>+    if (!redirectResponse.isNull() && frameLoader() && m_resourceType != ResourceType::Prefetch) {
>         Page* page = frameLoader()->frame().page();
>         if (page && m_documentLoader) {
>             auto blockedStatus = page->userContentProvider().processContentExtensionRulesForLoad(request.url(), m_resourceType, *m_documentLoader);
>diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
>index 3ab9d7648ece71a9ced576b5922a1c6d39500e34..634a58900809c7fd88960e213b68236b53c00edc 100644
>--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
>+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
>@@ -805,7 +805,7 @@ ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::requ
>     }
> 
> #if ENABLE(CONTENT_EXTENSIONS)
>-    if (frame() && frame()->page() && m_documentLoader) {
>+    if (frame() && frame()->page() && m_documentLoader && type != CachedResource::Type::LinkPrefetch) {
>         const auto& resourceRequest = request.resourceRequest();
>         auto* page = frame()->page();
>         auto blockedStatus = page->userContentProvider().processContentExtensionRulesForLoad(resourceRequest.url(), toResourceType(type), *m_documentLoader);
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h
>index 133beaad39919b8bc69e6a6090c3d41f808bdab5..97cb32023a977abdf22aed2632adcbee7a1659a5 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.h
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.h
>@@ -31,6 +31,7 @@
> #include "NetworkBlobRegistry.h"
> #include "NetworkContentRuleListManager.h"
> #include "NetworkHTTPSUpgradeChecker.h"
>+#include "PrefetchCache.h"
> #include "SandboxExtension.h"
> #include "WebResourceLoadStatisticsStore.h"
> #include <WebCore/AdClickAttribution.h>
>@@ -331,6 +332,8 @@ public:
> 
>     WebCore::StorageQuotaManager& storageQuotaManager(PAL::SessionID, const WebCore::ClientOrigin&);
> 
>+    PrefetchCache& prefetchCache() { return m_prefetchCache; }
>+
> private:
>     void platformInitializeNetworkProcess(const NetworkProcessCreationParameters&);
>     std::unique_ptr<WebCore::NetworkStorageSession> platformCreateDefaultStorageSession() const;
>@@ -540,6 +543,8 @@ private:
>     };
>     HashMap<PAL::SessionID, StorageQuotaManagers> m_storageQuotaManagers;
>     uint32_t m_downloadMonitorSpeedMultiplier { 1 };
>+
>+    PrefetchCache m_prefetchCache;
> };
> 
> } // namespace WebKit
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>index cfa99b175f3539ad364feb9149c779c95fbfbd1e..6b4931674d706a50eeb23adb788b28c0b4a9fec4 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>@@ -210,6 +210,10 @@ void NetworkResourceLoader::retrieveCacheEntry(const ResourceRequest& request)
>     ASSERT(canUseCache(request));
> 
>     RefPtr<NetworkResourceLoader> loader(this);
>+    if (m_parameters.options.mode == FetchOptions::Mode::Navigate) {
>+        if (auto entry = m_connection->networkProcess().prefetchCache().take(request.url(), sessionID()))
>+            m_cache->store(request, entry->response(), (entry->releaseBuffer()), nullptr);
>+    }
>     m_cache->retrieve(request, { m_parameters.webPageID, m_parameters.webFrameID }, [this, loader = WTFMove(loader), request = ResourceRequest { request }](auto entry, auto info) mutable {
>         if (loader->hasOneRef()) {
>             // The loader has been aborted and is only held alive by this lambda.
>@@ -757,6 +761,11 @@ void NetworkResourceLoader::tryStoreAsCacheEntry()
>     if (!m_bufferedDataForCache)
>         return;
> 
>+    const auto& request = originalRequest();
>+    if (request.httpHeaderField(HTTPHeaderName::Purpose) == "prefetch" && !m_parameters.sourceOrigin->canRequest(request.url())) {
>+        m_connection->networkProcess().prefetchCache().store(m_networkLoad->currentRequest().url(), WTFMove(m_response), WTFMove(m_bufferedDataForCache), sessionID());
>+        return;
>+    }
>     m_cache->store(m_networkLoad->currentRequest(), m_response, WTFMove(m_bufferedDataForCache), [loader = makeRef(*this)](auto& mappedBody) mutable {
> #if ENABLE(SHAREABLE_RESOURCE)
>         if (mappedBody.shareableResourceHandle.isNull())
>diff --git a/Source/WebKit/NetworkProcess/cache/PrefetchCache.cpp b/Source/WebKit/NetworkProcess/cache/PrefetchCache.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..9c359e5ca1e9adc466377120308be6743a179c76
>--- /dev/null
>+++ b/Source/WebKit/NetworkProcess/cache/PrefetchCache.cpp
>@@ -0,0 +1,102 @@
>+/*
>+ * Copyright (C) 2019 Igalia S.L.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#include "PrefetchCache.h"
>+
>+#include <WebCore/HTTPHeaderNames.h>
>+#include <WebCore/ResourceResponse.h>
>+#include <wtf/NeverDestroyed.h>
>+
>+namespace WebKit {
>+
>+PrefetchEntry::PrefetchEntry(WebCore::ResourceResponse&& response, RefPtr<WebCore::SharedBuffer>&& buffer)
>+    : m_response(WTFMove(response)), m_buffer(WTFMove(buffer))
>+{
>+}
>+
>+PrefetchCache::PrefetchCache()
>+    : m_expirationTimer(*this, &PrefetchCache::expiration)
>+{
>+}
>+
>+std::unique_ptr<PrefetchEntry> PrefetchCache::take(URL url, PAL::SessionID sessionID)
>+{
>+    auto* resources = sessionPrefetchMap(sessionID);
>+    if (!resources)
>+        return nullptr;
>+    if (!resources->contains(url))
>+        return nullptr;
>+    return resources->take(url);
>+}
>+
>+static const Seconds expirationTimeout { 5_s };
>+
>+void PrefetchCache::store(URL requestUrl, WebCore::ResourceResponse&& response, RefPtr<WebCore::SharedBuffer>&& buffer, PAL::SessionID sessionID)
>+{
>+    ensureSessionPrefetchMap(sessionID).set(requestUrl, std::make_unique<PrefetchEntry>(WTFMove(response), WTFMove(buffer)));
>+    m_sessionExpirationList.append(std::make_tuple(sessionID, requestUrl, WallTime::now()));
>+    if (!m_expirationTimer.isActive())
>+        m_expirationTimer.startOneShot(expirationTimeout);
>+}
>+
>+auto PrefetchCache::sessionPrefetchMap(PAL::SessionID sessionID) const -> PrefetchEntriesMap*
>+{
>+    ASSERT(sessionID.isValid());
>+    return m_sessionPrefetches.get(sessionID);
>+}
>+
>+auto PrefetchCache::ensureSessionPrefetchMap(PAL::SessionID sessionID) -> PrefetchEntriesMap&
>+{
>+    ASSERT(sessionID.isValid());
>+    auto& map = m_sessionPrefetches.add(sessionID, nullptr).iterator->value;
>+    if (!map)
>+        map = std::make_unique<PrefetchEntriesMap>();
>+    return *map;
>+}
>+
>+void PrefetchCache::expiration()
>+{
>+    PAL::SessionID sessionID;
>+    URL requestUrl;
>+    WallTime timestamp;
>+    auto timeout = WallTime::now();
>+    while (!m_sessionExpirationList.isEmpty()) {
>+        std::tie(sessionID, requestUrl, timestamp) = m_sessionExpirationList.first();
>+        auto* resources = sessionPrefetchMap(sessionID);
>+        ASSERT(resources);
>+        ASSERT(resources->contains(requestUrl));
>+        auto elapsed = timeout - timestamp;
>+        if (elapsed > expirationTimeout) {
>+            resources->remove(requestUrl);
>+            m_sessionExpirationList.removeFirst();
>+        } else {
>+            m_expirationTimer.startOneShot(expirationTimeout - elapsed);
>+            break;
>+        }
>+    }
>+}
>+
>+}
>diff --git a/Source/WebKit/NetworkProcess/cache/PrefetchCache.h b/Source/WebKit/NetworkProcess/cache/PrefetchCache.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..27b7c75b36cc398cdb8e64b74586ce63a18ca17f
>--- /dev/null
>+++ b/Source/WebKit/NetworkProcess/cache/PrefetchCache.h
>@@ -0,0 +1,78 @@
>+/*
>+ * Copyright (C) 2019 Igalia S.L.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#pragma once
>+
>+#include <WebCore/ResourceResponse.h>
>+#include <WebCore/SharedBuffer.h>
>+#include <WebCore/Timer.h>
>+#include <wtf/CompletionHandler.h>
>+#include <wtf/Deque.h>
>+#include <wtf/HashMap.h>
>+#include <wtf/Seconds.h>
>+#include <wtf/URLHash.h>
>+#include <wtf/text/WTFString.h>
>+
>+namespace WebKit {
>+
>+class PrefetchEntry {
>+    WTF_MAKE_FAST_ALLOCATED;
>+public:
>+    PrefetchEntry(WebCore::ResourceResponse&&, RefPtr<WebCore::SharedBuffer>&&);
>+
>+    const WebCore::ResourceResponse& response() const { return m_response; }
>+    RefPtr<WebCore::SharedBuffer> releaseBuffer() const { return m_buffer.releaseNonNull(); }
>+
>+private:
>+    WebCore::ResourceResponse m_response;
>+    mutable RefPtr<WebCore::SharedBuffer> m_buffer;
>+};
>+
>+class PrefetchCache {
>+    WTF_MAKE_NONCOPYABLE(PrefetchCache); WTF_MAKE_FAST_ALLOCATED;
>+public:
>+    PrefetchCache();
>+    ~PrefetchCache() = default;
>+
>+    std::unique_ptr<PrefetchEntry> take(URL, PAL::SessionID);
>+    void store(URL, WebCore::ResourceResponse&&, RefPtr<WebCore::SharedBuffer>&&, PAL::SessionID);
>+
>+private:
>+    void expiration();
>+
>+    typedef HashMap<URL, std::unique_ptr<PrefetchEntry>> PrefetchEntriesMap;
>+    PrefetchEntriesMap& ensureSessionPrefetchMap(PAL::SessionID);
>+    PrefetchEntriesMap* sessionPrefetchMap(PAL::SessionID) const;
>+
>+    typedef HashMap<PAL::SessionID, std::unique_ptr<PrefetchEntriesMap>> SessionPrefetchResourceMap;
>+    SessionPrefetchResourceMap m_sessionPrefetches;
>+
>+    typedef Deque<std::tuple<PAL::SessionID, URL, WallTime>> SessionPrefetchExpirationList;
>+    SessionPrefetchExpirationList m_sessionExpirationList;
>+
>+    WebCore::Timer m_expirationTimer;
>+};
>+
>+} // namespace WebKit
>diff --git a/Source/WebKit/Shared/WebPreferences.yaml b/Source/WebKit/Shared/WebPreferences.yaml
>index 107d0b2a26aa5552d52e085c5d7290985388eb41..613114eae04e7b66faaafb54947066cdfc6c3204 100644
>--- a/Source/WebKit/Shared/WebPreferences.yaml
>+++ b/Source/WebKit/Shared/WebPreferences.yaml
>@@ -1628,6 +1628,14 @@ ApplePayRemoteUIEnabled:
>   humanReadableName: "Apple Pay Remote UI"
>   type: bool
> 
>+LinkPrefetchEnabled:
>+  type: bool
>+  defaultValue: false
>+  humanReadableName: "LinkPrefetch"
>+  humanReadableDescription: "Enable LinkedPrefetch"
>+  webcoreBinding: RuntimeEnabledFeatures
>+  category: experimental
>+
> # Deprecated
> 
> ICECandidateFilteringEnabled:
>diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt
>index 8527cfb9d0c9e70bd75bad0ce46b054b327eea84..26b08ae7c224b02447e5f74f98732832515ae897 100644
>--- a/Source/WebKit/Sources.txt
>+++ b/Source/WebKit/Sources.txt
>@@ -80,6 +80,7 @@ NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp
> NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp
> NetworkProcess/cache/NetworkCacheStorage.cpp
> NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp
>+NetworkProcess/cache/PrefetchCache.cpp
> 
> NetworkProcess/webrtc/NetworkMDNSRegister.cpp
> 
>diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>index bc1336dd4315914f08d7b6a0a3c4102b50dc9a66..8733e99730fa668ecdd1f0b82fc3adfefeaa974d 100644
>--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>@@ -1330,6 +1330,7 @@
> 		A78CCDDB193AC9F8005ECC25 /* com.apple.WebKit.Networking.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD8193AC9E3005ECC25 /* com.apple.WebKit.Networking.sb */; };
> 		A78CCDDC193AC9FB005ECC25 /* com.apple.WebKit.WebContent.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD9193AC9E3005ECC25 /* com.apple.WebKit.WebContent.sb */; };
> 		A7D792D81767CCA300881CBE /* ActivityAssertion.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D792D41767CB0900881CBE /* ActivityAssertion.h */; };
>+		AAB145E6223F931200E489D8 /* PrefetchCache.h in Headers */ = {isa = PBXBuildFile; fileRef = AAB145E4223F931200E489D8 /* PrefetchCache.h */; };
> 		B62E7312143047B00069EC35 /* WKHitTestResult.h in Headers */ = {isa = PBXBuildFile; fileRef = B62E7311143047B00069EC35 /* WKHitTestResult.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		B878B615133428DC006888E9 /* CorrectionPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = B878B613133428DC006888E9 /* CorrectionPanel.h */; };
> 		BC017D0716260FF4007054F5 /* WKDOMDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = BC017CFF16260FF4007054F5 /* WKDOMDocument.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -3960,6 +3961,8 @@
> 		A7D792D41767CB0900881CBE /* ActivityAssertion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ActivityAssertion.h; sourceTree = "<group>"; };
> 		A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ActivityAssertion.cpp; sourceTree = "<group>"; };
> 		A7E93CEB192531AA00A1DC48 /* AuxiliaryProcessIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AuxiliaryProcessIOS.mm; path = ios/AuxiliaryProcessIOS.mm; sourceTree = "<group>"; };
>+		AAB145E4223F931200E489D8 /* PrefetchCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrefetchCache.h; sourceTree = "<group>"; };
>+		AAB145E5223F931200E489D8 /* PrefetchCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PrefetchCache.cpp; sourceTree = "<group>"; };
> 		B396EA5512E0ED2D00F4FEB7 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
> 		B62E730F143047A60069EC35 /* WKHitTestResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKHitTestResult.cpp; sourceTree = "<group>"; };
> 		B62E7311143047B00069EC35 /* WKHitTestResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHitTestResult.h; sourceTree = "<group>"; };
>@@ -8892,6 +8895,8 @@
> 				E4436EC21A0CFDB200EAD204 /* NetworkCacheStorage.h */,
> 				8310428A1BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.cpp */,
> 				831042891BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.h */,
>+				AAB145E5223F931200E489D8 /* PrefetchCache.cpp */,
>+				AAB145E4223F931200E489D8 /* PrefetchCache.h */,
> 			);
> 			path = cache;
> 			sourceTree = "<group>";
>@@ -9370,6 +9375,7 @@
> 				7CD622781739D863005BD7FF /* PluginSandboxProfile.h in Headers */,
> 				1A6FB7AF11E64B6800DB1371 /* PluginView.h in Headers */,
> 				83A0ED351F747CCF003299EB /* PreconnectTask.h in Headers */,
>+				AAB145E6223F931200E489D8 /* PrefetchCache.h in Headers */,
> 				E1CC1B9012D7EADF00625838 /* PrintInfo.h in Headers */,
> 				86F9536518FF58F5001DB2EF /* ProcessAssertion.h in Headers */,
> 				BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */,
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 2b82ebdcfb8c743f6e9719b5ac8d16040b7d1944..7eadecff483e1ce25493bad79c026202872fedf0 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-03-21  Rob Buis  <rbuis@igalia.com>
>+
>+        Link prefetch not useful for top-level navigation
>+        https://bugs.webkit.org/show_bug.cgi?id=195623
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Verify that prefetching a cross-domain main resource fetch is cached
>+        in the prefetch cache and only loaded once.
>+
>+        * http/tests/cache/link-prefetch-main-resource-expected.txt: Added.
>+        * http/tests/cache/link-prefetch-main-resource.php: Added.
>+        * http/tests/cache/resources/prefetched-main-resource.php: Added.
>+        * platform/mac-wk1/TestExpectations:
>+        * platform/win/TestExpectations:
>+
> 2019-03-21  Miguel Gomez  <magomez@igalia.com>
> 
>         Unreviewed GTK+ and WPE gardening after r243278.
>diff --git a/LayoutTests/http/tests/cache/link-prefetch-main-resource-expected.txt b/LayoutTests/http/tests/cache/link-prefetch-main-resource-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..69cfc5a98db74fbe32ac9b678a6134af9736dd59
>--- /dev/null
>+++ b/LayoutTests/http/tests/cache/link-prefetch-main-resource-expected.txt
>@@ -0,0 +1,2 @@
>+PASS
>+
>diff --git a/LayoutTests/http/tests/cache/link-prefetch-main-resource.html b/LayoutTests/http/tests/cache/link-prefetch-main-resource.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..51e3ad94455ee192c74e5d879468349a14973776
>--- /dev/null
>+++ b/LayoutTests/http/tests/cache/link-prefetch-main-resource.html
>@@ -0,0 +1,41 @@
>+
>+<html>
>+<body>
>+<div id="result">PASS</div>
>+<script>
>+
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
>+}
>+
>+function done()
>+{
>+    testRunner.notifyDone();
>+}
>+
>+function iframeLoadFinished()
>+{
>+    if (window.testRunner)
>+        setTimeout(done, 0);
>+}
>+
>+function loadAfterPrefetch()
>+{
>+    var newIframe = document.createElement("iframe");
>+    newIframe.src = "http://localhost:8000/cache/resources/prefetched-main-resource.php";
>+    newIframe.onload = iframeLoadFinished;
>+    document.body.appendChild(newIframe);
>+}
>+
>+window.onmessage = function(message)
>+{
>+    if (message.data === "nonprefetch") {
>+        document.getElementById('result').textContent = 'FAIL';
>+    }
>+}
>+
>+</script>
>+<link rel="prefetch" href="http://localhost:8000/cache/resources/prefetched-main-resource.php" onload="setTimeout(loadAfterPrefetch, 0);">
>+</body>
>+</html>
>diff --git a/LayoutTests/http/tests/cache/resources/prefetched-main-resource.php b/LayoutTests/http/tests/cache/resources/prefetched-main-resource.php
>new file mode 100644
>index 0000000000000000000000000000000000000000..936a77e6bac2972e1c2ab319588b3f35e3807249
>--- /dev/null
>+++ b/LayoutTests/http/tests/cache/resources/prefetched-main-resource.php
>@@ -0,0 +1,14 @@
>+<?php
>+if ($_SERVER["HTTP_PURPOSE"] == "prefetch") {
>+    header('Cache-Control: max-age=3600');
>+    header("Access-Control-Allow-Origin: http://127.0.0.1:8000");
>+
>+    exit();
>+}
>+
>+header("Access-Control-Allow-Origin: http://127.0.0.1:8000");
>+
>+echo "<script>";
>+echo "parent.window.postMessage('nonprefetch', '*');";
>+echo "</script>";
>+?>
>diff --git a/LayoutTests/platform/mac-wk1/TestExpectations b/LayoutTests/platform/mac-wk1/TestExpectations
>index 21fde6ba37915505ef4ffd2213c331454fd8a09a..bc64f2a039693ff4a221a25088e2ce26eaf3b0b0 100644
>--- a/LayoutTests/platform/mac-wk1/TestExpectations
>+++ b/LayoutTests/platform/mac-wk1/TestExpectations
>@@ -688,3 +688,5 @@ webkit.org/b/194309 media/modern-media-controls/compact-media-controls/compact-m
> webkit.org/b/195098 pointerevents/mouse/over-enter-out-leave.html [ Failure ]
> webkit.org/b/195098 pointerevents/mouse/pointer-capture.html [ Failure ]
> webkit.org/b/195098 pointerevents/mouse/pointer-events-before-mouse-events.html [ Failure ]
>+
>+webkit.org/b/195623 http/tests/cache/link-prefetch-main-resource.html [ Failure ]
>diff --git a/LayoutTests/platform/win/TestExpectations b/LayoutTests/platform/win/TestExpectations
>index 8875c96ab85192300c5a26d96b816100e4f38153..957451a91f02a2309daa34e399c8a1af1277a788 100644
>--- a/LayoutTests/platform/win/TestExpectations
>+++ b/LayoutTests/platform/win/TestExpectations
>@@ -4297,3 +4297,5 @@ webkit.org/b/195461 http/tests/referrer-policy-iframe/origin/cross-origin-http-h
> webkit.org/b/195461 http/tests/referrer-policy-iframe/origin/cross-origin-http.https.html [ Failure ]
> webkit.org/b/195461 http/tests/referrer-policy-iframe/origin/same-origin.html [ Failure ]
> webkit.org/b/195461 http/tests/referrer-policy-iframe/unsafe-url/cross-origin-http.https.html [ Failure ]
>+
>+webkit.org/b/195623 http/tests/cache/link-prefetch-main-resource.html [ Failure ]

Actions: View | Formatted Diff | Diff

Attachments on bug 195623: 364392 | 364402 | 364415 | 364419 | 364687 | 364704 | 364708 | 364712 | 364725 | 364761 | 365017 | 365023 | 365024 | 365030 | 365040 | 365045 | 365058 | 365101 | 365173 | 365183 | 365194 | 365198 | 365223 | 365235 | 365248 | 365253 | 365265 | 365334 | 365340 | 365342 | 365401 | 365460 | 365546 | 365562 | 365591 | 365649 | 365697 | 365700 | 365705 | 365869 | 365880 | 365881 | 365987 | 366000 | 366057 | 366069 | 366266 | 366273 | 366278 | 366280 | 366281 | 366476 | 366479 | 366481 | 366488 | 366585 | 366586 | 366602 | 367385 | 367388 | 367404 | 367534 | 367804 | 367891 | 367932 | 368016 | 368124 | 368129 | 368134 | 368136 | 368137 | 368311 | 368313 | 368317 | 368326 | 368343 | 369372