[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 5487b6ffd5e20720b69d11f22c38c587b3869a41
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 6 07:26:15 2009 +0000

    2009-11-05  Yuta Kitamura  <yutak at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Fix ASSERT(currentStyle = renderStyle()).
            https://bugs.webkit.org/show_bug.cgi?id=31152
    
            * dom/Element.cpp:
            (WebCore::Element::pseudoStyleCacheIsInvalid): We should have used "==" instead of "=".
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50592 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4ae7989..a6a0885 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-05  Yuta Kitamura  <yutak at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Fix ASSERT(currentStyle = renderStyle()).
+        https://bugs.webkit.org/show_bug.cgi?id=31152
+
+        * dom/Element.cpp:
+        (WebCore::Element::pseudoStyleCacheIsInvalid): We should have used "==" instead of "=".
+
 2009-11-05  Alpha Lam  <hclam at chromium.org>
 
         Revert 50562 because it broke Chromium. Not reviewed since this is a build fix and revert.
diff --git a/WebCore/dom/Element.cpp b/WebCore/dom/Element.cpp
index 2e7c44f..8513b26 100644
--- a/WebCore/dom/Element.cpp
+++ b/WebCore/dom/Element.cpp
@@ -759,7 +759,7 @@ void Element::detach()
 
 bool Element::pseudoStyleCacheIsInvalid(const RenderStyle* currentStyle, RenderStyle* newStyle)
 {
-    ASSERT(currentStyle = renderStyle());
+    ASSERT(currentStyle == renderStyle());
 
     if (!renderer() || !currentStyle)
         return false;

-- 
WebKit Debian packaging