SyntheticStyleCalc on an element should not force recalculation on its children

https://bugs.webkit.org/show_bug.cgi?id=79389

Patch by Rob Arnold <robarnold@fb.com> on 2012-03-26
Reviewed by Simon Fraser.

No new tests. Existing tests cover correctness, not sure how to test for performance.

* dom/Element.cpp:
(WebCore::Element::recalcStyle):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@112155 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 235c1c7e49f7dd72db249689539980e6c2e02f7c..c3aabe1db01cff754226f716984ead0853c0918a 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-26  Rob Arnold  <robarnold@fb.com>
+
+        SyntheticStyleCalc on an element should not force recalculation on its children
+        https://bugs.webkit.org/show_bug.cgi?id=79389
+
+        Reviewed by Simon Fraser.
+
+        No new tests. Existing tests cover correctness, not sure how to test for performance.
+
+        * dom/Element.cpp:
+        (WebCore::Element::recalcStyle):
+
 2012-03-26  Tony Chang  <tony@chromium.org>
 
         apply cross axis constraints before aligning children in flexbox

diff --git a/Source/WebCore/dom/Element.cpp b/Source/WebCore/dom/Element.cpp
index 01cfb00ec7cead24e2197c363e78221552d2d841..ab011d14dbbd9a2311a63f299d52bcf0bd843ed0 100644 (file)
--- a/Source/WebCore/dom/Element.cpp
+++ b/Source/WebCore/dom/Element.cpp
@@ -1118,7 +1118,7 @@ void Element::recalcStyle(StyleChange change)
         }
 
         if (change != Force) {
-            if (styleChangeType() >= FullStyleChange)
+            if (styleChangeType() == FullStyleChange)
                 change = Force;
             else
                 change = ch;