<!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>[162099] 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/162099">162099</a></dd>
<dt>Author</dt> <dd>roger_fong@apple.com</dd>
<dt>Date</dt> <dd>2014-01-15 16:07:03 -0800 (Wed, 15 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unnecessary call to webGLContextCreated
https://bugs.webkit.org/show_bug.cgi?id=127000
Reviewed by Brent Fulgham.
Source/WebCore:
Note that the functionality of webGLContextCreated will be handled by webGLPolicyForSite now.
Tests: Unskipping tests skipped in <a href="http://trac.webkit.org/projects/webkit/changeset/162002">r162002</a>.
* html/HTMLCanvasElement.cpp: Remove webGLContextCreated call.
(WebCore::HTMLCanvasElement::getContext):
* loader/FrameLoaderClient.h:
Have the returned load policy default to WebGLAllow so as to not break clients that don't implement the method.
(WebCore::FrameLoaderClient::webGLPolicyForSite):
webGLPolicyForSite is now assuming the role of webGLContextCreated as well, pass in the whole site URL instead of just the host.
* page/ChromeClient.h: Remove webGLContextCreated method.
(WebCore::ChromeClient::decrementActivePageCount):
LayoutTests:
* platform/mac/TestExpectations: Unskipping tests skipped in <a href="http://trac.webkit.org/projects/webkit/changeset/162002">r162002</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<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="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (162098 => 162099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-15 23:51:25 UTC (rev 162098)
+++ trunk/LayoutTests/ChangeLog 2014-01-16 00:07:03 UTC (rev 162099)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-15 Roger Fong <roger_fong@apple.com>
+
+ Remove unnecessary call to webGLContextCreated
+ https://bugs.webkit.org/show_bug.cgi?id=127000
+
+ Reviewed by Brent Fulgham.
+
+ * platform/mac/TestExpectations: Unskipping tests skipped in r162002.
+
</ins><span class="cx"> 2014-01-15 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: capture probe samples on the backend
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (162098 => 162099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2014-01-15 23:51:25 UTC (rev 162098)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2014-01-16 00:07:03 UTC (rev 162099)
</span><span class="lines">@@ -726,14 +726,6 @@
</span><span class="cx"> webgl/1.0.2/conformance/context/context-attribute-preserve-drawing-buffer.html [ Pass Failure ]
</span><span class="cx"> http/tests/webgl/1.0.2/origin-clean-conformance.html [ Skip ]
</span><span class="cx">
</span><del>-# https://bugs.webkit.org/show_bug.cgi?id=127000
-http/tests/canvas/webgl/origin-clean-conformance.html
-http/tests/webgl/1.0.2/texSubImage2DHTML.html
-http/tests/security/webgl-remote-read-remote-image-allowed.html
-http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials.html
-http/tests/webgl/1.0.2/texImage2DHTML.html
-http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin.html
-
</del><span class="cx"> # Sending the mouse down event to the scrollbar starts a nested run loop which causes a hang.
</span><span class="cx"> fast/events/mousedown-in-subframe-scrollbar.html
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162098 => 162099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-15 23:51:25 UTC (rev 162098)
+++ trunk/Source/WebCore/ChangeLog 2014-01-16 00:07:03 UTC (rev 162099)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-01-15 Roger Fong <roger_fong@apple.com>
+
+ Remove unnecessary call to webGLContextCreated
+ https://bugs.webkit.org/show_bug.cgi?id=127000
+
+ Reviewed by Brent Fulgham.
+
+ Note that the functionality of webGLContextCreated will be handled by webGLPolicyForSite now.
+
+ Tests: Unskipping tests skipped in r162002.
+
+ * html/HTMLCanvasElement.cpp: Remove webGLContextCreated call.
+ (WebCore::HTMLCanvasElement::getContext):
+ * loader/FrameLoaderClient.h:
+ Have the returned load policy default to WebGLAllow so as to not break clients that don't implement the method.
+ (WebCore::FrameLoaderClient::webGLPolicyForSite):
+ webGLPolicyForSite is now assuming the role of webGLContextCreated as well, pass in the whole site URL instead of just the host.
+ * page/ChromeClient.h: Remove webGLContextCreated method.
+ (WebCore::ChromeClient::decrementActivePageCount):
+
</ins><span class="cx"> 2014-01-15 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Repeating background images should continue into margin tiles
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (162098 => 162099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2014-01-15 23:51:25 UTC (rev 162098)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2014-01-16 00:07:03 UTC (rev 162099)
</span><span class="lines">@@ -228,15 +228,11 @@
</span><span class="cx"> if (!m_context) {
</span><span class="cx"> Page* page = document().page();
</span><span class="cx"> if (page && !document().url().isLocalFile()) {
</span><del>- WebGLLoadPolicy policy = page->mainFrame().loader().client().webGLPolicyForHost(document().url().host());
- // FIXME: This breaks most clients because they will not implement webGLContextCreated in the way want them to
- // nor should they be expected to. We need to find a way to not run this code if the client hasn't implemented
- // webGLContextCreated. It might also make sense for the method to return true or false depending on
- // whether or not the client wants the page to continue loading after the call.
- // if (policy == WebGLAsk) {
- // page->chrome().client().webGLContextCreated(this);
- // return nullptr;
- // }
</del><ins>+ WebGLLoadPolicy policy = page->mainFrame().loader().client().webGLPolicyForSite(document().url());
+
+ if (policy == WebGLAsk)
+ return nullptr;
+
</ins><span class="cx"> if (policy == WebGLBlock)
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (162098 => 162099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2014-01-15 23:51:25 UTC (rev 162098)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2014-01-16 00:07:03 UTC (rev 162099)
</span><span class="lines">@@ -331,7 +331,7 @@
</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 webGLPolicyForHost(const String&) const { return WebGLAsk; }
</del><ins>+ virtual WebGLLoadPolicy webGLPolicyForSite(const String&) const { return WebGLAllow; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual void forcePageTransitionIfNeeded() { }
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (162098 => 162099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2014-01-15 23:51:25 UTC (rev 162098)
+++ trunk/Source/WebCore/page/ChromeClient.h 2014-01-16 00:07:03 UTC (rev 162099)
</span><span class="lines">@@ -428,10 +428,6 @@
</span><span class="cx"> // would likely want the page to remain running uninterrupted.
</span><span class="cx"> virtual void incrementActivePageCount() { }
</span><span class="cx"> virtual void decrementActivePageCount() { }
</span><del>-
-#if ENABLE(WEBGL)
- virtual void webGLContextCreated(Element*) const { }
-#endif
</del><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual ~ChromeClient() { }
</span></span></pre>
</div>
</div>
</body>
</html>