Unreviewed, rolling out r185128 and r185132.

https://bugs.webkit.org/show_bug.cgi?id=145597

The new test hits a bad assertion (Requested by ap on
#webkit).

Reverted changesets:

"Crash in GraphicsContext3D::getInternalFramebufferSize"
https://bugs.webkit.org/show_bug.cgi?id=145479
http://trac.webkit.org/changeset/185128

"Skip webgl/useWhilePending.html on WebKit 1."
http://trac.webkit.org/changeset/185132

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@185145 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 71c4e1d..ea6ae43 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2015-06-02  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r185128 and r185132.
+        https://bugs.webkit.org/show_bug.cgi?id=145597
+
+        The new test hits a bad assertion (Requested by ap on
+        #webkit).
+
+        Reverted changesets:
+
+        "Crash in GraphicsContext3D::getInternalFramebufferSize"
+        https://bugs.webkit.org/show_bug.cgi?id=145479
+        http://trac.webkit.org/changeset/185128
+
+        "Skip webgl/useWhilePending.html on WebKit 1."
+        http://trac.webkit.org/changeset/185132
+
 2015-06-02  Dean Jackson  <dino@apple.com>
 
         Skip webgl/useWhilePending.html on WebKit 1.

diff --git a/LayoutTests/fast/canvas/webgl/useWhilePending-expected.txt b/LayoutTests/fast/canvas/webgl/useWhilePending-expected.txt
deleted file mode 100644 (file)
index 3b3302d..0000000
--- a/LayoutTests/fast/canvas/webgl/useWhilePending-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-Should not crash.

diff --git a/LayoutTests/fast/canvas/webgl/useWhilePending.html b/LayoutTests/fast/canvas/webgl/useWhilePending.html
deleted file mode 100644 (file)
index 74edcaa..0000000
--- a/LayoutTests/fast/canvas/webgl/useWhilePending.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<script>
-if (window.testRunner) {
-    window.internals.settings.setForcePendingWebGLPolicy(true);
-    testRunner.dumpAsText();
-    testRunner.waitUntilDone();
-}
-
-window.addEventListener("load", function () {
-
-    var canvas = document.createElement("canvas");
-    canvas.width = 100;
-    canvas.height = 100;
-    var gl = canvas.getContext("webgl");
-    var foo = gl.drawingBufferWidth;
-    foo = gl.drawingBufferHeight;
-
-    if (window.testRunner)
-        testRunner.notifyDone();
-
-}, false);
-</script>
-
-Should not crash.

diff --git a/LayoutTests/platform/mac-wk1/TestExpectations b/LayoutTests/platform/mac-wk1/TestExpectations
index 4a32945..f14bf1b 100644 (file)
--- a/LayoutTests/platform/mac-wk1/TestExpectations
+++ b/LayoutTests/platform/mac-wk1/TestExpectations
@@ -67,9 +67,6 @@ fast/events/ghostly-mousemoves-in-subframe.html [ Skip ]
 # Disable snapshotting tests on WK1 only
 plugins/snapshotting
 
-# WK1 doesn't do pending WebGL policies
-fast/canvas/webgl/useWhilePending.html [ Skip ]
-
 # Animated image throttling behaves differently on WK1.
 fast/images/animated-gif-body-outside-viewport.html [ Skip ]
 fast/images/animated-gif-window-resizing.html [ Skip ]

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 64a9258..90d94bc 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2015-06-02  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r185128 and r185132.
+        https://bugs.webkit.org/show_bug.cgi?id=145597
+
+        The new test hits a bad assertion (Requested by ap on
+        #webkit).
+
+        Reverted changesets:
+
+        "Crash in GraphicsContext3D::getInternalFramebufferSize"
+        https://bugs.webkit.org/show_bug.cgi?id=145479
+        http://trac.webkit.org/changeset/185128
+
+        "Skip webgl/useWhilePending.html on WebKit 1."
+        http://trac.webkit.org/changeset/185132
+
 2015-06-02  Ryuan Choi  <ryuan.choi@navercorp.com>
 
         [CoordinatedGraphics] Refactor TiledBackingStoreClient

diff --git a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
index e681921..efcc54a 100644 (file)
--- a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
+++ b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
@@ -362,10 +362,8 @@ std::unique_ptr<WebGLRenderingContextBase> WebGLRenderingContextBase::create(HTM
     bool isPendingPolicyResolution = false;
     Document& topDocument = document.topDocument();
     Page* page = topDocument.page();
-    bool forcingPendingPolicy = frame->settings().isForcePendingWebGLPolicy();
-
-    if (forcingPendingPolicy || (page && !topDocument.url().isLocalFile())) {
-        WebGLLoadPolicy policy = forcingPendingPolicy ? WebGLPendingCreation : page->mainFrame().loader().client().webGLPolicyForURL(topDocument.url());
+    if (page && !topDocument.url().isLocalFile()) {
+        WebGLLoadPolicy policy = page->mainFrame().loader().client().webGLPolicyForURL(topDocument.url());
 
         if (policy == WebGLBlockCreation) {
             LOG(WebGL, "The policy for this URL (%s) is to block WebGL.", topDocument.url().host().utf8().data());
@@ -781,17 +779,11 @@ void WebGLRenderingContextBase::reshape(int width, int height)
 
 int WebGLRenderingContextBase::drawingBufferWidth() const
 {
-    if (m_isPendingPolicyResolution && !m_hasRequestedPolicyResolution)
-        return 0;
-
     return m_context->getInternalFramebufferSize().width();
 }
 
 int WebGLRenderingContextBase::drawingBufferHeight() const
 {
-    if (m_isPendingPolicyResolution && !m_hasRequestedPolicyResolution)
-        return 0;
-
     return m_context->getInternalFramebufferSize().height();
 }
 

diff --git a/Source/WebCore/page/Settings.cpp b/Source/WebCore/page/Settings.cpp
index ff9b22b..f478f40 100644 (file)
--- a/Source/WebCore/page/Settings.cpp
+++ b/Source/WebCore/page/Settings.cpp
@@ -201,7 +201,6 @@ Settings::Settings(Page* page)
 #endif
     , m_hiddenPageCSSAnimationSuspensionEnabled(false)
     , m_fontFallbackPrefersPictographs(false)
-    , m_forcePendingWebGLPolicy(false)
 {
     // A Frame may not have been created yet, so we initialize the AtomicString
     // hash before trying to use it.
@@ -425,11 +424,6 @@ void Settings::setImagesEnabled(bool areImagesEnabled)
     m_setImageLoadingSettingsTimer.startOneShot(0);
 }
 
-void Settings::setForcePendingWebGLPolicy(bool forced)
-{
-    m_forcePendingWebGLPolicy = forced;
-}
-
 void Settings::setPluginsEnabled(bool arePluginsEnabled)
 {
     if (m_arePluginsEnabled == arePluginsEnabled)

diff --git a/Source/WebCore/page/Settings.h b/Source/WebCore/page/Settings.h
index b5a17a8..8e0b529 100644 (file)
--- a/Source/WebCore/page/Settings.h
+++ b/Source/WebCore/page/Settings.h
@@ -270,9 +270,6 @@ public:
     const String& mediaKeysStorageDirectory() const { return m_mediaKeysStorageDirectory; }
 #endif
 
-    WEBCORE_EXPORT void setForcePendingWebGLPolicy(bool);
-    bool isForcePendingWebGLPolicy() const { return m_forcePendingWebGLPolicy; }
-
 private:
     explicit Settings(Page*);
 
@@ -326,8 +323,6 @@ private:
     bool m_hiddenPageCSSAnimationSuspensionEnabled : 1;
     bool m_fontFallbackPrefersPictographs : 1;
 
-    bool m_forcePendingWebGLPolicy : 1;
-
 #if USE(AVFOUNDATION)
     WEBCORE_EXPORT static bool gAVFoundationEnabled;
 #endif

diff --git a/Source/WebCore/testing/InternalSettings.cpp b/Source/WebCore/testing/InternalSettings.cpp
index 5861175..c5984e3 100644 (file)
--- a/Source/WebCore/testing/InternalSettings.cpp
+++ b/Source/WebCore/testing/InternalSettings.cpp
@@ -85,7 +85,6 @@ InternalSettings::Backup::Backup(Settings& settings)
     , m_shouldDisplayTextDescriptions(settings.shouldDisplayTextDescriptions())
 #endif
     , m_defaultVideoPosterURL(settings.defaultVideoPosterURL())
-    , m_forcePendingWebGLPolicy(settings.isForcePendingWebGLPolicy())
     , m_originalTimeWithoutMouseMovementBeforeHidingControls(settings.timeWithoutMouseMovementBeforeHidingControls())
     , m_useLegacyBackgroundSizeShorthandBehavior(settings.useLegacyBackgroundSizeShorthandBehavior())
     , m_autoscrollForDragAndDropEnabled(settings.autoscrollForDragAndDropEnabled())
@@ -153,7 +152,6 @@ void InternalSettings::Backup::restoreTo(Settings& settings)
     settings.setShouldDisplayTextDescriptions(m_shouldDisplayTextDescriptions);
 #endif
     settings.setDefaultVideoPosterURL(m_defaultVideoPosterURL);
-    settings.setForcePendingWebGLPolicy(m_forcePendingWebGLPolicy);
     settings.setTimeWithoutMouseMovementBeforeHidingControls(m_originalTimeWithoutMouseMovementBeforeHidingControls);
     settings.setUseLegacyBackgroundSizeShorthandBehavior(m_useLegacyBackgroundSizeShorthandBehavior);
     settings.setAutoscrollForDragAndDropEnabled(m_autoscrollForDragAndDropEnabled);
@@ -212,7 +210,6 @@ void InternalSettings::resetToConsistentState()
 {
     page()->setPageScaleFactor(1, IntPoint(0, 0));
     page()->setCanStartMedia(true);
-    page()->settings().setForcePendingWebGLPolicy(false);
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
     m_page->settings().setAllowsAirPlayForMediaPlayback(false);
 #endif
@@ -471,12 +468,6 @@ void InternalSettings::setDefaultVideoPosterURL(const String& url, ExceptionCode
     settings()->setDefaultVideoPosterURL(url);
 }
 
-void InternalSettings::setForcePendingWebGLPolicy(bool forced, ExceptionCode& ec)
-{
-    InternalSettingsGuardForSettings();
-    settings()->setForcePendingWebGLPolicy(forced);
-}
-
 void InternalSettings::setTimeWithoutMouseMovementBeforeHidingControls(double time, ExceptionCode& ec)
 {
     InternalSettingsGuardForSettings();

diff --git a/Source/WebCore/testing/InternalSettings.h b/Source/WebCore/testing/InternalSettings.h
index 144b663..68e2c94 100644 (file)
--- a/Source/WebCore/testing/InternalSettings.h
+++ b/Source/WebCore/testing/InternalSettings.h
@@ -83,7 +83,6 @@ public:
         bool m_shouldDisplayTextDescriptions;
 #endif
         String m_defaultVideoPosterURL;
-        bool m_forcePendingWebGLPolicy;
         bool m_originalTimeWithoutMouseMovementBeforeHidingControls;
         bool m_useLegacyBackgroundSizeShorthandBehavior;
         bool m_autoscrollForDragAndDropEnabled;
@@ -135,7 +134,6 @@ public:
     void setImagesEnabled(bool, ExceptionCode&);
     void setMinimumTimerInterval(double intervalInSeconds, ExceptionCode&);
     void setDefaultVideoPosterURL(const String& url, ExceptionCode&);
-    void setForcePendingWebGLPolicy(bool, ExceptionCode&);
     void setTimeWithoutMouseMovementBeforeHidingControls(double time, ExceptionCode&);
     void setUseLegacyBackgroundSizeShorthandBehavior(bool, ExceptionCode&);
     void setAutoscrollForDragAndDropEnabled(bool, ExceptionCode&);

diff --git a/Source/WebCore/testing/InternalSettings.idl b/Source/WebCore/testing/InternalSettings.idl
index 309e89e..78e250d 100644 (file)
--- a/Source/WebCore/testing/InternalSettings.idl
+++ b/Source/WebCore/testing/InternalSettings.idl
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
- * Copyright (C) 2015 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -56,8 +55,6 @@
     [RaisesException] void setMediaTypeOverride(DOMString mediaTypeOverride);
     void setWirelessPlaybackDisabled(boolean available);
 
-    [RaisesException] void setForcePendingWebGLPolicy(boolean forced);
-
     void setPluginReplacementEnabled(boolean enabled);
 
     // Editing, forms