<!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>[185172] 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/185172">185172</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-06-03 15:32:40 -0700 (Wed, 03 Jun 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Crash in GraphicsContext3D::getInternalFramebufferSize
https://bugs.webkit.org/show_bug.cgi?id=145479
&lt;rdar://problem/16461048&gt;

Reviewed by Eric Carlson.

Source/WebCore:

If we are in an unitialized or lost state, don't try to access the context.

In order to test this, I added an Internal setting that always
forces WebGL into a pending state.

Test: fast/canvas/webgl/useWhilePending.html

* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::create): Check internal settings for
a forced pending state.
(WebCore::WebGLRenderingContextBase::drawingBufferWidth): Guard against a pending state.
(WebCore::WebGLRenderingContextBase::drawingBufferHeight): Ditto.
* page/Settings.cpp: New Internal setting for forcing a pending policy.
(WebCore::Settings::Settings):
(WebCore::Settings::setForcePendingWebGLPolicy):
* page/Settings.h:
(WebCore::Settings::isForcePendingWebGLPolicy):
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::setForcePendingWebGLPolicy):
* testing/InternalSettings.h:
* testing/InternalSettings.idl:

LayoutTests:

Attemps to use a WebGL context while it is in the pending state.

* fast/canvas/webgl/useWhilePending-expected.txt: Added.
* fast/canvas/webgl/useWhilePending.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingscpp">trunk/Source/WebCore/testing/InternalSettings.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingsh">trunk/Source/WebCore/testing/InternalSettings.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingsidl">trunk/Source/WebCore/testing/InternalSettings.idl</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvaswebgluseWhilePendingexpectedtxt">trunk/LayoutTests/fast/canvas/webgl/useWhilePending-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebgluseWhilePendinghtml">trunk/LayoutTests/fast/canvas/webgl/useWhilePending.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185171 => 185172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-06-03 22:29:38 UTC (rev 185171)
+++ trunk/LayoutTests/ChangeLog        2015-06-03 22:32:40 UTC (rev 185172)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-06-03  Dean Jackson  &lt;dino@apple.com&gt;
+
+        Crash in GraphicsContext3D::getInternalFramebufferSize
+        https://bugs.webkit.org/show_bug.cgi?id=145479
+        &lt;rdar://problem/16461048&gt;
+
+        Reviewed by Eric Carlson.
+
+        Attemps to use a WebGL context while it is in the pending state.
+
+        * fast/canvas/webgl/useWhilePending-expected.txt: Added.
+        * fast/canvas/webgl/useWhilePending.html: Added.
+
</ins><span class="cx"> 2015-06-03  Daniel Bates  &lt;dabates@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         AutoFill button should not be shown in read-only or disabled field
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebgluseWhilePendingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/useWhilePending-expected.txt (0 => 185172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/useWhilePending-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/useWhilePending-expected.txt        2015-06-03 22:32:40 UTC (rev 185172)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Should not crash.
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/canvas/webgl/useWhilePending-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastcanvaswebgluseWhilePendinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/useWhilePending.html (0 => 185172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/useWhilePending.html                                (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/useWhilePending.html        2015-06-03 22:32:40 UTC (rev 185172)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+&lt;script&gt;
+if (window.testRunner) {
+    window.internals.settings.setForcePendingWebGLPolicy(true);
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+}
+
+window.addEventListener(&quot;load&quot;, function () {
+
+    var canvas = document.createElement(&quot;canvas&quot;);
+    canvas.width = 100;
+    canvas.height = 100;
+    var gl = canvas.getContext(&quot;webgl&quot;);
+    var foo = gl.drawingBufferWidth;
+    foo = gl.drawingBufferHeight;
+
+    if (window.testRunner)
+        testRunner.notifyDone();
+
+}, false);
+&lt;/script&gt;
+
+Should not crash.
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/canvas/webgl/useWhilePending.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185171 => 185172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-06-03 22:29:38 UTC (rev 185171)
+++ trunk/Source/WebCore/ChangeLog        2015-06-03 22:32:40 UTC (rev 185172)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-06-03  Dean Jackson  &lt;dino@apple.com&gt;
+
+        Crash in GraphicsContext3D::getInternalFramebufferSize
+        https://bugs.webkit.org/show_bug.cgi?id=145479
+        &lt;rdar://problem/16461048&gt;
+
+        Reviewed by Eric Carlson.
+
+        If we are in an unitialized or lost state, don't try to access the context.
+
+        In order to test this, I added an Internal setting that always
+        forces WebGL into a pending state.
+
+        Test: fast/canvas/webgl/useWhilePending.html
+
+        * html/canvas/WebGLRenderingContextBase.cpp:
+        (WebCore::WebGLRenderingContextBase::create): Check internal settings for
+        a forced pending state.
+        (WebCore::WebGLRenderingContextBase::drawingBufferWidth): Guard against a pending state.
+        (WebCore::WebGLRenderingContextBase::drawingBufferHeight): Ditto.
+        * page/Settings.cpp: New Internal setting for forcing a pending policy.
+        (WebCore::Settings::Settings):
+        (WebCore::Settings::setForcePendingWebGLPolicy):
+        * page/Settings.h:
+        (WebCore::Settings::isForcePendingWebGLPolicy):
+        * testing/InternalSettings.cpp:
+        (WebCore::InternalSettings::Backup::Backup):
+        (WebCore::InternalSettings::Backup::restoreTo):
+        (WebCore::InternalSettings::setForcePendingWebGLPolicy):
+        * testing/InternalSettings.h:
+        * testing/InternalSettings.idl:
+
</ins><span class="cx"> 2015-06-03  Hunseop Jeong  &lt;hs85.jeong@samsung.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Use modern for-loops in WebCore/page.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (185171 => 185172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp        2015-06-03 22:29:38 UTC (rev 185171)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp        2015-06-03 22:32:40 UTC (rev 185172)
</span><span class="lines">@@ -362,9 +362,11 @@
</span><span class="cx">     bool isPendingPolicyResolution = false;
</span><span class="cx">     Document&amp; topDocument = document.topDocument();
</span><span class="cx">     Page* page = topDocument.page();
</span><del>-    if (page &amp;&amp; !topDocument.url().isLocalFile()) {
-        WebGLLoadPolicy policy = page-&gt;mainFrame().loader().client().webGLPolicyForURL(topDocument.url());
</del><ins>+    bool forcingPendingPolicy = frame-&gt;settings().isForcePendingWebGLPolicy();
</ins><span class="cx"> 
</span><ins>+    if (forcingPendingPolicy || (page &amp;&amp; !topDocument.url().isLocalFile())) {
+        WebGLLoadPolicy policy = forcingPendingPolicy ? WebGLPendingCreation : page-&gt;mainFrame().loader().client().webGLPolicyForURL(topDocument.url());
+
</ins><span class="cx">         if (policy == WebGLBlockCreation) {
</span><span class="cx">             LOG(WebGL, &quot;The policy for this URL (%s) is to block WebGL.&quot;, topDocument.url().host().utf8().data());
</span><span class="cx">             return nullptr;
</span><span class="lines">@@ -400,6 +402,7 @@
</span><span class="cx">             renderingContext = std::unique_ptr&lt;WebGL2RenderingContext&gt;(new WebGL2RenderingContext(canvas, attributes));
</span><span class="cx">         else
</span><span class="cx">             renderingContext = std::unique_ptr&lt;WebGLRenderingContext&gt;(new WebGLRenderingContext(canvas, attributes));
</span><ins>+        renderingContext-&gt;suspendIfNeeded();
</ins><span class="cx">         return renderingContext;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -779,11 +782,17 @@
</span><span class="cx"> 
</span><span class="cx"> int WebGLRenderingContextBase::drawingBufferWidth() const
</span><span class="cx"> {
</span><ins>+    if (m_isPendingPolicyResolution &amp;&amp; !m_hasRequestedPolicyResolution)
+        return 0;
+
</ins><span class="cx">     return m_context-&gt;getInternalFramebufferSize().width();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> int WebGLRenderingContextBase::drawingBufferHeight() const
</span><span class="cx"> {
</span><ins>+    if (m_isPendingPolicyResolution &amp;&amp; !m_hasRequestedPolicyResolution)
+        return 0;
+
</ins><span class="cx">     return m_context-&gt;getInternalFramebufferSize().height();
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (185171 => 185172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp        2015-06-03 22:29:38 UTC (rev 185171)
+++ trunk/Source/WebCore/page/Settings.cpp        2015-06-03 22:32:40 UTC (rev 185172)
</span><span class="lines">@@ -201,6 +201,7 @@
</span><span class="cx"> #endif
</span><span class="cx">     , m_hiddenPageCSSAnimationSuspensionEnabled(false)
</span><span class="cx">     , m_fontFallbackPrefersPictographs(false)
</span><ins>+    , m_forcePendingWebGLPolicy(false)
</ins><span class="cx"> {
</span><span class="cx">     // A Frame may not have been created yet, so we initialize the AtomicString
</span><span class="cx">     // hash before trying to use it.
</span><span class="lines">@@ -424,6 +425,11 @@
</span><span class="cx">     m_setImageLoadingSettingsTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void Settings::setForcePendingWebGLPolicy(bool forced)
+{
+    m_forcePendingWebGLPolicy = forced;
+}
+
</ins><span class="cx"> void Settings::setPluginsEnabled(bool arePluginsEnabled)
</span><span class="cx"> {
</span><span class="cx">     if (m_arePluginsEnabled == arePluginsEnabled)
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (185171 => 185172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h        2015-06-03 22:29:38 UTC (rev 185171)
+++ trunk/Source/WebCore/page/Settings.h        2015-06-03 22:32:40 UTC (rev 185172)
</span><span class="lines">@@ -270,6 +270,9 @@
</span><span class="cx">     const String&amp; mediaKeysStorageDirectory() const { return m_mediaKeysStorageDirectory; }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+    WEBCORE_EXPORT void setForcePendingWebGLPolicy(bool);
+    bool isForcePendingWebGLPolicy() const { return m_forcePendingWebGLPolicy; }
+
</ins><span class="cx"> private:
</span><span class="cx">     explicit Settings(Page*);
</span><span class="cx"> 
</span><span class="lines">@@ -323,6 +326,8 @@
</span><span class="cx">     bool m_hiddenPageCSSAnimationSuspensionEnabled : 1;
</span><span class="cx">     bool m_fontFallbackPrefersPictographs : 1;
</span><span class="cx"> 
</span><ins>+    bool m_forcePendingWebGLPolicy : 1;
+
</ins><span class="cx"> #if USE(AVFOUNDATION)
</span><span class="cx">     WEBCORE_EXPORT static bool gAVFoundationEnabled;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (185171 => 185172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.cpp        2015-06-03 22:29:38 UTC (rev 185171)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp        2015-06-03 22:32:40 UTC (rev 185172)
</span><span class="lines">@@ -85,6 +85,7 @@
</span><span class="cx">     , m_shouldDisplayTextDescriptions(settings.shouldDisplayTextDescriptions())
</span><span class="cx"> #endif
</span><span class="cx">     , m_defaultVideoPosterURL(settings.defaultVideoPosterURL())
</span><ins>+    , m_forcePendingWebGLPolicy(settings.isForcePendingWebGLPolicy())
</ins><span class="cx">     , m_originalTimeWithoutMouseMovementBeforeHidingControls(settings.timeWithoutMouseMovementBeforeHidingControls())
</span><span class="cx">     , m_useLegacyBackgroundSizeShorthandBehavior(settings.useLegacyBackgroundSizeShorthandBehavior())
</span><span class="cx">     , m_autoscrollForDragAndDropEnabled(settings.autoscrollForDragAndDropEnabled())
</span><span class="lines">@@ -152,6 +153,7 @@
</span><span class="cx">     settings.setShouldDisplayTextDescriptions(m_shouldDisplayTextDescriptions);
</span><span class="cx"> #endif
</span><span class="cx">     settings.setDefaultVideoPosterURL(m_defaultVideoPosterURL);
</span><ins>+    settings.setForcePendingWebGLPolicy(m_forcePendingWebGLPolicy);
</ins><span class="cx">     settings.setTimeWithoutMouseMovementBeforeHidingControls(m_originalTimeWithoutMouseMovementBeforeHidingControls);
</span><span class="cx">     settings.setUseLegacyBackgroundSizeShorthandBehavior(m_useLegacyBackgroundSizeShorthandBehavior);
</span><span class="cx">     settings.setAutoscrollForDragAndDropEnabled(m_autoscrollForDragAndDropEnabled);
</span><span class="lines">@@ -210,6 +212,7 @@
</span><span class="cx"> {
</span><span class="cx">     page()-&gt;setPageScaleFactor(1, IntPoint(0, 0));
</span><span class="cx">     page()-&gt;setCanStartMedia(true);
</span><ins>+    page()-&gt;settings().setForcePendingWebGLPolicy(false);
</ins><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx">     m_page-&gt;settings().setAllowsAirPlayForMediaPlayback(false);
</span><span class="cx"> #endif
</span><span class="lines">@@ -468,6 +471,12 @@
</span><span class="cx">     settings()-&gt;setDefaultVideoPosterURL(url);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void InternalSettings::setForcePendingWebGLPolicy(bool forced, ExceptionCode&amp; ec)
+{
+    InternalSettingsGuardForSettings();
+    settings()-&gt;setForcePendingWebGLPolicy(forced);
+}
+
</ins><span class="cx"> void InternalSettings::setTimeWithoutMouseMovementBeforeHidingControls(double time, ExceptionCode&amp; ec)
</span><span class="cx"> {
</span><span class="cx">     InternalSettingsGuardForSettings();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.h (185171 => 185172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.h        2015-06-03 22:29:38 UTC (rev 185171)
+++ trunk/Source/WebCore/testing/InternalSettings.h        2015-06-03 22:32:40 UTC (rev 185172)
</span><span class="lines">@@ -83,6 +83,7 @@
</span><span class="cx">         bool m_shouldDisplayTextDescriptions;
</span><span class="cx"> #endif
</span><span class="cx">         String m_defaultVideoPosterURL;
</span><ins>+        bool m_forcePendingWebGLPolicy;
</ins><span class="cx">         bool m_originalTimeWithoutMouseMovementBeforeHidingControls;
</span><span class="cx">         bool m_useLegacyBackgroundSizeShorthandBehavior;
</span><span class="cx">         bool m_autoscrollForDragAndDropEnabled;
</span><span class="lines">@@ -134,6 +135,7 @@
</span><span class="cx">     void setImagesEnabled(bool, ExceptionCode&amp;);
</span><span class="cx">     void setMinimumTimerInterval(double intervalInSeconds, ExceptionCode&amp;);
</span><span class="cx">     void setDefaultVideoPosterURL(const String&amp; url, ExceptionCode&amp;);
</span><ins>+    void setForcePendingWebGLPolicy(bool, ExceptionCode&amp;);
</ins><span class="cx">     void setTimeWithoutMouseMovementBeforeHidingControls(double time, ExceptionCode&amp;);
</span><span class="cx">     void setUseLegacyBackgroundSizeShorthandBehavior(bool, ExceptionCode&amp;);
</span><span class="cx">     void setAutoscrollForDragAndDropEnabled(bool, ExceptionCode&amp;);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.idl (185171 => 185172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.idl        2015-06-03 22:29:38 UTC (rev 185171)
+++ trunk/Source/WebCore/testing/InternalSettings.idl        2015-06-03 22:32:40 UTC (rev 185172)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx">  * Copyright (C) 2012 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -55,6 +56,8 @@
</span><span class="cx">     [RaisesException] void setMediaTypeOverride(DOMString mediaTypeOverride);
</span><span class="cx">     void setWirelessPlaybackDisabled(boolean available);
</span><span class="cx"> 
</span><ins>+    [RaisesException] void setForcePendingWebGLPolicy(boolean forced);
+
</ins><span class="cx">     void setPluginReplacementEnabled(boolean enabled);
</span><span class="cx"> 
</span><span class="cx">     // Editing, forms
</span></span></pre>
</div>
</div>

</body>
</html>