Diff
Modified: trunk/LayoutTests/ChangeLog (185144 => 185145)
--- trunk/LayoutTests/ChangeLog 2015-06-03 06:19:35 UTC (rev 185144)
+++ trunk/LayoutTests/ChangeLog 2015-06-03 06:21:03 UTC (rev 185145)
@@ -1,3 +1,20 @@
+2015-06-02 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
Skip webgl/useWhilePending.html on WebKit 1.
Deleted: trunk/LayoutTests/fast/canvas/webgl/useWhilePending-expected.txt (185144 => 185145)
--- trunk/LayoutTests/fast/canvas/webgl/useWhilePending-expected.txt 2015-06-03 06:19:35 UTC (rev 185144)
+++ trunk/LayoutTests/fast/canvas/webgl/useWhilePending-expected.txt 2015-06-03 06:21:03 UTC (rev 185145)
@@ -1 +0,0 @@
-Should not crash.
Deleted: trunk/LayoutTests/fast/canvas/webgl/useWhilePending.html (185144 => 185145)
--- trunk/LayoutTests/fast/canvas/webgl/useWhilePending.html 2015-06-03 06:19:35 UTC (rev 185144)
+++ trunk/LayoutTests/fast/canvas/webgl/useWhilePending.html 2015-06-03 06:21:03 UTC (rev 185145)
@@ -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.
Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (185144 => 185145)
--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-06-03 06:19:35 UTC (rev 185144)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-06-03 06:21:03 UTC (rev 185145)
@@ -67,9 +67,6 @@
# 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 ]
Modified: trunk/Source/WebCore/ChangeLog (185144 => 185145)
--- trunk/Source/WebCore/ChangeLog 2015-06-03 06:19:35 UTC (rev 185144)
+++ trunk/Source/WebCore/ChangeLog 2015-06-03 06:21:03 UTC (rev 185145)
@@ -1,3 +1,20 @@
+2015-06-02 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
[CoordinatedGraphics] Refactor TiledBackingStoreClient
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (185144 => 185145)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-06-03 06:19:35 UTC (rev 185144)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-06-03 06:21:03 UTC (rev 185145)
@@ -362,11 +362,9 @@
bool isPendingPolicyResolution = false;
Document& topDocument = document.topDocument();
Page* page = topDocument.page();
- bool forcingPendingPolicy = frame->settings().isForcePendingWebGLPolicy();
+ if (page && !topDocument.url().isLocalFile()) {
+ WebGLLoadPolicy policy = page->mainFrame().loader().client().webGLPolicyForURL(topDocument.url());
- if (forcingPendingPolicy || (page && !topDocument.url().isLocalFile())) {
- WebGLLoadPolicy policy = forcingPendingPolicy ? WebGLPendingCreation : 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());
return nullptr;
@@ -781,17 +779,11 @@
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();
}
Modified: trunk/Source/WebCore/page/Settings.cpp (185144 => 185145)
--- trunk/Source/WebCore/page/Settings.cpp 2015-06-03 06:19:35 UTC (rev 185144)
+++ trunk/Source/WebCore/page/Settings.cpp 2015-06-03 06:21:03 UTC (rev 185145)
@@ -201,7 +201,6 @@
#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 @@
m_setImageLoadingSettingsTimer.startOneShot(0);
}
-void Settings::setForcePendingWebGLPolicy(bool forced)
-{
- m_forcePendingWebGLPolicy = forced;
-}
-
void Settings::setPluginsEnabled(bool arePluginsEnabled)
{
if (m_arePluginsEnabled == arePluginsEnabled)
Modified: trunk/Source/WebCore/page/Settings.h (185144 => 185145)
--- trunk/Source/WebCore/page/Settings.h 2015-06-03 06:19:35 UTC (rev 185144)
+++ trunk/Source/WebCore/page/Settings.h 2015-06-03 06:21:03 UTC (rev 185145)
@@ -270,9 +270,6 @@
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 @@
bool m_hiddenPageCSSAnimationSuspensionEnabled : 1;
bool m_fontFallbackPrefersPictographs : 1;
- bool m_forcePendingWebGLPolicy : 1;
-
#if USE(AVFOUNDATION)
WEBCORE_EXPORT static bool gAVFoundationEnabled;
#endif
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (185144 => 185145)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2015-06-03 06:19:35 UTC (rev 185144)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2015-06-03 06:21:03 UTC (rev 185145)
@@ -85,7 +85,6 @@
, 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 @@
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 @@
{
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 @@
settings()->setDefaultVideoPosterURL(url);
}
-void InternalSettings::setForcePendingWebGLPolicy(bool forced, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setForcePendingWebGLPolicy(forced);
-}
-
void InternalSettings::setTimeWithoutMouseMovementBeforeHidingControls(double time, ExceptionCode& ec)
{
InternalSettingsGuardForSettings();
Modified: trunk/Source/WebCore/testing/InternalSettings.h (185144 => 185145)
--- trunk/Source/WebCore/testing/InternalSettings.h 2015-06-03 06:19:35 UTC (rev 185144)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2015-06-03 06:21:03 UTC (rev 185145)
@@ -83,7 +83,6 @@
bool m_shouldDisplayTextDescriptions;
#endif
String m_defaultVideoPosterURL;
- bool m_forcePendingWebGLPolicy;
bool m_originalTimeWithoutMouseMovementBeforeHidingControls;
bool m_useLegacyBackgroundSizeShorthandBehavior;
bool m_autoscrollForDragAndDropEnabled;
@@ -135,7 +134,6 @@
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&);
Modified: trunk/Source/WebCore/testing/InternalSettings.idl (185144 => 185145)
--- trunk/Source/WebCore/testing/InternalSettings.idl 2015-06-03 06:19:35 UTC (rev 185144)
+++ trunk/Source/WebCore/testing/InternalSettings.idl 2015-06-03 06:21:03 UTC (rev 185145)
@@ -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
