[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[aroben at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit ff62db977ea7ccbbf6e7c9f180cd92094ba9e929
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 01:45:14 2011 +0000

    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.)
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75986 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index d71a309..db5846d 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,27 @@
 2011-01-17  Adam Roben  <aroben at 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 at apple.com>
+
         Don't access the CACFLayerRef's sublayers directly from PlatformCALayer
 
         There might be a secret extra sublayer (the tile parent layer) that
diff --git a/Source/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp b/Source/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
index 4c5e61d..4d77fbd 100644
--- a/Source/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
+++ b/Source/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
@@ -225,6 +225,7 @@ WKCACFLayerRenderer::WKCACFLayerRenderer(WKCACFLayerRendererClient* client)
 WKCACFLayerRenderer::~WKCACFLayerRenderer()
 {
     destroyRenderer();
+    WKCACFContextFlusher::shared().removeContext(m_context);
     wkCACFContextDestroy(m_context);
 }
 

-- 
WebKit Debian packaging