[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[simon.fraser at apple.com]

The following commit has been merged in the debian/experimental branch:
commit dedea2ad9baf9110917625edf3a50840e06f6a39
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 15 00:51:58 2010 +0000

    2010-12-14  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Chris Marrin.
    
            Crash in WebCore::GraphicsLayer::paintGraphicsLayerContents() loading this URL
            https://bugs.webkit.org/show_bug.cgi?id=51072
    
            Fix a crash when painting a layer whose PlatformCALayer has been deleted,
            by clearing the PlatformCALayer value on the CALayer when the PlatformCALayer
            is destroyed.
    
            I was not able to reduce the page to a simple testcase.
    
            * platform/graphics/ca/mac/PlatformCALayerMac.mm:
            (PlatformCALayer::~PlatformCALayer):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74074 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9c85d38..ad63713 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-14  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Chris Marrin.
+
+        Crash in WebCore::GraphicsLayer::paintGraphicsLayerContents() loading this URL
+        https://bugs.webkit.org/show_bug.cgi?id=51072
+
+        Fix a crash when painting a layer whose PlatformCALayer has been deleted,
+        by clearing the PlatformCALayer value on the CALayer when the PlatformCALayer
+        is destroyed.
+        
+        I was not able to reduce the page to a simple testcase.
+
+        * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+        (PlatformCALayer::~PlatformCALayer):
+
 2010-12-14  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Unreviewed, build fix.
diff --git a/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm b/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
index 3676adf..0aecf14 100644
--- a/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
+++ b/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
@@ -207,6 +207,8 @@ PlatformCALayer::PlatformCALayer(LayerType layerType, PlatformLayer* layer, Grap
 
 PlatformCALayer::~PlatformCALayer()
 {
+    [m_layer.get() setValue:nil forKey:platformCALayerPointer];
+
     // Clear the owner, which also clears it in the delegate to prevent attempts 
     // to use the GraphicsLayerCA after it has been destroyed.
     setOwner(0);

-- 
WebKit Debian packaging