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

[bfulgham at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit ca8fbe2857cd4cac8c5fe4d69313cce1879ac4a0
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 22 19:38:27 2010 +0000

    Unreviewed.
    
    Build fix for invalid assertion after r68059.
    
    * editing/ApplyStyleCommand.cpp:
    (WebCore::getPropertiesNotIn): Correct assertion target after
    name change.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68072 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 98167de..541fa44 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-22  Brent Fulgham  <bfulgham at webkit.org>
+
+        Unreviewed.
+
+        Build fix for invalid assertion after r68059.
+
+        * editing/ApplyStyleCommand.cpp:
+        (WebCore::getPropertiesNotIn): Correct assertion target after
+        name change.
+
 2010-09-22  David Hyatt  <hyatt at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/editing/ApplyStyleCommand.cpp b/WebCore/editing/ApplyStyleCommand.cpp
index f840fdb..a904033 100644
--- a/WebCore/editing/ApplyStyleCommand.cpp
+++ b/WebCore/editing/ApplyStyleCommand.cpp
@@ -391,7 +391,7 @@ static bool fontWeightIsBold(CSSStyleDeclaration* style)
 RefPtr<CSSMutableStyleDeclaration> getPropertiesNotIn(CSSStyleDeclaration* styleWithRedundantProperties, CSSStyleDeclaration* baseStyle)
 {
     ASSERT(styleWithRedundantProperties);
-    ASSERT(computedStyle);
+    ASSERT(baseStyle);
     RefPtr<CSSMutableStyleDeclaration> result = styleWithRedundantProperties->copy();
     baseStyle->diff(result.get());
 

-- 
WebKit Debian packaging