Changeset 165276 in webkit
- Timestamp:
- Mar 7, 2014 12:20:17 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r165273 r165276 1 2014-03-07 Roger Fong <roger_fong@apple.com> 2 3 Replace setSystemWebGLLoadPolicy API with methods to query for WebGL blocking policy. 4 https://bugs.webkit.org/show_bug.cgi?id=129873. 5 6 Reviewed by Dean Jackson. 7 8 Remove setSystemWebGLLoadPolicy API. 9 * UIProcess/API/APILoaderClient.h: 10 (API::LoaderClient::resolveWebGLLoadPolicy): 11 * UIProcess/API/C/WKPage.cpp: 12 (WKPageSetPageLoaderClient): 13 * UIProcess/API/C/WKPageLoaderClient.h: 14 * UIProcess/WebPageProxy.cpp: 15 (WebKit::WebPageProxy::resolveWebGLPolicyForURL): 16 * UIProcess/WebPageProxy.h: 17 * UIProcess/WebPageProxy.messages.in: 18 * WebProcess/WebPage/mac/WebPageMac.mm: 19 (WebKit::WebPage::webGLPolicyForURL): 20 21 Add API to directly query the WebGL blocking policies from WKSI. 22 * UIProcess/API/C/mac/WKContextPrivateMac.h: 23 * UIProcess/API/C/mac/WKContextPrivateMac.mm: 24 (WKContextShouldBlockWebGL): 25 (WKContextShouldSuggestBlockWebGL): 26 1 27 2014-03-07 Eric Carlson <eric.carlson@apple.com> 2 28 -
trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h
r165148 r165276 100 100 virtual WebCore::WebGLLoadPolicy webGLLoadPolicy(WebKit::WebPageProxy*, const WTF::String&) const { return WebCore::WebGLLoadPolicy::WebGLAllowCreation; } 101 101 virtual WebCore::WebGLLoadPolicy resolveWebGLLoadPolicy(WebKit::WebPageProxy*, const WTF::String&) const { return WebCore::WebGLLoadPolicy::WebGLAllowCreation; } 102 virtual void setSystemWebGLLoadPolicy(WebKit::WebPageProxy*, WebCore::WebGLLoadPolicy) const { }103 102 #endif // ENABLE(WEBGL) 104 103 }; -
trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp
r165148 r165276 986 986 } 987 987 988 virtual void setSystemWebGLLoadPolicy(WebPageProxy* page, WebCore::WebGLLoadPolicy policy) const override989 {990 if (m_client.setSystemWebGLLoadPolicy)991 m_client.setSystemWebGLLoadPolicy(toAPI(page), toAPI(policy), m_client.base.clientInfo);992 }993 994 988 #endif // ENABLE(WEBGL) 995 989 }; -
trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h
r165148 r165276 75 75 typedef void (*WKPagePluginDidFailCallback)(WKPageRef page, WKErrorCode errorCode, WKDictionaryRef pluginInfoDictionary, const void* clientInfo); 76 76 typedef WKWebGLLoadPolicy (*WKPageWebGLLoadPolicyCallback)(WKPageRef page, WKStringRef url, const void* clientInfo); 77 typedef void (*WKPageSetSystemWebGLLoadPolicyCallback)(WKPageRef page, WKWebGLLoadPolicy policy, const void* clientInfo);78 77 79 78 // Deprecated … … 334 333 WKPageWebGLLoadPolicyCallback webGLLoadPolicy; 335 334 WKPageWebGLLoadPolicyCallback resolveWebGLLoadPolicy; 336 WKPageSetSystemWebGLLoadPolicyCallback setSystemWebGLLoadPolicy;337 335 } WKPageLoaderClientV4; 338 336 -
trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h
r160939 r165276 68 68 WK_EXPORT WKStringRef WKPlugInInfoIsSandboxedKey(); 69 69 70 WK_EXPORT bool WKContextShouldBlockWebGL(); 71 WK_EXPORT bool WKContextShouldSuggestBlockWebGL(); 72 70 73 #ifdef __cplusplus 71 74 } -
trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm
r161291 r165276 138 138 return WKPluginInformationHasSandboxProfileKey(); 139 139 } 140 141 bool WKContextShouldBlockWebGL() 142 { 143 return WKShouldBlockWebGL(); 144 } 145 146 bool WKContextShouldSuggestBlockWebGL() 147 { 148 return WKShouldSuggestBlockingWebGL(); 149 } -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r165148 r165276 2754 2754 loadPolicy = static_cast<uint32_t>(m_loaderClient->resolveWebGLLoadPolicy(this, url)); 2755 2755 } 2756 2757 void WebPageProxy::setSystemWebGLPolicy(uint32_t loadPolicy)2758 {2759 m_loaderClient->setSystemWebGLLoadPolicy(this, static_cast<WebCore::WebGLLoadPolicy>(loadPolicy));2760 }2761 2756 #endif // ENABLE(WEBGL) 2762 2757 -
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
r165148 r165276 989 989 void webGLPolicyForURL(const String& url, uint32_t& loadPolicy); 990 990 void resolveWebGLPolicyForURL(const String& url, uint32_t& loadPolicy); 991 void setSystemWebGLPolicy(uint32_t loadPolicy);992 991 #endif // ENABLE(WEBGL) 993 992 void setToolbarsAreVisible(bool toolbarsAreVisible); -
trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in
r165148 r165276 35 35 #endif // ENABLE(NETSCAPE_PLUGIN_API) 36 36 #if ENABLE(WEBGL) 37 SetSystemWebGLPolicy(uint32_t loadPolicy) -> ()38 37 WebGLPolicyForURL(String url) -> (uint32_t loadPolicy) 39 38 ResolveWebGLPolicyForURL(String url) -> (uint32_t loadPolicy) -
trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
r165148 r165276 960 960 WebCore::WebGLLoadPolicy WebPage::webGLPolicyForURL(WebFrame* frame, const String& url) 961 961 { 962 if (WKShouldBlockWebGL()) {963 if (m_systemWebGLPolicy != WebGLBlockCreation)964 sendSync(Messages::WebPageProxy::SetSystemWebGLPolicy(static_cast<uint32_t>(WebGLBlockCreation)), Messages::WebPageProxy::SetSystemWebGLPolicy::Reply());965 m_systemWebGLPolicy = WebGLBlockCreation;966 } else if (WKShouldSuggestBlockingWebGL()) {967 if (m_systemWebGLPolicy != WebGLPendingCreation)968 sendSync(Messages::WebPageProxy::SetSystemWebGLPolicy(static_cast<uint32_t>(WebGLPendingCreation)), Messages::WebPageProxy::SetSystemWebGLPolicy::Reply());969 m_systemWebGLPolicy = WebGLPendingCreation;970 }971 972 962 uint32_t policyResult = 0; 973 963 -
trunk/Tools/ChangeLog
r165274 r165276 1 2014-03-07 Roger Fong <roger_fong@apple.com> 2 3 Remove dummy setSystemWebGLLoadPolicy client method. 4 https://bugs.webkit.org/show_bug.cgi?id=129873. 5 6 Reviewed by Dean Jackson. 7 8 * WebKitTestRunner/TestController.cpp: 9 (WTR::TestController::createWebViewWithOptions): 10 1 11 2014-03-07 Mark Hahnenberg <mhahnenberg@apple.com> 2 12 -
trunk/Tools/WebKitTestRunner/TestController.cpp
r165148 r165276 488 488 0, // webGLLoadPolicy 489 489 0, // resolveWebGLLoadPolicy 490 0, // setSystemWebGLLoadPolicy491 490 }; 492 491 WKPageSetPageLoaderClient(m_mainWebView->page(), &pageLoaderClient.base);
Note: See TracChangeset
for help on using the changeset viewer.