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

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 48e56164578def7f3ed3d35c7e37b04e82a93d48
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 13 22:24:58 2010 +0000

    2010-10-13  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Holger Freyther.
    
            [GTK] r69681 caused some tests to crash
            https://bugs.webkit.org/show_bug.cgi?id=47622
    
            Properly initialize m_layerContext on the ContextShadow so that in situations
            where beginShadowLayer bails out early with a null return value, it is set
            to null. This may happen when the first call to beginShadowLayer on a particular
            ContextShadow uses a region which is entirely outside the clip region or which
            is empty.
    
            * platform/graphics/cairo/ContextShadow.cpp:
            (WebCore::ContextShadow::ContextShadow): Properly initialize m_layerContext.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69701 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4edbd84..07b3884 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-13  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Holger Freyther.
+
+        [GTK] r69681 caused some tests to crash
+        https://bugs.webkit.org/show_bug.cgi?id=47622
+
+        Properly initialize m_layerContext on the ContextShadow so that in situations
+        where beginShadowLayer bails out early with a null return value, it is set
+        to null. This may happen when the first call to beginShadowLayer on a particular
+        ContextShadow uses a region which is entirely outside the clip region or which
+        is empty.
+
+        * platform/graphics/cairo/ContextShadow.cpp:
+        (WebCore::ContextShadow::ContextShadow): Properly initialize m_layerContext.
+
 2010-10-13  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Beth Dakin.
diff --git a/WebCore/platform/graphics/ContextShadow.cpp b/WebCore/platform/graphics/ContextShadow.cpp
index 79803b0..87a1c5c 100644
--- a/WebCore/platform/graphics/ContextShadow.cpp
+++ b/WebCore/platform/graphics/ContextShadow.cpp
@@ -40,6 +40,7 @@ namespace WebCore {
 ContextShadow::ContextShadow()
     : m_type(NoShadow)
     , m_blurDistance(0)
+    , m_layerContext(0)
 {
 }
 
@@ -47,6 +48,7 @@ ContextShadow::ContextShadow(const Color& color, float radius, const FloatSize&
     : m_color(color)
     , m_blurDistance(round(radius))
     , m_offset(offset)
+    , m_layerContext(0)
 {
     // See comments in http://webkit.org/b/40793, it seems sensible
     // to follow Skia's limit of 128 pixels of blur radius

-- 
WebKit Debian packaging