Changeset 183467 in webkit

Timestamp:

Apr 28, 2015 5:49:30 AM (9 years ago)

Author:

Antti Koivisto

Message:

Network Cache: Disk cache getting filled by YouTube video data
​https://bugs.webkit.org/show_bug.cgi?id=144259

Reviewed by Darin Adler.

Source/WebCore:

MSE media is loaded via XHR and tends to eventually fill the cache.

YouTube serves the media chunks cacheable, however they are rarely (if ever) reused.
We can reduce disk writes and keep more useful resources around by not caching them

Test: http/tests/cache/disk-cache/disk-cache-media.html

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::startLoadingMainResource):

Set the requester.

• loader/cache/CachedRawResource.cpp:

(WebCore::CachedRawResource::CachedRawResource):

• page/DiagnosticLoggingKeys.cpp:

(WebCore::DiagnosticLoggingKeys::streamingMedia):

• page/DiagnosticLoggingKeys.h:
• platform/network/ResourceRequestBase.cpp:

(WebCore::ResourceRequestBase::adopt):
(WebCore::ResourceRequestBase::copyData):
(WebCore::equalIgnoringHeaderFields):

• platform/network/ResourceRequestBase.h:

(WebCore::ResourceRequestBase::requester):
(WebCore::ResourceRequestBase::setRequester):

Add requester type to the request object. Currently this is main resource, xhr or unspecified.

(WebCore::ResourceRequestBase::encodeWithoutPlatformData):
(WebCore::ResourceRequestBase::decodeWithoutPlatformData):

• platform/network/cf/ResourceRequest.h:

(WebCore::ResourceRequest::deprecatedSetMainResourceRequest): Deleted.
(WebCore::ResourceRequest::deprecatedIsMainResourceRequest): Deleted.

Replace this iOS only field with shared mechanism.

• platform/network/ios/QuickLook.mm:

(WebCore::QuickLookHandle::create):

• xml/XMLHttpRequest.cpp:

(WebCore::XMLHttpRequest::createRequest):

Set the requester.

Source/WebKit2:

MSE media is loaded via XHR and tends to eventually fill the cache.

YouTube serves the media chunks cacheable, however they are rarely (if ever) reused.
We can reduce disk writes and keep more useful resources around by not caching them

• NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::didReceiveResponseAsync):
(WebKit::NetworkResourceLoader::didRetrieveCacheEntry):

• NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::makeStoreDecision):

Don't store if the requester is XHR and response has video or audio content type.

• NetworkProcess/cache/NetworkCache.h:
• NetworkProcess/cache/NetworkCacheStatistics.cpp:

(WebKit::NetworkCache::storeDecisionToDiagnosticKey):

• Shared/Network/NetworkResourceLoadParameters.cpp:

(WebKit::NetworkResourceLoadParameters::NetworkResourceLoadParameters):
(WebKit::NetworkResourceLoadParameters::encode):
(WebKit::NetworkResourceLoadParameters::decode):

• Shared/Network/NetworkResourceLoadParameters.h:

The requester type is now part of the ResourceRequest, no need for separate parameter.

• Shared/mac/WebCoreArgumentCodersMac.mm:

(IPC::ArgumentCoder<ResourceRequest>::encodePlatformData):
(IPC::ArgumentCoder<ResourceRequest>::decodePlatformData):

• WebProcess/Network/WebResourceLoadScheduler.cpp:

(WebKit::WebResourceLoadScheduler::scheduleLoad):

LayoutTests:

• http/tests/cache/disk-cache/disk-cache-media-expected.txt: Added.
• http/tests/cache/disk-cache/disk-cache-media.html: Added.
• http/tests/cache/disk-cache/resources/cache-test.js:

