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

[jschuh at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 662a2110b449128a3e577f1ecbd3e8a8a7897bb7
Author: jschuh at chromium.org <jschuh at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 13 19:34:10 2010 +0000

    2010-12-13  Justin Schuh  <jschuh at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Build fix for r73927
            https://bugs.webkit.org/show_bug.cgi?id=50946
    
            Reverting CSSCanvasValue::canvasDestroyed to its code before r73927
            because it's breaking the build and I changed it only because it
            appeared redunudant after r73927.
    
            No behavior changed so no new tests needed.
    
            * css/CSSCanvasValue.cpp:
            (WebCore::CSSCanvasValue::canvasDestroyed):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73937 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d2825dc..b05c873 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-13  Justin Schuh  <jschuh at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Build fix for r73927
+        https://bugs.webkit.org/show_bug.cgi?id=50946
+
+        Reverting CSSCanvasValue::canvasDestroyed to its code before r73927
+        because it's breaking the build and I changed it only because it
+        appeared redunudant after r73927.
+
+        No behavior changed so no new tests needed.
+
+        * css/CSSCanvasValue.cpp:
+        (WebCore::CSSCanvasValue::canvasDestroyed):
+
 2010-12-13  Matthew Delaney  <mdelaney at apple.com>
 
         Reviewed by nobody, build fix.
diff --git a/WebCore/css/CSSCanvasValue.cpp b/WebCore/css/CSSCanvasValue.cpp
index e9e83c5..948dc74 100644
--- a/WebCore/css/CSSCanvasValue.cpp
+++ b/WebCore/css/CSSCanvasValue.cpp
@@ -62,7 +62,8 @@ void CSSCanvasValue::canvasResized(HTMLCanvasElement*)
 void CSSCanvasValue::canvasDestroyed(HTMLCanvasElement* element)
 {
     ASSERT(element == m_element);
-    m_element = 0;
+    if (element == m_element)
+        m_element = 0;
 }
 
 IntSize CSSCanvasValue::fixedSize(const RenderObject* renderer)

-- 
WebKit Debian packaging