<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[165148] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/165148">165148</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-03-05 17:21:38 -0800 (Wed, 05 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebGL] Use WKSI to see what the system policy for WebGL is
https://bugs.webkit.org/show_bug.cgi?id=129722
<rdar://problem/15790542>
Reviewed by Tim Horton.
Source/WebKit2:
Use the WebKitSystemInterface methods WKShouldBlockWebGL
and WKShouldSuggestBlockingWebGL to query what the host
system thinks about the hardware. Tell the client about
the result in a new WebPage method setSystemWebGLPolicy.
* UIProcess/API/APILoaderClient.h:
(API::LoaderClient::setSystemWebGLLoadPolicy): New empty definition.
* UIProcess/API/C/WKAPICast.h:
(WebKit::toAPI): Convert a WebGLLoadPolicy into a WKWebGLLoadPolicy.
* UIProcess/API/C/WKPage.cpp: Call setSystemWebGLLoadPolicy.
(WKPageSetPageLoaderClient):
* UIProcess/API/C/WKPageLoaderClient.h: New typedef and entry in client structure.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::setSystemWebGLPolicy):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in: Add SetSystemWebGLPolicy.
* Source/WebKit2/Configurations/WebKit2.xcconfig: We have to link against OpenGL now, because WKSI
uses it for hardware detection.
* WebProcess/WebPage/WebPage.cpp: Remove the implementation here, but leave
empty methods for non-Apple platforms.
(WebKit::WebPage::WebPage):
(WebKit::WebPage::webGLPolicyForURL):
(WebKit::WebPage::resolveWebGLPolicyForURL):
* WebProcess/WebPage/WebPage.h: Add m_systemWebGLPolicy.
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::webGLPolicyForURL): Moved in from WebPage, but now they call
into WKSI and send the result to the client if necessary.
(WebKit::WebPage::resolveWebGLPolicyForURL):
Tools:
Dummy entry for setSystemWebGLLoadPolicy.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::createWebViewWithOptions):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPILoaderClienth">trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKAPICasth">trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageLoaderClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165147 => 165148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-06 01:21:23 UTC (rev 165147)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-06 01:21:38 UTC (rev 165148)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2014-03-05 Dean Jackson <dino@apple.com>
+
+ [WebGL] Use WKSI to see what the system policy for WebGL is
+ https://bugs.webkit.org/show_bug.cgi?id=129722
+ <rdar://problem/15790542>
+
+ Reviewed by Tim Horton.
+
+ Use the WebKitSystemInterface methods WKShouldBlockWebGL
+ and WKShouldSuggestBlockingWebGL to query what the host
+ system thinks about the hardware. Tell the client about
+ the result in a new WebPage method setSystemWebGLPolicy.
+
+ * UIProcess/API/APILoaderClient.h:
+ (API::LoaderClient::setSystemWebGLLoadPolicy): New empty definition.
+ * UIProcess/API/C/WKAPICast.h:
+ (WebKit::toAPI): Convert a WebGLLoadPolicy into a WKWebGLLoadPolicy.
+ * UIProcess/API/C/WKPage.cpp: Call setSystemWebGLLoadPolicy.
+ (WKPageSetPageLoaderClient):
+ * UIProcess/API/C/WKPageLoaderClient.h: New typedef and entry in client structure.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::setSystemWebGLPolicy):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in: Add SetSystemWebGLPolicy.
+ * Source/WebKit2/Configurations/WebKit2.xcconfig: We have to link against OpenGL now, because WKSI
+ uses it for hardware detection.
+ * WebProcess/WebPage/WebPage.cpp: Remove the implementation here, but leave
+ empty methods for non-Apple platforms.
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::webGLPolicyForURL):
+ (WebKit::WebPage::resolveWebGLPolicyForURL):
+ * WebProcess/WebPage/WebPage.h: Add m_systemWebGLPolicy.
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::webGLPolicyForURL): Moved in from WebPage, but now they call
+ into WKSI and send the result to the client if necessary.
+ (WebKit::WebPage::resolveWebGLPolicyForURL):
+
</ins><span class="cx"> 2014-03-05 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix a stupid error in r165118 that caused userVisibleString()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPILoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h (165147 => 165148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-03-06 01:21:23 UTC (rev 165147)
+++ trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-03-06 01:21:38 UTC (rev 165148)
</span><span class="lines">@@ -99,6 +99,7 @@
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> virtual WebCore::WebGLLoadPolicy webGLLoadPolicy(WebKit::WebPageProxy*, const WTF::String&) const { return WebCore::WebGLLoadPolicy::WebGLAllowCreation; }
</span><span class="cx"> virtual WebCore::WebGLLoadPolicy resolveWebGLLoadPolicy(WebKit::WebPageProxy*, const WTF::String&) const { return WebCore::WebGLLoadPolicy::WebGLAllowCreation; }
</span><ins>+ virtual void setSystemWebGLLoadPolicy(WebKit::WebPageProxy*, WebCore::WebGLLoadPolicy) const { }
</ins><span class="cx"> #endif // ENABLE(WEBGL)
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (165147 => 165148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2014-03-06 01:21:23 UTC (rev 165147)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2014-03-06 01:21:38 UTC (rev 165148)
</span><span class="lines">@@ -492,6 +492,21 @@
</span><span class="cx"> return WebCore::WebGLAllowCreation;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline WKWebGLLoadPolicy toAPI(WebCore::WebGLLoadPolicy webGLLoadPolicy)
+{
+ switch (webGLLoadPolicy) {
+ case WebCore::WebGLAllowCreation:
+ return kWKWebGLLoadPolicyLoadNormally;
+ case WebCore::WebGLBlockCreation:
+ return kWKWebGLLoadPolicyBlocked;
+ case WebCore::WebGLPendingCreation:
+ return kWKWebGLLoadPolicyPending;
+ }
+
+ ASSERT_NOT_REACHED();
+ return kWKWebGLLoadPolicyLoadNormally;
+}
+
</ins><span class="cx"> inline ProxyingRefPtr<WebGrammarDetail> toAPI(const WebCore::GrammarDetail& grammarDetail)
</span><span class="cx"> {
</span><span class="cx"> return ProxyingRefPtr<WebGrammarDetail>(WebGrammarDetail::create(grammarDetail));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (165147 => 165148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-03-06 01:21:23 UTC (rev 165147)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-03-06 01:21:38 UTC (rev 165148)
</span><span class="lines">@@ -985,6 +985,12 @@
</span><span class="cx"> return loadPolicy;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ virtual void setSystemWebGLLoadPolicy(WebPageProxy* page, WebCore::WebGLLoadPolicy policy) const override
+ {
+ if (m_client.setSystemWebGLLoadPolicy)
+ m_client.setSystemWebGLLoadPolicy(toAPI(page), toAPI(policy), m_client.base.clientInfo);
+ }
+
</ins><span class="cx"> #endif // ENABLE(WEBGL)
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h (165147 => 165148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2014-03-06 01:21:23 UTC (rev 165147)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2014-03-06 01:21:38 UTC (rev 165148)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> typedef WKPluginLoadPolicy (*WKPagePluginLoadPolicyCallback)(WKPageRef page, WKPluginLoadPolicy currentPluginLoadPolicy, WKDictionaryRef pluginInfoDictionary, WKStringRef* unavailabilityDescription, const void* clientInfo);
</span><span class="cx"> typedef void (*WKPagePluginDidFailCallback)(WKPageRef page, WKErrorCode errorCode, WKDictionaryRef pluginInfoDictionary, const void* clientInfo);
</span><span class="cx"> typedef WKWebGLLoadPolicy (*WKPageWebGLLoadPolicyCallback)(WKPageRef page, WKStringRef url, const void* clientInfo);
</span><ins>+typedef void (*WKPageSetSystemWebGLLoadPolicyCallback)(WKPageRef page, WKWebGLLoadPolicy policy, const void* clientInfo);
</ins><span class="cx">
</span><span class="cx"> // Deprecated
</span><span class="cx"> typedef void (*WKPageDidFailToInitializePluginCallback_deprecatedForUseWithV0)(WKPageRef page, WKStringRef mimeType, const void* clientInfo);
</span><span class="lines">@@ -332,6 +333,7 @@
</span><span class="cx"> // Version 4
</span><span class="cx"> WKPageWebGLLoadPolicyCallback webGLLoadPolicy;
</span><span class="cx"> WKPageWebGLLoadPolicyCallback resolveWebGLLoadPolicy;
</span><ins>+ WKPageSetSystemWebGLLoadPolicyCallback setSystemWebGLLoadPolicy;
</ins><span class="cx"> } WKPageLoaderClientV4;
</span><span class="cx">
</span><span class="cx"> // FIXME: These should be deprecated.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (165147 => 165148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-03-06 01:21:23 UTC (rev 165147)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-03-06 01:21:38 UTC (rev 165148)
</span><span class="lines">@@ -2753,6 +2753,11 @@
</span><span class="cx"> {
</span><span class="cx"> loadPolicy = static_cast<uint32_t>(m_loaderClient->resolveWebGLLoadPolicy(this, url));
</span><span class="cx"> }
</span><ins>+
+void WebPageProxy::setSystemWebGLPolicy(uint32_t loadPolicy)
+{
+ m_loaderClient->setSystemWebGLLoadPolicy(this, static_cast<WebCore::WebGLLoadPolicy>(loadPolicy));
+}
</ins><span class="cx"> #endif // ENABLE(WEBGL)
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setToolbarsAreVisible(bool toolbarsAreVisible)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (165147 => 165148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-03-06 01:21:23 UTC (rev 165147)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-03-06 01:21:38 UTC (rev 165148)
</span><span class="lines">@@ -988,6 +988,7 @@
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> void webGLPolicyForURL(const String& url, uint32_t& loadPolicy);
</span><span class="cx"> void resolveWebGLPolicyForURL(const String& url, uint32_t& loadPolicy);
</span><ins>+ void setSystemWebGLPolicy(uint32_t loadPolicy);
</ins><span class="cx"> #endif // ENABLE(WEBGL)
</span><span class="cx"> void setToolbarsAreVisible(bool toolbarsAreVisible);
</span><span class="cx"> void getToolbarsAreVisible(bool& toolbarsAreVisible);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (165147 => 165148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-03-06 01:21:23 UTC (rev 165147)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-03-06 01:21:38 UTC (rev 165148)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> UnavailablePluginButtonClicked(uint32_t pluginUnavailabilityReason, String mimeType, String pluginURLString, String pluginspageAttributeURLString, String frameURLString, String pageURLString)
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> #if ENABLE(WEBGL)
</span><ins>+ SetSystemWebGLPolicy(uint32_t loadPolicy) -> ()
</ins><span class="cx"> WebGLPolicyForURL(String url) -> (uint32_t loadPolicy)
</span><span class="cx"> ResolveWebGLPolicyForURL(String url) -> (uint32_t loadPolicy)
</span><span class="cx"> #endif // ENABLE(WEBGL)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (165147 => 165148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-06 01:21:23 UTC (rev 165147)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-06 01:21:38 UTC (rev 165148)
</span><span class="lines">@@ -296,6 +296,9 @@
</span><span class="cx"> , m_pendingNavigationID(0)
</span><span class="cx"> , m_pageScaleWithoutThumbnailScale(1)
</span><span class="cx"> , m_thumbnailScale(1)
</span><ins>+#if ENABLE(WEBGL)
+ , m_systemWebGLPolicy(WebGLAllowCreation)
+#endif
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_pageID);
</span><span class="cx"> // FIXME: This is a non-ideal location for this Setting and
</span><span class="lines">@@ -616,27 +619,17 @@
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">
</span><del>-#if ENABLE(WEBGL)
</del><ins>+#if ENABLE(WEBGL) && !PLATFORM(MAC)
</ins><span class="cx"> WebCore::WebGLLoadPolicy WebPage::webGLPolicyForURL(WebFrame* frame, const String& url)
</span><span class="cx"> {
</span><del>- uint32_t policyResult = 0;
-
- if (sendSync(Messages::WebPageProxy::WebGLPolicyForURL(url), Messages::WebPageProxy::WebGLPolicyForURL::Reply(policyResult)))
- return static_cast<WebGLLoadPolicy>(policyResult);
-
</del><span class="cx"> return WebGLAllowCreation;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebCore::WebGLLoadPolicy WebPage::resolveWebGLPolicyForURL(WebFrame* frame, const String& url)
</span><span class="cx"> {
</span><del>- uint32_t policyResult = 0;
-
- if (sendSync(Messages::WebPageProxy::ResolveWebGLPolicyForURL(url), Messages::WebPageProxy::ResolveWebGLPolicyForURL::Reply(policyResult)))
- return static_cast<WebGLLoadPolicy>(policyResult);
-
</del><span class="cx"> return WebGLAllowCreation;
</span><span class="cx"> }
</span><del>-#endif // ENABLE(WEBGL)
</del><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> EditorState WebPage::editorState() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (165147 => 165148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-03-06 01:21:23 UTC (rev 165147)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-03-06 01:21:38 UTC (rev 165148)
</span><span class="lines">@@ -1125,6 +1125,10 @@
</span><span class="cx"> double m_pageScaleWithoutThumbnailScale;
</span><span class="cx"> WebCore::IntPoint m_scrollPositionIgnoringThumbnailScale;
</span><span class="cx"> double m_thumbnailScale;
</span><ins>+
+#if ENABLE(WEBGL)
+ WebCore::WebGLLoadPolicy m_systemWebGLPolicy;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (165147 => 165148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-03-06 01:21:23 UTC (rev 165147)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-03-06 01:21:38 UTC (rev 165148)
</span><span class="lines">@@ -956,6 +956,38 @@
</span><span class="cx"> send(Messages::WebPageProxy::DidUpdateViewState());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(WEBGL)
+WebCore::WebGLLoadPolicy WebPage::webGLPolicyForURL(WebFrame* frame, const String& url)
+{
+ if (WKShouldBlockWebGL()) {
+ if (m_systemWebGLPolicy != WebGLBlockCreation)
+ sendSync(Messages::WebPageProxy::SetSystemWebGLPolicy(static_cast<uint32_t>(WebGLBlockCreation)), Messages::WebPageProxy::SetSystemWebGLPolicy::Reply());
+ m_systemWebGLPolicy = WebGLBlockCreation;
+ } else if (WKShouldSuggestBlockingWebGL()) {
+ if (m_systemWebGLPolicy != WebGLPendingCreation)
+ sendSync(Messages::WebPageProxy::SetSystemWebGLPolicy(static_cast<uint32_t>(WebGLPendingCreation)), Messages::WebPageProxy::SetSystemWebGLPolicy::Reply());
+ m_systemWebGLPolicy = WebGLPendingCreation;
+ }
+
+ uint32_t policyResult = 0;
+
+ if (sendSync(Messages::WebPageProxy::WebGLPolicyForURL(url), Messages::WebPageProxy::WebGLPolicyForURL::Reply(policyResult)))
+ return static_cast<WebGLLoadPolicy>(policyResult);
+
+ return WebGLAllowCreation;
+}
+
+WebCore::WebGLLoadPolicy WebPage::resolveWebGLPolicyForURL(WebFrame* frame, const String& url)
+{
+ uint32_t policyResult = 0;
+
+ if (sendSync(Messages::WebPageProxy::ResolveWebGLPolicyForURL(url), Messages::WebPageProxy::ResolveWebGLPolicyForURL::Reply(policyResult)))
+ return static_cast<WebGLLoadPolicy>(policyResult);
+
+ return WebGLAllowCreation;
+}
+#endif // ENABLE(WEBGL)
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (165147 => 165148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-06 01:21:23 UTC (rev 165147)
+++ trunk/Tools/ChangeLog 2014-03-06 01:21:38 UTC (rev 165148)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-03-05 Dean Jackson <dino@apple.com>
+
+ [WebGL] Use WKSI to see what the system policy for WebGL is
+ https://bugs.webkit.org/show_bug.cgi?id=129722
+ <rdar://problem/15790542>
+
+ Reviewed by Tim Horton.
+
+ Dummy entry for setSystemWebGLLoadPolicy.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::createWebViewWithOptions):
+
</ins><span class="cx"> 2014-03-03 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK][CMake] Generate documentation for the DOM bindings
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (165147 => 165148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2014-03-06 01:21:23 UTC (rev 165147)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2014-03-06 01:21:38 UTC (rev 165148)
</span><span class="lines">@@ -487,6 +487,7 @@
</span><span class="cx"> pluginLoadPolicy, // pluginLoadPolicy
</span><span class="cx"> 0, // webGLLoadPolicy
</span><span class="cx"> 0, // resolveWebGLLoadPolicy
</span><ins>+ 0, // setSystemWebGLLoadPolicy
</ins><span class="cx"> };
</span><span class="cx"> WKPageSetPageLoaderClient(m_mainWebView->page(), &pageLoaderClient.base);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>