(generateTestURL):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/cache/disk-cache/disk-cache-media-expected.txt (added)
• LayoutTests/http/tests/cache/disk-cache/disk-cache-media.html (added)
• LayoutTests/http/tests/cache/disk-cache/resources/cache-test.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/DocumentLoader.cpp (modified) (2 diffs)
• Source/WebCore/loader/cache/CachedRawResource.cpp (modified) (1 diff)
• Source/WebCore/page/DiagnosticLoggingKeys.cpp (modified) (1 diff)
• Source/WebCore/page/DiagnosticLoggingKeys.h (modified) (1 diff)
• Source/WebCore/platform/network/ResourceRequestBase.cpp (modified) (3 diffs)
• Source/WebCore/platform/network/ResourceRequestBase.h (modified) (5 diffs)
• Source/WebCore/platform/network/cf/ResourceRequest.h (modified) (1 diff)
• Source/WebCore/platform/network/ios/QuickLook.mm (modified) (2 diffs)
• Source/WebCore/xml/XMLHttpRequest.cpp (modified) (1 diff)
• Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (modified) (2 diffs)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (modified) (3 diffs)
• Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (modified) (3 diffs)
• Source/WebKit2/NetworkProcess/cache/NetworkCache.h (modified) (1 diff)
• Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp (modified) (1 diff)
• Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp (modified) (3 diffs)
• Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h (modified) (1 diff)
• Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (modified) (3 diffs)
• Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-04-28  Antti Koivisto  <antti@apple.com>
+
+        Network Cache: Disk cache getting filled by YouTube video data
+        https://bugs.webkit.org/show_bug.cgi?id=144259
+
+        Reviewed by Darin Adler.
+
+        * http/tests/cache/disk-cache/disk-cache-media-expected.txt: Added.
+        * http/tests/cache/disk-cache/disk-cache-media.html: Added.
+        * http/tests/cache/disk-cache/resources/cache-test.js:
+        (generateTestURL):
+
 2015-04-25  Simon Fraser  <simon.fraser@apple.com>
 

trunk/LayoutTests/http/tests/cache/disk-cache/resources/cache-test.js

@@ -47 +47 @@
     if (expiresInFutureIn304)
         testURL += "&expires-in-future-in-304=1";
-    testURL += "&uniqueId=" + uniqueTestId++ + "&Content-type=text/plain";
+    testURL += "&uniqueId=" + uniqueTestId++;
+    if (!test.responseHeaders || !test.responseHeaders["Content-Type"])
+        testURL += "&Content-Type=text/plain";
     for (var header in test.responseHeaders)
         testURL += '&' + header + '=' + makeHeaderValue(test.responseHeaders[header]);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-04-28  Antti Koivisto  <antti@apple.com>
+
+        Network Cache: Disk cache getting filled by YouTube video data
+        https://bugs.webkit.org/show_bug.cgi?id=144259
+
+        Reviewed by Darin Adler.
+
+        MSE media is loaded via XHR and tends to eventually fill the cache.
+
+        YouTube serves the media chunks cacheable, however they are rarely (if ever) reused.
+        We can reduce disk writes and keep more useful resources around by not caching them
+
+        Test: http/tests/cache/disk-cache/disk-cache-media.html
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::startLoadingMainResource):
+
+            Set the requester.
+
+        * loader/cache/CachedRawResource.cpp:
+        (WebCore::CachedRawResource::CachedRawResource):
+        * page/DiagnosticLoggingKeys.cpp:
+        (WebCore::DiagnosticLoggingKeys::streamingMedia):
+        * page/DiagnosticLoggingKeys.h:
+        * platform/network/ResourceRequestBase.cpp:
+        (WebCore::ResourceRequestBase::adopt):
+        (WebCore::ResourceRequestBase::copyData):
+        (WebCore::equalIgnoringHeaderFields):
+        * platform/network/ResourceRequestBase.h:
+        (WebCore::ResourceRequestBase::requester):
+        (WebCore::ResourceRequestBase::setRequester):
+
+            Add requester type to the request object. Currently this is main resource, xhr or unspecified.
+
+        (WebCore::ResourceRequestBase::encodeWithoutPlatformData):
+        (WebCore::ResourceRequestBase::decodeWithoutPlatformData):
+        * platform/network/cf/ResourceRequest.h:
+        (WebCore::ResourceRequest::deprecatedSetMainResourceRequest): Deleted.
+        (WebCore::ResourceRequest::deprecatedIsMainResourceRequest): Deleted.
+
+            Replace this iOS only field with shared mechanism.
+
+        * platform/network/ios/QuickLook.mm:
+        (WebCore::QuickLookHandle::create):
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::createRequest):
+
+            Set the requester.
+
 2015-04-28  Namhoon Kim  <nakim@ea.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -935 +935 @@
     m_loadingMainResource = false;
 
