<!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>[164451] 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/164451">164451</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-02-20 15:11:52 -0800 (Thu, 20 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add an unresolved WebGLPolicy and an API to resolve it
https://bugs.webkit.org/show_bug.cgi?id=129109
Reviewed by Anders Carlsson.
Source/WebCore:
Add a third WebGLLoadPolicy which is "pending" allowing the page
to go ahead with creating the WebGLRenderingContext and resolve the policy
at a later time. Add a new API resolveWebGLLoadPolicy to do the resolution.
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::getContext): WebGLBlock -> WebGLBlockCreation
* loader/FrameLoaderClient.h:
(WebCore::FrameLoaderClient::webGLPolicyForURL): WebGLAllow -> WebGLAllowCreation.
(WebCore::FrameLoaderClient::resolveWebGLPolicyForURL): New method.
* loader/FrameLoaderTypes.h: Add WebGLPendingCreation.
Source/WebKit2:
Add a third WebGLLoadPolicy which is "pending" allowing the page
to go ahead with creating the WebGLRenderingContext and resolve the policy
at a later time. Add a new API resolveWebGLLoadPolicy to do the resolution.
* UIProcess/API/APILoaderClient.h:
(API::LoaderClient::webGLLoadPolicy): New return value.
(API::LoaderClient::resolveWebGLLoadPolicy): New method definition.
* UIProcess/API/C/WKAPICast.h:
(WebKit::toWebGLLoadPolicy): Change names of return types.
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageLoaderClient): New stubs.
* UIProcess/API/C/WKPageLoaderClient.h: New policy type kWKWebGLLoadPolicyPending.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::resolveWebGLPolicyForURL): New method.
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in: New message.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::webGLPolicyForURL):
(WebKit::WebFrameLoaderClient::resolveWebGLPolicyForURL):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::webGLPolicyForURL):
(WebKit::WebPage::resolveWebGLPolicyForURL):
* WebProcess/WebPage/WebPage.h:
Tools:
Add a new entry for resolveWebGLLoadPolicy.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::createWebViewWithOptions):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementcpp">trunk/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderTypesh">trunk/Source/WebCore/loader/FrameLoaderTypes.h</a></li>
<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="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</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="#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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Source/WebCore/ChangeLog 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-02-20 Dean Jackson <dino@apple.com>
+
+ Add an unresolved WebGLPolicy and an API to resolve it
+ https://bugs.webkit.org/show_bug.cgi?id=129109
+
+ Reviewed by Anders Carlsson.
+
+ Add a third WebGLLoadPolicy which is "pending" allowing the page
+ to go ahead with creating the WebGLRenderingContext and resolve the policy
+ at a later time. Add a new API resolveWebGLLoadPolicy to do the resolution.
+
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::HTMLCanvasElement::getContext): WebGLBlock -> WebGLBlockCreation
+ * loader/FrameLoaderClient.h:
+ (WebCore::FrameLoaderClient::webGLPolicyForURL): WebGLAllow -> WebGLAllowCreation.
+ (WebCore::FrameLoaderClient::resolveWebGLPolicyForURL): New method.
+ * loader/FrameLoaderTypes.h: Add WebGLPendingCreation.
+
</ins><span class="cx"> 2014-02-20 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel rendering: Enable compositing RenderLayer painting on device pixel position.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> if (page && !topDocument.url().isLocalFile()) {
</span><span class="cx"> WebGLLoadPolicy policy = page->mainFrame().loader().client().webGLPolicyForURL(topDocument.url());
</span><span class="cx">
</span><del>- if (policy == WebGLBlock)
</del><ins>+ if (policy == WebGLBlockCreation)
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> m_context = WebGLRenderingContext::create(this, static_cast<WebGLContextAttributes*>(attrs));
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -325,7 +325,8 @@
</span><span class="cx"> // Informs the embedder that a WebGL canvas inside this frame received a lost context
</span><span class="cx"> // notification with the given GL_ARB_robustness guilt/innocence code (see Extensions3D.h).
</span><span class="cx"> virtual void didLoseWebGLContext(int) { }
</span><del>- virtual WebGLLoadPolicy webGLPolicyForURL(const String&) const { return WebGLAllow; }
</del><ins>+ virtual WebGLLoadPolicy webGLPolicyForURL(const String&) const { return WebGLAllowCreation; }
+ virtual WebGLLoadPolicy resolveWebGLPolicyForURL(const String&) const { return WebGLAllowCreation; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual void forcePageTransitionIfNeeded() { }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderTypes.h (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderTypes.h 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Source/WebCore/loader/FrameLoaderTypes.h 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -107,8 +107,9 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum WebGLLoadPolicy {
</span><del>- WebGLBlock = 0,
- WebGLAllow
</del><ins>+ WebGLBlockCreation,
+ WebGLAllowCreation,
+ WebGLPendingCreation
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-02-20 Dean Jackson <dino@apple.com>
+
+ Add an unresolved WebGLPolicy and an API to resolve it
+ https://bugs.webkit.org/show_bug.cgi?id=129109
+
+ Reviewed by Anders Carlsson.
+
+ Add a third WebGLLoadPolicy which is "pending" allowing the page
+ to go ahead with creating the WebGLRenderingContext and resolve the policy
+ at a later time. Add a new API resolveWebGLLoadPolicy to do the resolution.
+
+ * UIProcess/API/APILoaderClient.h:
+ (API::LoaderClient::webGLLoadPolicy): New return value.
+ (API::LoaderClient::resolveWebGLLoadPolicy): New method definition.
+ * UIProcess/API/C/WKAPICast.h:
+ (WebKit::toWebGLLoadPolicy): Change names of return types.
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageLoaderClient): New stubs.
+ * UIProcess/API/C/WKPageLoaderClient.h: New policy type kWKWebGLLoadPolicyPending.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::resolveWebGLPolicyForURL): New method.
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in: New message.
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::webGLPolicyForURL):
+ (WebKit::WebFrameLoaderClient::resolveWebGLPolicyForURL):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::webGLPolicyForURL):
+ (WebKit::WebPage::resolveWebGLPolicyForURL):
+ * WebProcess/WebPage/WebPage.h:
+
</ins><span class="cx"> 2014-02-20 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Make it possible to reply asynchronously to JavaScript panels and alerts
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPILoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -97,7 +97,8 @@
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGL)
</span><del>- virtual WebCore::WebGLLoadPolicy webGLLoadPolicy(WebKit::WebPageProxy*, const WTF::String&) const { return WebCore::WebGLLoadPolicy::WebGLAllow; }
</del><ins>+ virtual WebCore::WebGLLoadPolicy webGLLoadPolicy(WebKit::WebPageProxy*, const WTF::String&) const { return WebCore::WebGLLoadPolicy::WebGLAllowCreation; }
+ virtual WebCore::WebGLLoadPolicy resolveWebGLLoadPolicy(WebKit::WebPageProxy*, const WTF::String&) const { return WebCore::WebGLLoadPolicy::WebGLAllowCreation; }
</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 (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -481,13 +481,15 @@
</span><span class="cx"> {
</span><span class="cx"> switch (webGLLoadPolicy) {
</span><span class="cx"> case kWKWebGLLoadPolicyLoadNormally:
</span><del>- return WebCore::WebGLAllow;
</del><ins>+ return WebCore::WebGLAllowCreation;
</ins><span class="cx"> case kWKWebGLLoadPolicyBlocked:
</span><del>- return WebCore::WebGLBlock;
</del><ins>+ return WebCore::WebGLBlockCreation;
+ case kWKWebGLLoadPolicyPending:
+ return WebCore::WebGLPendingCreation;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return WebCore::WebGLAllow;
</del><ins>+ return WebCore::WebGLAllowCreation;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline ProxyingRefPtr<WebGrammarDetail> toAPI(const WebCore::GrammarDetail& grammarDetail)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -967,13 +967,24 @@
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> virtual WebCore::WebGLLoadPolicy webGLLoadPolicy(WebPageProxy* page, const String& url) const override
</span><span class="cx"> {
</span><del>- WebCore::WebGLLoadPolicy loadPolicy = WebGLAllow;
</del><ins>+ WebCore::WebGLLoadPolicy loadPolicy = WebGLAllowCreation;
</ins><span class="cx">
</span><span class="cx"> if (m_client.webGLLoadPolicy)
</span><span class="cx"> loadPolicy = toWebGLLoadPolicy(m_client.webGLLoadPolicy(toAPI(page), toAPI(url.impl()), m_client.base.clientInfo));
</span><span class="cx">
</span><span class="cx"> return loadPolicy;
</span><span class="cx"> }
</span><ins>+
+ virtual WebCore::WebGLLoadPolicy resolveWebGLLoadPolicy(WebPageProxy* page, const String& url) const override
+ {
+ WebCore::WebGLLoadPolicy loadPolicy = WebGLAllowCreation;
+
+ if (m_client.resolveWebGLLoadPolicy)
+ loadPolicy = toWebGLLoadPolicy(m_client.resolveWebGLLoadPolicy(toAPI(page), toAPI(url.impl()), m_client.base.clientInfo));
+
+ return loadPolicy;
+ }
+
</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 (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> enum {
</span><span class="cx"> kWKWebGLLoadPolicyBlocked = 0,
</span><span class="cx"> kWKWebGLLoadPolicyLoadNormally,
</span><ins>+ kWKWebGLLoadPolicyPending
</ins><span class="cx"> };
</span><span class="cx"> typedef uint32_t WKWebGLLoadPolicy;
</span><span class="cx">
</span><span class="lines">@@ -330,6 +331,7 @@
</span><span class="cx">
</span><span class="cx"> // Version 4
</span><span class="cx"> WKPageWebGLLoadPolicyCallback webGLLoadPolicy;
</span><ins>+ WKPageWebGLLoadPolicyCallback resolveWebGLLoadPolicy;
</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 (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -2751,6 +2751,11 @@
</span><span class="cx"> {
</span><span class="cx"> loadPolicy = static_cast<uint32_t>(m_loaderClient->webGLLoadPolicy(this, url));
</span><span class="cx"> }
</span><ins>+
+void WebPageProxy::resolveWebGLPolicyForURL(const String& url, uint32_t& loadPolicy)
+{
+ loadPolicy = static_cast<uint32_t>(m_loaderClient->resolveWebGLLoadPolicy(this, url));
+}
</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 (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -967,6 +967,7 @@
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> void webGLPolicyForURL(const String& url, uint32_t& loadPolicy);
</span><ins>+ void resolveWebGLPolicyForURL(const String& url, 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 (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> WebGLPolicyForURL(String url) -> (uint32_t loadPolicy)
</span><ins>+ ResolveWebGLPolicyForURL(String url) -> (uint32_t loadPolicy)
</ins><span class="cx"> #endif // ENABLE(WEBGL)
</span><span class="cx"> DidChangeViewportProperties(WebCore::ViewportAttributes attributes)
</span><span class="cx"> DidReceiveEvent(uint32_t type, bool handled)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -1348,8 +1348,16 @@
</span><span class="cx"> if (WebPage* webPage = m_frame->page())
</span><span class="cx"> return webPage->webGLPolicyForURL(m_frame, url);
</span><span class="cx">
</span><del>- return WebGLAllow;
</del><ins>+ return WebGLAllowCreation;
</ins><span class="cx"> }
</span><ins>+
+WebCore::WebGLLoadPolicy WebFrameLoaderClient::resolveWebGLPolicyForURL(const String& url) const
+{
+ if (WebPage* webPage = m_frame->page())
+ return webPage->resolveWebGLPolicyForURL(m_frame, url);
+
+ return WebGLAllowCreation;
+}
</ins><span class="cx"> #endif // ENABLE(WEBGL)
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize& pluginSize, HTMLAppletElement* appletElement, const URL&, const Vector<String>& paramNames, const Vector<String>& paramValues)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -187,6 +187,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> virtual WebCore::WebGLLoadPolicy webGLPolicyForURL(const String&) const override;
</span><ins>+ virtual WebCore::WebGLLoadPolicy resolveWebGLPolicyForURL(const String&) const override;
</ins><span class="cx"> #endif // ENABLE(WEBGL)
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::URL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -620,8 +620,18 @@
</span><span class="cx"> if (sendSync(Messages::WebPageProxy::WebGLPolicyForURL(url), Messages::WebPageProxy::WebGLPolicyForURL::Reply(policyResult)))
</span><span class="cx"> return static_cast<WebGLLoadPolicy>(policyResult);
</span><span class="cx">
</span><del>- return WebGLAllow;
</del><ins>+ return WebGLAllowCreation;
</ins><span class="cx"> }
</span><ins>+
+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;
+}
</ins><span class="cx"> #endif // ENABLE(WEBGL)
</span><span class="cx">
</span><span class="cx"> EditorState WebPage::editorState() const
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -306,6 +306,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> WebCore::WebGLLoadPolicy webGLPolicyForURL(WebFrame*, const String&);
</span><ins>+ WebCore::WebGLLoadPolicy resolveWebGLPolicyForURL(WebFrame*, const String&);
</ins><span class="cx"> #endif // ENABLE(WEBGL)
</span><span class="cx">
</span><span class="cx"> EditorState editorState() const;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Tools/ChangeLog 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-20 Dean Jackson <dino@apple.com>
+
+ Add an unresolved WebGLPolicy and an API to resolve it
+ https://bugs.webkit.org/show_bug.cgi?id=129109
+
+ Reviewed by Anders Carlsson.
+
+ Add a new entry for resolveWebGLLoadPolicy.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::createWebViewWithOptions):
+
</ins><span class="cx"> 2014-02-19 Gustavo Noronha Silva <gustavo.noronha@collabora.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add new ARM build slave for GTK+
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (164450 => 164451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2014-02-20 23:04:31 UTC (rev 164450)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2014-02-20 23:11:52 UTC (rev 164451)
</span><span class="lines">@@ -476,6 +476,7 @@
</span><span class="cx"> 0, // pluginDidFail
</span><span class="cx"> pluginLoadPolicy, // pluginLoadPolicy
</span><span class="cx"> 0, // webGLLoadPolicy
</span><ins>+ 0, // resolveWebGLLoadPolicy
</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>