Changeset 173558 in webkit
- Timestamp:
- Sep 12, 2014 8:42:11 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r173555 r173558 1 2014-09-12 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 REGRESSION(r173423): CertificateInfo is never sent to the UI process when using shared secondary process model 4 https://bugs.webkit.org/show_bug.cgi?id=136669 5 6 Reviewed by Antti Koivisto. 7 8 Add CertificateInfoPolicy option to ResourceLoaderOptions. It's 9 set to DoNotIncludeCertificateInfo for all loads except the main 10 resource load. 11 12 * loader/DocumentLoader.cpp: 13 (WebCore::DocumentLoader::startLoadingMainResource): Pass 14 IncludeCertificateInfo to ResourceLoaderOptions. 15 * loader/NetscapePlugInStreamLoader.cpp: 16 (WebCore::NetscapePlugInStreamLoader::NetscapePlugInStreamLoader): 17 Pass DoNotIncludeCertificateInfo to ResourceLoaderOptions(). 18 * loader/ResourceLoader.h: 19 (WebCore::ResourceLoader::shouldIncludeCertificateInfo): Return 20 true if IncludeCertificateInfo option was given. 21 * loader/ResourceLoaderOptions.h: 22 (WebCore::ResourceLoaderOptions::ResourceLoaderOptions): 23 (WebCore::ResourceLoaderOptions::certificateInfoPolicy): 24 (WebCore::ResourceLoaderOptions::setCertificateInfoPolicy): 25 * loader/SubresourceLoader.cpp: 26 (WebCore::SubresourceLoader::didReceiveResponse): If 27 IncludeCertificateInfo option is present, call 28 includeCertificateInfo() on the response. 29 * loader/cache/CachedResourceLoader.cpp: 30 (WebCore::CachedResourceLoader::requestUserCSSStyleSheet): Pass 31 DoNotIncludeCertificateInfo to ResourceLoaderOptions(). 32 (WebCore::CachedResourceLoader::defaultCachedResourceOptions): Ditto. 33 * loader/icon/IconLoader.cpp: 34 (WebCore::IconLoader::startLoading): Ditto. 35 * platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp: 36 (WebCore::WebCoreAVCFResourceLoader::startLoading): Ditto. 37 * platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm: 38 (WebCore::WebCoreAVFResourceLoader::startLoading): Ditto. 39 * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp: 40 (CachedResourceStreamingClient::CachedResourceStreamingClient): Ditto. 41 1 42 2014-09-11 Ryuan Choi <ryuan.choi@gmail.com> 2 43 -
trunk/Source/WebCore/loader/DocumentLoader.cpp
r173272 r173558 1433 1433 1434 1434 ResourceRequest request(m_request); 1435 static NeverDestroyed<ResourceLoaderOptions> mainResourceLoadOptions(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, AskClientForAllCredentials, SkipSecurityCheck, UseDefaultOriginRestrictionsForType );1435 static NeverDestroyed<ResourceLoaderOptions> mainResourceLoadOptions(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, AskClientForAllCredentials, SkipSecurityCheck, UseDefaultOriginRestrictionsForType, IncludeCertificateInfo); 1436 1436 CachedResourceRequest cachedResourceRequest(request, mainResourceLoadOptions); 1437 1437 m_mainResource = m_cachedResourceLoader->requestMainResource(cachedResourceRequest); -
trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp
r165676 r173558 38 38 39 39 NetscapePlugInStreamLoader::NetscapePlugInStreamLoader(Frame* frame, NetscapePlugInStreamLoaderClient* client) 40 : ResourceLoader(frame, ResourceLoaderOptions(SendCallbacks, SniffContent, DoNotBufferData, AllowStoredCredentials, AskClientForAllCredentials, SkipSecurityCheck, UseDefaultOriginRestrictionsForType ))40 : ResourceLoader(frame, ResourceLoaderOptions(SendCallbacks, SniffContent, DoNotBufferData, AllowStoredCredentials, AskClientForAllCredentials, SkipSecurityCheck, UseDefaultOriginRestrictionsForType, DoNotIncludeCertificateInfo)) 41 41 , m_client(client) 42 42 { -
trunk/Source/WebCore/loader/ResourceLoader.h
r173516 r173558 124 124 bool shouldSniffContent() const { return m_options.sniffContent() == SniffContent; } 125 125 WEBCORE_EXPORT bool isAllowedToAskUserForCredentials() const; 126 bool shouldIncludeCertificateInfo() const { return m_options.certificateInfoPolicy() == IncludeCertificateInfo; } 126 127 127 128 bool reachedTerminalState() const { return m_reachedTerminalState; } -
trunk/Source/WebCore/loader/ResourceLoaderOptions.h
r170381 r173558 62 62 }; 63 63 64 enum CertificateInfoPolicy { 65 IncludeCertificateInfo, 66 DoNotIncludeCertificateInfo 67 }; 68 64 69 struct ResourceLoaderOptions { 65 70 ResourceLoaderOptions() … … 71 76 , m_securityCheck(DoSecurityCheck) 72 77 , m_requestOriginPolicy(UseDefaultOriginRestrictionsForType) 78 , m_certificateInfoPolicy(DoNotIncludeCertificateInfo) 73 79 { 74 80 } 75 81 76 ResourceLoaderOptions(SendCallbackPolicy sendLoadCallbacks, ContentSniffingPolicy sniffContent, DataBufferingPolicy dataBufferingPolicy, StoredCredentials allowCredentials, ClientCredentialPolicy credentialPolicy, SecurityCheckPolicy securityCheck, RequestOriginPolicy requestOriginPolicy )82 ResourceLoaderOptions(SendCallbackPolicy sendLoadCallbacks, ContentSniffingPolicy sniffContent, DataBufferingPolicy dataBufferingPolicy, StoredCredentials allowCredentials, ClientCredentialPolicy credentialPolicy, SecurityCheckPolicy securityCheck, RequestOriginPolicy requestOriginPolicy, CertificateInfoPolicy certificateInfoPolicy) 77 83 : m_sendLoadCallbacks(sendLoadCallbacks) 78 84 , m_sniffContent(sniffContent) … … 82 88 , m_securityCheck(securityCheck) 83 89 , m_requestOriginPolicy(requestOriginPolicy) 90 , m_certificateInfoPolicy(certificateInfoPolicy) 84 91 { 85 92 } … … 99 106 RequestOriginPolicy requestOriginPolicy() const { return static_cast<RequestOriginPolicy>(m_requestOriginPolicy); } 100 107 void setRequestOriginPolicy(RequestOriginPolicy policy) { m_requestOriginPolicy = policy; } 108 CertificateInfoPolicy certificateInfoPolicy() const { return static_cast<CertificateInfoPolicy>(m_certificateInfoPolicy); } 109 void setCertificateInfoPolicy(CertificateInfoPolicy policy) { m_certificateInfoPolicy = policy; } 101 110 102 111 unsigned m_sendLoadCallbacks : 1; … … 107 116 unsigned m_securityCheck : 1; 108 117 unsigned m_requestOriginPolicy : 2; 118 unsigned m_certificateInfoPolicy : 1; // Whether the response should include certificate info. 109 119 }; 110 120 -
trunk/Source/WebCore/loader/SubresourceLoader.cpp
r172790 r173558 196 196 Ref<SubresourceLoader> protect(*this); 197 197 198 if (shouldIncludeCertificateInfo()) 199 response.includeCertificateInfo(); 200 198 201 if (m_resource->resourceToRevalidate()) { 199 202 if (response.httpStatusCode() == 304) { -
trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp
r173173 r173558 212 212 // FIXME: loadResource calls setOwningCachedResourceLoader() if the resource couldn't be added to cache. Does this function need to call it, too? 213 213 214 userSheet->load(this, ResourceLoaderOptions(DoNotSendCallbacks, SniffContent, BufferData, AllowStoredCredentials, AskClientForAllCredentials, SkipSecurityCheck, UseDefaultOriginRestrictionsForType ));214 userSheet->load(this, ResourceLoaderOptions(DoNotSendCallbacks, SniffContent, BufferData, AllowStoredCredentials, AskClientForAllCredentials, SkipSecurityCheck, UseDefaultOriginRestrictionsForType, DoNotIncludeCertificateInfo)); 215 215 216 216 return userSheet; … … 975 975 const ResourceLoaderOptions& CachedResourceLoader::defaultCachedResourceOptions() 976 976 { 977 static ResourceLoaderOptions options(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, AskClientForAllCredentials, DoSecurityCheck, UseDefaultOriginRestrictionsForType );977 static ResourceLoaderOptions options(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, AskClientForAllCredentials, DoSecurityCheck, UseDefaultOriginRestrictionsForType, DoNotIncludeCertificateInfo); 978 978 return options; 979 979 } -
trunk/Source/WebCore/loader/icon/IconLoader.cpp
r171743 r173558 60 60 return; 61 61 62 CachedResourceRequest request(ResourceRequest(m_frame.loader().icon().url()), ResourceLoaderOptions(SendCallbacks, SniffContent, BufferData, DoNotAllowStoredCredentials, DoNotAskClientForAnyCredentials, DoSecurityCheck, UseDefaultOriginRestrictionsForType ));62 CachedResourceRequest request(ResourceRequest(m_frame.loader().icon().url()), ResourceLoaderOptions(SendCallbacks, SniffContent, BufferData, DoNotAllowStoredCredentials, DoNotAskClientForAnyCredentials, DoSecurityCheck, UseDefaultOriginRestrictionsForType, DoNotIncludeCertificateInfo)); 63 63 64 64 request.mutableResourceRequest().setPriority(ResourceLoadPriorityLow); -
trunk/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp
r170562 r173558 73 73 URL requestURL = CFURLRequestGetURL(urlRequest.get()); 74 74 75 CachedResourceRequest request(ResourceRequest(requestURL), ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, BufferData, DoNotAllowStoredCredentials, DoNotAskClientForCrossOriginCredentials, DoSecurityCheck, UseDefaultOriginRestrictionsForType ));75 CachedResourceRequest request(ResourceRequest(requestURL), ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, BufferData, DoNotAllowStoredCredentials, DoNotAskClientForCrossOriginCredentials, DoSecurityCheck, UseDefaultOriginRestrictionsForType, DoNotIncludeCertificateInfo)); 76 76 77 77 request.mutableResourceRequest().setPriority(ResourceLoadPriorityLow); -
trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm
r167264 r173558 69 69 URL requestURL = [[m_avRequest.get() request] URL]; 70 70 71 CachedResourceRequest request(ResourceRequest(requestURL), ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, BufferData, DoNotAllowStoredCredentials, DoNotAskClientForCrossOriginCredentials, DoSecurityCheck, UseDefaultOriginRestrictionsForType ));71 CachedResourceRequest request(ResourceRequest(requestURL), ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, BufferData, DoNotAllowStoredCredentials, DoNotAskClientForCrossOriginCredentials, DoSecurityCheck, UseDefaultOriginRestrictionsForType, DoNotIncludeCertificateInfo)); 72 72 73 73 request.mutableResourceRequest().setPriority(ResourceLoadPriorityLow); -
trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
r172928 r173558 1001 1001 RequestOriginPolicy corsPolicy = corsMode != MediaPlayerClient::Unspecified ? PotentiallyCrossOriginEnabled : UseDefaultOriginRestrictionsForType; 1002 1002 StoredCredentials allowCredentials = corsMode == MediaPlayerClient::UseCredentials ? AllowStoredCredentials : DoNotAllowStoredCredentials; 1003 ResourceLoaderOptions options(SendCallbacks, DoNotSniffContent, bufferingPolicy, allowCredentials, DoNotAskClientForCrossOriginCredentials, DoSecurityCheck, corsPolicy );1003 ResourceLoaderOptions options(SendCallbacks, DoNotSniffContent, bufferingPolicy, allowCredentials, DoNotAskClientForCrossOriginCredentials, DoSecurityCheck, corsPolicy, DoNotIncludeCertificateInfo); 1004 1004 1005 1005 CachedResourceRequest cacheRequest(request, options); -
trunk/Source/WebKit2/ChangeLog
r173553 r173558 1 2014-09-12 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 REGRESSION(r173423): CertificateInfo is never sent to the UI process when using shared secondary process model 4 https://bugs.webkit.org/show_bug.cgi?id=136669 5 6 Reviewed by Antti Koivisto. 7 8 * WebProcess/Network/WebResourceLoadScheduler.cpp: 9 (WebKit::WebResourceLoadScheduler::scheduleLoad): Use 10 ResourceLoader::shouldIncludeCertificateInfo() to initialize 11 needsCertificateInfo parameter. 12 1 13 2014-09-11 Ryuan Choi <ryuan.choi@gmail.com> 2 14 -
trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp
r173516 r173558 174 174 loadParameters.isMainResource = resource && resource->type() == CachedResource::MainResource; 175 175 loadParameters.defersLoading = resourceLoader->defersLoading(); 176 loadParameters.needsCertificateInfo = loadParameters.isMainResource;176 loadParameters.needsCertificateInfo = resourceLoader->shouldIncludeCertificateInfo(); 177 177 loadParameters.maximumBufferingTime = maximumBufferingTime(resource); 178 178 -
trunk/Tools/ChangeLog
r173557 r173558 1 2014-09-12 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 REGRESSION(r173423): CertificateInfo is never sent to the UI process when using shared secondary process model 4 https://bugs.webkit.org/show_bug.cgi?id=136669 5 6 Reviewed by Antti Koivisto. 7 8 * Scripts/run-gtk-tests: 9 (TestRunner): Unskip SSL test. 10 1 11 2014-09-12 Eric Carlson <eric.carlson@apple.com> 2 12 -
trunk/Tools/Scripts/run-gtk-tests
r173435 r173558 68 68 SkippedTest("WebKit2Gtk/TestWebKitWebView", "/webkit2/WebKitWebView/page-visibility", "Test fails or times out", 131731), 69 69 SkippedTest("WebKit2Gtk/TestCookieManager", "/webkit2/WebKitCookieManager/persistent-storage", "Test is flaky", 134580), 70 SkippedTest("WebKit2Gtk/TestSSL", "/webkit2/WebKitWebView/ssl", "Assert fails after r173423", 136669),71 70 SkippedTest("WebKit2/TestWebKit2", "WebKit2.MouseMoveAfterCrash", "Test is flaky", 85066), 72 71 SkippedTest("WebKit2/TestWebKit2", "WebKit2.NewFirstVisuallyNonEmptyLayoutForImages", "Test is flaky", 85066),
Note: See TracChangeset
for help on using the changeset viewer.