-#if PLATFORM(IOS)
-    // FIXME: Remove PLATFORM(IOS)-guard once we upstream the iOS changes to ResourceRequest.h.
-    m_request.deprecatedSetMainResourceRequest(false);
-#endif
-
     if (this == frameLoader()->activeDocumentLoader())
         checkLoadComplete();
@@ -1404 +1399 @@
     }
 
-#if PLATFORM(IOS)
-    // FIXME: Remove PLATFORM(IOS)-guard once we upstream the iOS changes to ResourceRequest.h.
-    m_request.deprecatedSetMainResourceRequest(true);
-#endif
-
     ResourceRequest request(m_request);
+    request.setRequester(ResourceRequest::Requester::Main);
+    
     static NeverDestroyed<ResourceLoaderOptions> mainResourceLoadOptions(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, AskClientForAllCredentials, SkipSecurityCheck, UseDefaultOriginRestrictionsForType, IncludeCertificateInfo);
     CachedResourceRequest cachedResourceRequest(request, mainResourceLoadOptions);

trunk/Source/WebCore/loader/cache/CachedRawResource.cpp

@@ -43 +43 @@
     , m_allowEncodedDataReplacement(true)
 {
-    // FIXME: The wrong CachedResource::Type here may cause a bad cast elsewhere.
     ASSERT(isMainOrRawResource());
 }

trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp

@@ -374 +374 @@
 }
 
+String DiagnosticLoggingKeys::streamingMedia()
+{
+    return ASCIILiteral("streamingMedia");
+}
+
 String DiagnosticLoggingKeys::styleSheetKey()
 {

trunk/Source/WebCore/page/DiagnosticLoggingKeys.h

@@ -107 +107 @@
     static String scriptKey();
     static String sourceKey();
+    WEBCORE_EXPORT static String streamingMedia();
     static String styleSheetKey();
     static String svgDocumentKey();

trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp

@@ -58 +58 @@
     request->setHTTPMethod(data->m_httpMethod);
     request->setPriority(data->m_priority);
+    request->setRequester(data->m_requester);
 
     request->updateResourceRequest();
@@ -91 +92 @@
     data->m_httpHeaders = httpHeaderFields().copyData();
     data->m_priority = priority();
+    data->m_requester = m_requester;
 
     data->m_responseContentDispositionEncodingFallbackArray.reserveInitialCapacity(m_responseContentDispositionEncodingFallbackArray.size());
@@ -497 +499 @@
         return false;
 
+    if (a.requester() != b.requester())
+        return false;
+
     FormData* formDataA = a.httpBody();
     FormData* formDataB = b.httpBody();

trunk/Source/WebCore/platform/network/ResourceRequestBase.h

@@ -148 +148 @@
         void setHiddenFromInspector(bool hiddenFromInspector) { m_hiddenFromInspector = hiddenFromInspector; }
 
+        enum class Requester { Unspecified, Main, XHR };
+        WEBCORE_EXPORT Requester requester() const { return m_requester; }
+        WEBCORE_EXPORT void setRequester(Requester requester) { m_requester = requester; }
+
 #if !PLATFORM(COCOA)
         bool encodingRequiresPlatformData() const { return true; }
@@ -225 +229 @@
         unsigned m_hiddenFromInspector : 1;
         unsigned m_priority : 4;
+        Requester m_requester { Requester::Unspecified };
 
     private:
@@ -256 +261 @@
         bool m_allowCookies;
         ResourceLoadPriority m_priority;
+        ResourceRequestBase::Requester m_requester;
     };
     
