[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[jschuh at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit df46b6b810adf5836a17f37aa54d1a1e0fc4c1c1
Author: jschuh at chromium.org <jschuh at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 24 10:00:08 2010 +0000

    2010-12-24  Justin Schuh  <jschuh at chromium.org>
    
            Reviewed by Darin Adler.
    
            Remove unnecessary check in CSSCanvasValue::canvasDestroyed().
            https://bugs.webkit.org/show_bug.cgi?id=51564
    
            This check was duplicating an ASSERT for a case fixed in r73927.
            Now that the bug is fixed the check is no longer necessary.
    
            Removing dead code, so no new tests needed.
    
            * css/CSSCanvasValue.cpp:
            (WebCore::CSSCanvasValue::canvasDestroyed):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74619 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 32fdffb..136cd25 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-24  Justin Schuh  <jschuh at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Remove unnecessary check in CSSCanvasValue::canvasDestroyed().
+        https://bugs.webkit.org/show_bug.cgi?id=51564
+
+        This check was duplicating an ASSERT for a case fixed in r73927.
+        Now that the bug is fixed the check is no longer necessary.
+
+        Removing dead code, so no new tests needed.
+
+        * css/CSSCanvasValue.cpp:
+        (WebCore::CSSCanvasValue::canvasDestroyed):
+
 2010-12-23  Evan Martin  <evan at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/css/CSSCanvasValue.cpp b/WebCore/css/CSSCanvasValue.cpp
index 948dc74..e28def9 100644
--- a/WebCore/css/CSSCanvasValue.cpp
+++ b/WebCore/css/CSSCanvasValue.cpp
@@ -61,9 +61,8 @@ void CSSCanvasValue::canvasResized(HTMLCanvasElement*)
 
 void CSSCanvasValue::canvasDestroyed(HTMLCanvasElement* element)
 {
-    ASSERT(element == m_element);
-    if (element == m_element)
-        m_element = 0;
+    ASSERT_UNUSED(element, element == m_element);
+    m_element = 0;
 }
 
 IntSize CSSCanvasValue::fixedSize(const RenderObject* renderer)

-- 
WebKit Debian packaging