[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[enrica at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 6884db25d161e6e8176b785e757478d276cd7aa6
Author: enrica at apple.com <enrica at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 11 03:58:44 2010 +0000

    Crash in WebKit!WebCore::RenderTextControlSingleLine::createInnerTextStyle doing anything in Safari after sitting on a page with 3D site
    <rdar://problem/7557201>
    https://bugs.webkit.org/show_bug.cgi?id=34823
    
    Reviewed by Simon Fraser.
    
    No tests added because the code is exercised by the existing tests.
    
    The root cause was the fact that we were not releasing a reference that was held by CA.
    In debug builds we had an assert in the destructor of WKCACFLayer.
    
    * platform/graphics/win/GraphicsLayerCACF.cpp:
    (WebCore::GraphicsLayerCACF::~GraphicsLayerCACF):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54641 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7796ac5..d976ca7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-02-10  Enrica Casucci  <enrica at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Crash in WebKit!WebCore::RenderTextControlSingleLine::createInnerTextStyle doing anything in Safari after sitting on a page with 3D site        
+        <rdar://problem/7557201>
+        https://bugs.webkit.org/show_bug.cgi?id=34823
+        
+        No tests added because the code is exercised by the existing tests.
+        
+        The root cause was the fact that we were not releasing a reference that was held by CA.
+        In debug builds we had an assert in the destructor of WKCACFLayer.
+        
+        * platform/graphics/win/GraphicsLayerCACF.cpp:
+        (WebCore::GraphicsLayerCACF::~GraphicsLayerCACF):
+
 2010-02-10  Kwang Yul Seo  <skyul at company100.net>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/graphics/win/GraphicsLayerCACF.cpp b/WebCore/platform/graphics/win/GraphicsLayerCACF.cpp
index ca7e496..49b5af3 100644
--- a/WebCore/platform/graphics/win/GraphicsLayerCACF.cpp
+++ b/WebCore/platform/graphics/win/GraphicsLayerCACF.cpp
@@ -135,6 +135,9 @@ GraphicsLayerCACF::~GraphicsLayerCACF()
     if (m_layer)
         m_layer->removeFromSuperlayer();
     
+    if (m_contentsLayer)
+        m_contentsLayer->removeFromSuperlayer();
+
     if (m_transformLayer)
         m_transformLayer->removeFromSuperlayer();
 }

-- 
WebKit Debian packaging