@@ -277 +283 @@
     encoder << m_allowCookies;
     encoder.encodeEnum(m_priority);
+    encoder.encodeEnum(m_requester);
 }
 
@@ -319 +326 @@
     m_priority = priority;
 
+    if (!decoder.decodeEnum(m_requester))
+        return false;
+
     return true;
 }

trunk/Source/WebCore/platform/network/cf/ResourceRequest.h

@@ -119 +119 @@
         static bool resourcePrioritiesEnabled();
 
-#if PLATFORM(IOS)
-        // FIXME: deprecatedIsMainResourceRequest() does not return the correct value if the ResourceRequest has been
-        // deserialized from an IPC message. As a result this function can only be relied on when networking is not in a
-        // separate process.
-        void deprecatedSetMainResourceRequest(bool isMainResourceRequest) const { m_mainResourceRequest = isMainResourceRequest; }
-        bool deprecatedIsMainResourceRequest() const { return m_mainResourceRequest; }
-
-    private:
-        mutable bool m_mainResourceRequest = false;
-#endif
-
     private:
         friend class ResourceRequestBase;

trunk/Source/WebCore/platform/network/ios/QuickLook.mm

@@ -460 +460 @@
 {
     ASSERT_ARG(handle, handle);
-    if (!handle->firstRequest().deprecatedIsMainResourceRequest() || ![WebCore::QLPreviewGetSupportedMIMETypesSet() containsObject:[nsResponse MIMEType]])
+    if (handle->firstRequest().requester() != ResourceRequest::Requester::Main || ![WebCore::QLPreviewGetSupportedMIMETypesSet() containsObject:[nsResponse MIMEType]])
         return nullptr;
 
@@ -472 +472 @@
 {
     ASSERT_ARG(handle, handle);
-    if (!handle->firstRequest().deprecatedIsMainResourceRequest() || ![WebCore::QLPreviewGetSupportedMIMETypesSet() containsObject:(NSString *)CFURLResponseGetMIMEType(cfResponse)])
+    if (handle->firstRequest().requester() != ResourceRequest::Requester::Main || ![WebCore::QLPreviewGetSupportedMIMETypesSet() containsObject:(NSString *)CFURLResponseGetMIMEType(cfResponse)])
         return nullptr;
 

trunk/Source/WebCore/xml/XMLHttpRequest.cpp

@@ -746 +746 @@
 
     ResourceRequest request(m_url);
+    request.setRequester(ResourceRequest::Requester::XHR);
     request.setHTTPMethod(m_method);
 

trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

@@ -364 +364 @@
     ResourceLoadPriority priority = request.priority();
     bool isHiddenFromInspector = request.hiddenFromInspector();
-#if PLATFORM(IOS)
-    bool isMainResourceRequest = request.deprecatedIsMainResourceRequest();
+    auto requester = request.requester();
+#if PLATFORM(IOS)
     if (implementations->webThreadWillSendRequestFunc) {
         newURLRequest = (NSURLRequest *)CallResourceLoadDelegateInWebThread(implementations->webThreadWillSendRequestFunc, webView, @selector(webThreadWebView:resource:willSendRequest:redirectResponse:fromDataSource:), [webView _objectForIdentifier:identifier], currentURLRequest, redirectResponse.nsURLResponse(), dataSource(loader));
@@ -376 +376 @@
         request = newURLRequest;
     request.setHiddenFromInspector(isHiddenFromInspector);
-#if PLATFORM(IOS)
-    request.deprecatedSetMainResourceRequest(isMainResourceRequest);
-#endif
     request.setPriority(priority);
+    request.setRequester(requester);
 }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-04-28  Antti Koivisto  <antti@apple.com>
+
+        Network Cache: Disk cache getting filled by YouTube video data
+        https://bugs.webkit.org/show_bug.cgi?id=144259
+
+        Reviewed by Darin Adler.
+
+        MSE media is loaded via XHR and tends to eventually fill the cache.
+
+        YouTube serves the media chunks cacheable, however they are rarely (if ever) reused.
+        We can reduce disk writes and keep more useful resources around by not caching them
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::didReceiveResponseAsync):
+        (WebKit::NetworkResourceLoader::didRetrieveCacheEntry):
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::makeStoreDecision):
+
+            Don't store if the requester is XHR and response has video or audio content type.
+
+        * NetworkProcess/cache/NetworkCache.h:
+        * NetworkProcess/cache/NetworkCacheStatistics.cpp:
+        (WebKit::NetworkCache::storeDecisionToDiagnosticKey):
+        * Shared/Network/NetworkResourceLoadParameters.cpp:
+        (WebKit::NetworkResourceLoadParameters::NetworkResourceLoadParameters):
+        (WebKit::NetworkResourceLoadParameters::encode):
+        (WebKit::NetworkResourceLoadParameters::decode):
+        * Shared/Network/NetworkResourceLoadParameters.h:
+
+            The requester type is now part of the ResourceRequest, no need for separate parameter.
+
+        * Shared/mac/WebCoreArgumentCodersMac.mm:
+        (IPC::ArgumentCoder<ResourceRequest>::encodePlatformData):
+        (IPC::ArgumentCoder<ResourceRequest>::decodePlatformData):
+        * WebProcess/Network/WebResourceLoadScheduler.cpp:
+        (WebKit::WebResourceLoadScheduler::scheduleLoad):
+
 2015-04-28  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

