Changeset 75986 in webkit

Timestamp:

Jan 17, 2011 5:45:14 PM (13 years ago)

Author:

Adam Roben

Message:

Remove contexts from WKCACFContextFlusher before destroying them

We aren't really using WKCACFContextFlusher for anything useful at the
moment, but that will probably change in the near future.

I couldn't come up with a way to test this because it isn't possible to
resize a window in DumpRenderTree.

Fixes <​http://webkit.org/b/52573> REGRESSION (r75262): Crash beneath
WKCACFContextFlusher::flushAllContexts when resizing window on page
that uses accelerated compositing

Reviewed by Simon Fraser.

• platform/graphics/win/WKCACFLayerRenderer.cpp:

(WebCore::WKCACFLayerRenderer::~WKCACFLayerRenderer): Remove our
context from WKCACFContextFlusher. (This code was erroneously removed
from WKCACFLayerRenderer::destroyRenderer in r75262. This is a more
sensible place for it.)

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/win/WKCACFLayerRenderer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-17  Adam Roben  <aroben@apple.com>
+
+        Remove contexts from WKCACFContextFlusher before destroying them
+
+        We aren't really using WKCACFContextFlusher for anything useful at the
+        moment, but that will probably change in the near future.
+
+        I couldn't come up with a way to test this because it isn't possible to
+        resize a window in DumpRenderTree.
+
+        Fixes <http://webkit.org/b/52573> REGRESSION (r75262): Crash beneath
+        WKCACFContextFlusher::flushAllContexts when resizing window on page
+        that uses accelerated compositing
+
+        Reviewed by Simon Fraser.
+
+        * platform/graphics/win/WKCACFLayerRenderer.cpp:
+        (WebCore::WKCACFLayerRenderer::~WKCACFLayerRenderer): Remove our
+        context from WKCACFContextFlusher. (This code was erroneously removed
+        from WKCACFLayerRenderer::destroyRenderer in r75262. This is a more
+        sensible place for it.)
+
 2011-01-17  Adam Roben  <aroben@apple.com>
 

trunk/Source/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp

@@ -226 +226 @@
 {
     destroyRenderer();
+    WKCACFContextFlusher::shared().removeContext(m_context);
     wkCACFContextDestroy(m_context);
 }