- Revision
- 141247
- Author
- [email protected]
- Date
- 2013-01-30 03:56:42 -0800 (Wed, 30 Jan 2013)
Log Message
[EFL][Qt][WebGL] Avoid deleting an uncreated canvas.
https://bugs.webkit.org/show_bug.cgi?id=106878
Patch by Kondapally Kalyan <[email protected]> on 2013-01-30
Reviewed by Benjamin Poulain.
Source/WebKit2:
setContentsToCanvas is responsible for marking canvas for creation or deletion.
The issue here is that the canvas is marked for deletion even though it has not
been created. This causes an assert in LayerTreeRenderer::destroyCanvas.
This patch adds a seperate check to ensure that CoordinatedGraphicsLayer
tries to issue a request for canvas deletion only after request for canvas
creation has been handled.
New test: fast/canvas/webgl/canvas-resize-crash.html
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:
(WebCore::CoordinatedGraphicsLayer::CoordinatedGraphicsLayer):
(WebCore::CoordinatedGraphicsLayer::setContentsToCanvas):
(WebCore::CoordinatedGraphicsLayer::destroyCanvasIfNeeded):
(WebCore::CoordinatedGraphicsLayer::createCanvasIfNeeded):
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.h:
(CoordinatedGraphicsLayer):
(WebCore::CoordinatedGraphicsLayer::fixedToViewport):
LayoutTests:
* fast/canvas/webgl/canvas-resize-crash-expected.txt: Added.
* fast/canvas/webgl/canvas-resize-crash.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (141246 => 141247)
--- trunk/LayoutTests/ChangeLog 2013-01-30 11:55:07 UTC (rev 141246)
+++ trunk/LayoutTests/ChangeLog 2013-01-30 11:56:42 UTC (rev 141247)
@@ -1,3 +1,13 @@
+2013-01-30 Kondapally Kalyan <[email protected]>
+
+ [EFL][Qt][WebGL] Avoid deleting an uncreated canvas.
+ https://bugs.webkit.org/show_bug.cgi?id=106878
+
+ Reviewed by Benjamin Poulain.
+
+ * fast/canvas/webgl/canvas-resize-crash-expected.txt: Added.
+ * fast/canvas/webgl/canvas-resize-crash.html: Added.
+
2013-01-30 Andrey Lushnikov <[email protected]>
Web Inspector: implmenet Ctrl-Arrow/Ctrl-Backspace in DefaultTextEditor
Added: trunk/LayoutTests/fast/canvas/webgl/canvas-resize-crash-expected.txt (0 => 141247)
--- trunk/LayoutTests/fast/canvas/webgl/canvas-resize-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/canvas-resize-crash-expected.txt 2013-01-30 11:56:42 UTC (rev 141247)
@@ -0,0 +1,10 @@
+Tests that canvas does not crash on resize.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Canvas did not crash on resize.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/fast/canvas/webgl/canvas-resize-crash.html (0 => 141247)
--- trunk/LayoutTests/fast/canvas/webgl/canvas-resize-crash.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/canvas-resize-crash.html 2013-01-30 11:56:42 UTC (rev 141247)
@@ -0,0 +1,43 @@
+<html>
+<head>
+<style>
+#example {
+ width: 100%;
+ height: 100%;
+}
+</style>
+<script src=""
+<script src="" </script>
+<script>
+description('Tests that canvas does not crash on resize.');
+
+<!-- The following used to cause a crash in Efl and Qt port -->
+function start()
+{
+ var canvas = document.getElementById('example');
+ var gl = WebGLTestUtils.create3DContext(canvas);
+
+ // Change the size of the canvas's backing store to match the size it is displayed.
+ canvas.width = canvas.clientWidth;
+ canvas.height = canvas.clientHeight;
+}
+
+testPassed("Canvas did not crash on resize.");
+</script>
+</head>
+
+<body _onload_="start()">
+<!-- Enable WebGL in the testing framework (without this we will fail to
+ create a GL context) -->
+
+<script>
+ if (window.testRunner) {
+ testRunner.overridePreference("WebKitWebGLEnabled", "1");
+ }
+</script>
+
+<canvas id="example"></canvas>
+<script src=""
+</body>
+</html>
+
Modified: trunk/Source/WebKit2/ChangeLog (141246 => 141247)
--- trunk/Source/WebKit2/ChangeLog 2013-01-30 11:55:07 UTC (rev 141246)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-30 11:56:42 UTC (rev 141247)
@@ -1,3 +1,28 @@
+2013-01-30 Kondapally Kalyan <[email protected]>
+
+ [EFL][Qt][WebGL] Avoid deleting an uncreated canvas.
+ https://bugs.webkit.org/show_bug.cgi?id=106878
+
+ Reviewed by Benjamin Poulain.
+
+ setContentsToCanvas is responsible for marking canvas for creation or deletion.
+ The issue here is that the canvas is marked for deletion even though it has not
+ been created. This causes an assert in LayerTreeRenderer::destroyCanvas.
+ This patch adds a seperate check to ensure that CoordinatedGraphicsLayer
+ tries to issue a request for canvas deletion only after request for canvas
+ creation has been handled.
+
+ New test: fast/canvas/webgl/canvas-resize-crash.html
+
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:
+ (WebCore::CoordinatedGraphicsLayer::CoordinatedGraphicsLayer):
+ (WebCore::CoordinatedGraphicsLayer::setContentsToCanvas):
+ (WebCore::CoordinatedGraphicsLayer::destroyCanvasIfNeeded):
+ (WebCore::CoordinatedGraphicsLayer::createCanvasIfNeeded):
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.h:
+ (CoordinatedGraphicsLayer):
+ (WebCore::CoordinatedGraphicsLayer::fixedToViewport):
+
2013-01-30 Zan Dobersek <[email protected]>
Unreviewed GTK build fix.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp (141246 => 141247)
--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp 2013-01-30 11:55:07 UTC (rev 141246)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp 2013-01-30 11:56:42 UTC (rev 141247)
@@ -116,11 +116,12 @@
, m_shouldSyncImageBacking(true)
, m_shouldSyncAnimations(true)
, m_fixedToViewport(false)
- , m_canvasNeedsDisplay(false)
- , m_canvasNeedsCreate(false)
- , m_canvasNeedsDestroy(false)
, m_pendingContentsScaleAdjustment(false)
, m_pendingVisibleRectAdjustment(false)
+#if USE(GRAPHICS_SURFACE)
+ , m_isValidCanvas(false)
+ , m_pendingCanvasOperation(None)
+#endif
, m_coordinator(0)
, m_contentsScale(1)
, m_compositedNativeImagePtr(0)
@@ -314,8 +315,11 @@
void CoordinatedGraphicsLayer::setContentsNeedsDisplay()
{
+#if USE(GRAPHICS_SURFACE)
if (m_canvasPlatformLayer)
- m_canvasNeedsDisplay = true;
+ m_pendingCanvasOperation |= SyncCanvas;
+#endif
+
if (client())
client()->notifyFlushRequired(this);
@@ -327,16 +331,16 @@
#if USE(GRAPHICS_SURFACE)
if (m_canvasPlatformLayer) {
ASSERT(m_canvasToken.isValid());
- if (!platformLayer)
- m_canvasNeedsDestroy = true;
- else if ((m_canvasSize != platformLayer->platformLayerSize()) || (m_canvasToken != platformLayer->graphicsSurfaceToken())) {
+ if (!platformLayer) {
+ m_pendingCanvasOperation |= DestroyCanvas;
+ m_pendingCanvasOperation &= ~CreateCanvas;
+ } else if ((m_canvasSize != platformLayer->platformLayerSize()) || (m_canvasToken != platformLayer->graphicsSurfaceToken())) {
// m_canvasToken can be different to platformLayer->graphicsSurfaceToken(), even if m_canvasPlatformLayer equals platformLayer.
- m_canvasNeedsDestroy = true;
- m_canvasNeedsCreate = true;
+ m_pendingCanvasOperation |= RecreateCanvas;
}
} else {
if (platformLayer)
- m_canvasNeedsCreate = true;
+ m_pendingCanvasOperation |= CreateAndSyncCanvas;
}
m_canvasPlatformLayer = platformLayer;
@@ -344,8 +348,7 @@
m_canvasSize = m_canvasPlatformLayer ? m_canvasPlatformLayer->platformLayerSize() : IntSize();
m_canvasToken = m_canvasPlatformLayer ? m_canvasPlatformLayer->graphicsSurfaceToken() : GraphicsSurfaceToken();
ASSERT(!(!m_canvasToken.isValid() && m_canvasPlatformLayer));
- if (m_canvasPlatformLayer)
- m_canvasNeedsDisplay = true;
+
if (client())
client()->notifyFlushRequired(this);
#else
@@ -593,43 +596,50 @@
m_coordinator->setLayerAnimations(m_id, m_animations);
}
+#if USE(GRAPHICS_SURFACE)
void CoordinatedGraphicsLayer::syncCanvas()
{
destroyCanvasIfNeeded();
createCanvasIfNeeded();
- if (!m_canvasNeedsDisplay)
+ if (!(m_pendingCanvasOperation & SyncCanvas))
return;
- ASSERT(m_canvasPlatformLayer);
-#if USE(GRAPHICS_SURFACE)
+ m_pendingCanvasOperation &= ~SyncCanvas;
+
+ if (!m_isValidCanvas)
+ return;
+
m_coordinator->syncCanvas(m_id, m_canvasPlatformLayer);
-#endif
- m_canvasNeedsDisplay = false;
}
void CoordinatedGraphicsLayer::destroyCanvasIfNeeded()
{
- if (!m_canvasNeedsDestroy)
+ if (!(m_pendingCanvasOperation & DestroyCanvas))
return;
-#if USE(GRAPHICS_SURFACE)
- m_coordinator->destroyCanvas(m_id);
-#endif
- m_canvasNeedsDestroy = false;
+ if (m_isValidCanvas) {
+ m_coordinator->destroyCanvas(m_id);
+ m_isValidCanvas = false;
+ }
+
+ m_pendingCanvasOperation &= ~DestroyCanvas;
}
void CoordinatedGraphicsLayer::createCanvasIfNeeded()
{
- if (!m_canvasNeedsCreate)
+ if (!(m_pendingCanvasOperation & CreateCanvas))
return;
ASSERT(m_canvasPlatformLayer);
-#if USE(GRAPHICS_SURFACE)
- m_coordinator->createCanvas(m_id, m_canvasPlatformLayer);
+ if (!m_isValidCanvas) {
+ m_coordinator->createCanvas(m_id, m_canvasPlatformLayer);
+ m_isValidCanvas = true;
+ }
+
+ m_pendingCanvasOperation &= ~CreateCanvas;
+}
#endif
- m_canvasNeedsCreate = false;
-}
void CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly()
{
@@ -647,7 +657,9 @@
syncFilters();
#endif
updateContentBuffers();
+#if USE(GRAPHICS_SURFACE)
syncCanvas();
+#endif
}
bool CoordinatedGraphicsLayer::imageBackingVisible()
@@ -873,7 +885,12 @@
return true;
}
- if (!m_shouldSyncLayerState && !m_shouldSyncChildren && !m_shouldSyncFilters && !m_shouldSyncImageBacking && !m_shouldSyncAnimations && !m_canvasNeedsDisplay)
+ bool shouldSyncCanvas = false;
+#if USE(GRAPHICS_SURFACE)
+ shouldSyncCanvas = m_pendingCanvasOperation & SyncCanvas;
+#endif
+
+ if (!m_shouldSyncLayerState && !m_shouldSyncChildren && !m_shouldSyncFilters && !m_shouldSyncImageBacking && !m_shouldSyncAnimations && !shouldSyncCanvas)
return false;
return tiledBackingStoreVisibleRect().intersects(tiledBackingStoreContentsRect());
Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.h (141246 => 141247)
--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.h 2013-01-30 11:55:07 UTC (rev 141246)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.h 2013-01-30 11:56:42 UTC (rev 141247)
@@ -170,6 +170,21 @@
bool hasPendingVisibleChanges();
private:
+#if USE(GRAPHICS_SURFACE)
+ enum PendingCanvasOperation {
+ None = 0x00,
+ CreateCanvas = 0x01,
+ DestroyCanvas = 0x02,
+ SyncCanvas = 0x04,
+ CreateAndSyncCanvas = CreateCanvas | SyncCanvas,
+ RecreateCanvas = CreateAndSyncCanvas | DestroyCanvas
+ };
+
+ void syncCanvas();
+ void destroyCanvasIfNeeded();
+ void createCanvasIfNeeded();
+#endif
+
virtual void setDebugBorder(const Color&, float width) OVERRIDE;
bool fixedToViewport() const { return m_fixedToViewport; }
@@ -190,7 +205,6 @@
void syncFilters();
#endif
void syncImageBacking();
- void syncCanvas();
void computeTransformedVisibleRect();
void updateContentBuffers();
@@ -199,10 +213,6 @@
// CoordinatedImageBacking::Host
virtual bool imageBackingVisible() OVERRIDE;
-
- void destroyCanvasIfNeeded();
- void createCanvasIfNeeded();
-
bool shouldHaveBackingStore() const;
bool selfOrAncestorHasActiveTransformAnimation() const;
bool selfOrAncestorHaveNonAffineTransforms();
@@ -232,11 +242,12 @@
bool m_shouldSyncImageBacking: 1;
bool m_shouldSyncAnimations: 1;
bool m_fixedToViewport : 1;
- bool m_canvasNeedsDisplay : 1;
- bool m_canvasNeedsCreate : 1;
- bool m_canvasNeedsDestroy : 1;
bool m_pendingContentsScaleAdjustment : 1;
bool m_pendingVisibleRectAdjustment : 1;
+#if USE(GRAPHICS_SURFACE)
+ bool m_isValidCanvas : 1;
+ unsigned m_pendingCanvasOperation : 3;
+#endif
WebKit::CoordinatedGraphicsLayerClient* m_coordinator;
OwnPtr<TiledBackingStore> m_mainBackingStore;