@@ -254 +254 @@
 #endif
 
+    bool shouldWaitContinueDidReceiveResponse = originalRequest().requester() == ResourceRequest::Requester::Main;
     if (shouldSendDidReceiveResponse) {
         if (isSynchronous())
             m_synchronousLoadData->response = m_response;
         else {
-            if (!sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponse(m_response, m_parameters.isMainResource)))
+            if (!sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponse(m_response, shouldWaitContinueDidReceiveResponse)))
                 return;
         }
@@ -264 +265 @@
 
     // For main resources, the web process is responsible for sending back a NetworkResourceLoader::ContinueDidReceiveResponse message.
-    bool shouldContinueDidReceiveResponse = !m_parameters.isMainResource;
+    bool shouldContinueDidReceiveResponse = !shouldWaitContinueDidReceiveResponse;
 #if ENABLE(NETWORK_CACHE)
     shouldContinueDidReceiveResponse = shouldContinueDidReceiveResponse || m_cacheEntryForValidation;
@@ -544 +545 @@
         sendReplyToSynchronousRequest(*m_synchronousLoadData, entry->buffer());
     } else {
-        sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponse(entry->response(), m_parameters.isMainResource));
+        bool needsContinueDidReceiveResponseMessage = originalRequest().requester() == ResourceRequest::Requester::Main;
+        sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponse(entry->response(), needsContinueDidReceiveResponseMessage));
 
 #if ENABLE(SHAREABLE_RESOURCE)

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp

@@ -268 +268 @@
 }
 
+static bool isMediaMIMEType(const String& mimeType)
+{
+    if (mimeType.startsWith("video/", /*caseSensitive*/ false))
+        return true;
+    if (mimeType.startsWith("audio/", /*caseSensitive*/ false))
+        return true;
+    return false;
+}
+
 static StoreDecision makeStoreDecision(const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceResponse& response)
 {
@@ -291 +300 @@
     }
 
-    // Main resource has ResourceLoadPriorityVeryHigh.
-    bool storeUnconditionallyForHistoryNavigation = originalRequest.priority() == WebCore::ResourceLoadPriorityVeryHigh;
+    bool isMainResource = originalRequest.requester() == WebCore::ResourceRequest::Requester::Main;
+    bool storeUnconditionallyForHistoryNavigation = isMainResource || originalRequest.priority() == WebCore::ResourceLoadPriorityVeryHigh;
     if (!storeUnconditionallyForHistoryNavigation) {
         auto now = std::chrono::system_clock::now();
@@ -301 +310 @@
             return StoreDecision::NoDueToUnlikelyToReuse;
     }
