Changeset 119564 in webkit

Timestamp:

Jun 5, 2012 11:45:22 PM (12 years ago)

Author:

tony@chromium.org

Message:

Changing flexbox justify/alignment doesn't update their positioning
​https://bugs.webkit.org/show_bug.cgi?id=88366

Reviewed by Ojan Vafai.

Source/WebCore:

Test: css3/flexbox/style-change.html

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::diff): Since these member variables were moved
out of StyleFlexibleBoxData, we have to compare them in RenderStyle::diff.

LayoutTests:

• css3/flexbox/style-change-expected.txt: Added.
• css3/flexbox/style-change.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/style-change-expected.txt (added)
• LayoutTests/css3/flexbox/style-change.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-05  Tony Chang  <tony@chromium.org>
+
+        Changing flexbox justify/alignment doesn't update their positioning
+        https://bugs.webkit.org/show_bug.cgi?id=88366
+
+        Reviewed by Ojan Vafai.
+
+        * css3/flexbox/style-change-expected.txt: Added.
+        * css3/flexbox/style-change.html: Added.
+
 2012-06-05  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-05  Tony Chang  <tony@chromium.org>
+
+        Changing flexbox justify/alignment doesn't update their positioning
+        https://bugs.webkit.org/show_bug.cgi?id=88366
+
+        Reviewed by Ojan Vafai.
+
+        Test: css3/flexbox/style-change.html
+
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::diff): Since these member variables were moved
+        out of StyleFlexibleBoxData, we have to compare them in RenderStyle::diff.
+
 2012-06-05  Charles Wei  <charles.wei@torchmobile.com.cn>
 

trunk/Source/WebCore/rendering/style/RenderStyle.cpp

@@ -396 +396 @@
         if (rareNonInheritedData->m_flexibleBox.get() != other->rareNonInheritedData->m_flexibleBox.get()
             && *rareNonInheritedData->m_flexibleBox.get() != *other->rareNonInheritedData->m_flexibleBox.get())
+            return StyleDifferenceLayout;
+        if (rareNonInheritedData->m_order != other->rareNonInheritedData->m_order
+            || rareNonInheritedData->m_alignContent != other->rareNonInheritedData->m_alignContent
+            || rareNonInheritedData->m_alignItems != other->rareNonInheritedData->m_alignItems
+            || rareNonInheritedData->m_alignSelf != other->rareNonInheritedData->m_alignSelf
+            || rareNonInheritedData->m_justifyContent != other->rareNonInheritedData->m_justifyContent)
             return StyleDifferenceLayout;