Changeset 123842 in webkit

Timestamp:

Jul 27, 2012 12:27:44 AM (12 years ago)

Author:

tony@chromium.org

Message:

changing -webkit-order should change the paint order of flex items
​https://bugs.webkit.org/show_bug.cgi?id=92041

Reviewed by Ojan Vafai.

Source/WebCore:

Override paintChildren and use the flex order iterator to determine the order to paint the children.

Test: css3/flexbox/order-painting.html

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::layoutBlock): Save a reference to the order iterator.
(WebCore::RenderFlexibleBox::paintChildren):

• rendering/RenderFlexibleBox.h:

(RenderFlexibleBox): Hold a reference to the order iterator so we don't have to recreate it at paint time.

Also mark all the virtual methods with OVERRIDE.

LayoutTests:

Use a ref test since this is testing paint behavior.

• css3/flexbox/order-painting-expected.html: Added.
• css3/flexbox/order-painting.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/order-painting-expected.html (added)
• LayoutTests/css3/flexbox/order-painting.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderFlexibleBox.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-27  Tony Chang  <tony@chromium.org>
+
+        changing -webkit-order should change the paint order of flex items
+        https://bugs.webkit.org/show_bug.cgi?id=92041
+
+        Reviewed by Ojan Vafai.
+
+        Use a ref test since this is testing paint behavior.
+
+        * css3/flexbox/order-painting-expected.html: Added.
+        * css3/flexbox/order-painting.html: Added.
+
 2012-07-27  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-27  Tony Chang  <tony@chromium.org>
+
+        changing -webkit-order should change the paint order of flex items
+        https://bugs.webkit.org/show_bug.cgi?id=92041
+
+        Reviewed by Ojan Vafai.
+
+        Override paintChildren and use the flex order iterator to determine the order to paint the children.
+
+        Test: css3/flexbox/order-painting.html
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutBlock): Save a reference to the order iterator.
+        (WebCore::RenderFlexibleBox::paintChildren):
+        * rendering/RenderFlexibleBox.h:
+        (RenderFlexibleBox): Hold a reference to the order iterator so we don't have to recreate it at paint time.
+            Also mark all the virtual methods with OVERRIDE.
+
 2012-07-26  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -260 +260 @@
     OrderHashSet orderValues;
     computeMainAxisPreferredSizes(relayoutChildren, orderValues);
-    OrderIterator flexIterator(this, orderValues);
-    layoutFlexItems(flexIterator, lineContexts);
+    m_orderIterator = adoptPtr(new OrderIterator(this, orderValues));
+    layoutFlexItems(*m_orderIterator, lineContexts);
 
     LayoutUnit oldClientAfterEdge = clientLogicalBottom();
     computeLogicalHeight();
-    repositionLogicalHeightDependentFlexItems(flexIterator, lineContexts, oldClientAfterEdge);
+    repositionLogicalHeightDependentFlexItems(*m_orderIterator, lineContexts, oldClientAfterEdge);
 
     if (size() != previousSize)
@@ -288 +288 @@
 
     setNeedsLayout(false);
+}
+
+void RenderFlexibleBox::paintChildren(PaintInfo& paintInfo, const LayoutPoint& paintOffset, PaintInfo& paintInfoForChild, bool usePrintRect)
+{
+    ASSERT(m_orderIterator);
+
+    for (RenderBox* child = m_orderIterator->first(); child; child = m_orderIterator->next()) {
+        if (!paintChild(child, paintInfo, paintOffset, paintInfoForChild, usePrintRect))
+            return;
+    }
 }
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.h

@@ -33 +33 @@
 
 #include "RenderBlock.h"
+#include <wtf/OwnPtr.h>
 
 namespace WebCore {
@@ -41 +42 @@
     virtual ~RenderFlexibleBox();
 
-    virtual const char* renderName() const;
+    virtual const char* renderName() const OVERRIDE;
 
-    virtual bool isFlexibleBox() const { return true; }
-    virtual void computePreferredLogicalWidths();
-    virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0);
+    virtual bool isFlexibleBox() const OVERRIDE { return true; }
+    virtual void computePreferredLogicalWidths() OVERRIDE;
+    virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) OVERRIDE;
+
+    virtual void paintChildren(PaintInfo& forSelf, const LayoutPoint&, PaintInfo& forChild, bool usePrintRect) OVERRIDE;
 
     bool isHorizontalFlow() const;
@@ -133 +136 @@
     void flipForRightToLeftColumn(OrderIterator&);
     void flipForWrapReverse(OrderIterator&, const WTF::Vector<LineContext>&, LayoutUnit crossAxisStartEdge);
+
+    OwnPtr<OrderIterator> m_orderIterator;
 };