+
+    // Media loaded via XHR is likely being used for MSE streaming (YouTube and Netflix for example).
+    // Streaming media fills the cache quickly and is unlikely to be reused.
+    // FIXME: We should introduce a separate media cache partition that doesn't affect other resources.
+    // FIXME: We should also make sure make the MSE paths are copy-free so we can use mapped buffers from disk effectively.
+    bool isLikelyStreamingMedia = originalRequest.requester() == WebCore::ResourceRequest::Requester::XHR && isMediaMIMEType(response.mimeType());
+    if (isLikelyStreamingMedia)
+        return StoreDecision::NoDueToStreamingMedia;
 
     return StoreDecision::Yes;

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h

@@ -72 +72 @@
     NoDueToHTTPStatusCode,
     NoDueToNoStoreRequest,
-    NoDueToUnlikelyToReuse
+    NoDueToUnlikelyToReuse,
+    NoDueToStreamingMedia
 };
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp

@@ -245 +245 @@
     case StoreDecision::NoDueToUnlikelyToReuse:
         return WebCore::DiagnosticLoggingKeys::unlikelyToReuseKey();
+    case StoreDecision::NoDueToStreamingMedia:
+        return WebCore::DiagnosticLoggingKeys::streamingMedia();
     case StoreDecision::Yes:
         // It was stored but could not be retrieved so it must have been pruned from the cache.

trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp

@@ -46 +46 @@
     , clientCredentialPolicy(DoNotAskClientForAnyCredentials)
     , shouldClearReferrerOnHTTPSToHTTPRedirect(true)
-    , isMainResource(false)
     , defersLoading(false)
     , needsCertificateInfo(false)
@@ -95 +94 @@
     encoder.encodeEnum(clientCredentialPolicy);
     encoder << shouldClearReferrerOnHTTPSToHTTPRedirect;
-    encoder << isMainResource;
     encoder << defersLoading;
     encoder << needsCertificateInfo;
@@ -152 +150 @@
     if (!decoder.decode(result.shouldClearReferrerOnHTTPSToHTTPRedirect))
         return false;
-    if (!decoder.decode(result.isMainResource))
-        return false;
     if (!decoder.decode(result.defersLoading))
         return false;

trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h

@@ -62 +62 @@
     WebCore::ClientCredentialPolicy clientCredentialPolicy;
     bool shouldClearReferrerOnHTTPSToHTTPRedirect;
-    bool isMainResource;
     bool defersLoading;
     bool needsCertificateInfo;

trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm

@@ -85 +85 @@
     // The fallback array is part of CFURLRequest, but it is not encoded by WKCFURLRequestCreateSerializableRepresentation.
     encoder << resourceRequest.responseContentDispositionEncodingFallbackArray();
+    encoder.encodeEnum(resourceRequest.requester());
 }
 #else
@@ -110 +111 @@
     // The fallback array is part of NSURLRequest, but it is not encoded by WKNSURLRequestCreateSerializableRepresentation.
     encoder << resourceRequest.responseContentDispositionEncodingFallbackArray();
+    encoder.encodeEnum(resourceRequest.requester());
 }
 #endif
@@ -151 +153 @@
         responseContentDispositionEncodingFallbackArray.size() > 2 ? responseContentDispositionEncodingFallbackArray[2] : String()
     );
+
+    ResourceRequest::Requester requester;
+    if (!decoder.decodeEnum(requester))
+        return false;
+    resourceRequest.setRequester(requester);
 
     return true;

trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp

@@ -174 +174 @@
     loadParameters.clientCredentialPolicy = (webFrame && webPage && resourceLoader->isAllowedToAskUserForCredentials()) ? AskClientForAllCredentials : DoNotAskClientForAnyCredentials;
     loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = shouldClearReferrerOnHTTPSToHTTPRedirect;
-    loadParameters.isMainResource = resource && resource->type() == CachedResource::MainResource;
     loadParameters.defersLoading = resourceLoader->defersLoading();
     loadParameters.needsCertificateInfo = resourceLoader->shouldIncludeCertificateInfo();