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

[krit at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit b5ba300c6c408ca55ae325f80e49357e4a87f3af
Author: krit at webkit.org <krit at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 19 23:06:34 2010 +0000

    2010-02-19  Dirk Schulze  <krit at webkit.org>
    
            Reviewed by Nikolas Zimmermann.
    
            RenderSVGResourceMasker causes an Assert on Wind builds during DRT
            https://bugs.webkit.org/show_bug.cgi?id=35182
    
            We remove the Assert for now and return earlier, if the HashMap of the Masker
            does not contain the RenderObject. The RenderObject is an identifiert to get
            a already calculated mask.
            A race condition during parsing can cause the invalidation call, before the mask
            got calculated (only during DRT on Win build bots).
            The real bug will be fixed with: https://bugs.webkit.org/show_bug.cgi?id=35181
    
            * rendering/RenderSVGResourceMasker.cpp:
            (WebCore::RenderSVGResourceMasker::invalidateClient):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55033 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 70567bd..01d1a54 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-02-19  Dirk Schulze  <krit at webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        RenderSVGResourceMasker causes an Assert on Wind builds during DRT
+        https://bugs.webkit.org/show_bug.cgi?id=35182
+
+        We remove the Assert for now and return earlier, if the HashMap of the Masker
+        does not contain the RenderObject. The RenderObject is an identifiert to get
+        a already calculated mask.
+        A race condition during parsing can cause the invalidation call, before the mask
+        got calculated (only during DRT on Win build bots).
+        The real bug will be fixed with: https://bugs.webkit.org/show_bug.cgi?id=35181
+
+        * rendering/RenderSVGResourceMasker.cpp:
+        (WebCore::RenderSVGResourceMasker::invalidateClient):
+
 2010-02-18  Peter Kasting  <pkasting at google.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/rendering/RenderSVGResourceMasker.cpp b/WebCore/rendering/RenderSVGResourceMasker.cpp
index 614f7a8..2923c6e 100644
--- a/WebCore/rendering/RenderSVGResourceMasker.cpp
+++ b/WebCore/rendering/RenderSVGResourceMasker.cpp
@@ -64,7 +64,14 @@ void RenderSVGResourceMasker::invalidateClients()
 void RenderSVGResourceMasker::invalidateClient(RenderObject* object)
 {
     ASSERT(object);
-    ASSERT(m_masker.contains(object));
+
+    // FIXME: The HashMap should always contain the object on calling invalidateClient. A race condition
+    // during the parsing can causes a call of invalidateClient right before the call of applyResource.
+    // We return earlier for the moment. This bug should be fixed in:
+    // https://bugs.webkit.org/show_bug.cgi?id=35181
+    if (!m_masker.contains(object))
+        return;
+
     delete m_masker.take(object); 
 }
 

-- 
WebKit Debian packaging