Changeset 125693 in webkit

Timestamp:

Aug 15, 2012 12:28:20 PM (12 years ago)

Author:

ojan@chromium.org

Message:

z-index should work without position on flexitems
​https://bugs.webkit.org/show_bug.cgi?id=91405

Reviewed by Tony Chang.

Source/WebCore:

Require a layer on any RenderBox that has a non-auto z-index.
Statically positioned, non-flex-item's have their z-index coerced to auto,
so it's safe to check z-index unconditionally.

Test: css3/flexbox/z-index.html

• css/StyleResolver.cpp:

(WebCore::StyleResolver::adjustRenderStyle):
-Don't coerce z-index to auto on statically positioned flex-items.
-Use the parentStyle to determine if the parent is a flexbox instead of
looking at the element's parentNode's renderer.

• rendering/RenderBox.h:

-Add having a non-auto z-index to the list of things that require a layer.

LayoutTests:

• css3/flexbox/z-index-expected.html: Added.
• css3/flexbox/z-index.html: Added.

Use a ref-test since we want to be sure that the elements get painted in the right order.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/z-index-expected.html (added)
• LayoutTests/css3/flexbox/z-index.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleResolver.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderBox.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-10  Ojan Vafai  <ojan@chromium.org>
+
+        z-index should work without position on flexitems
+        https://bugs.webkit.org/show_bug.cgi?id=91405
+
+        Reviewed by Tony Chang.
+
+        * css3/flexbox/z-index-expected.html: Added.
+        * css3/flexbox/z-index.html: Added.
+        Use a ref-test since we want to be sure that the elements get painted in the right order.
+
 2012-08-15  Scott Graham  <scottmg@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-10  Ojan Vafai  <ojan@chromium.org>
+
+        z-index should work without position on flexitems
+        https://bugs.webkit.org/show_bug.cgi?id=91405
+
+        Reviewed by Tony Chang.
+
+        Require a layer on any RenderBox that has a non-auto z-index.
+        Statically positioned, non-flex-item's have their z-index coerced to auto,
+        so it's safe to check z-index unconditionally.
+
+        Test: css3/flexbox/z-index.html
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::adjustRenderStyle):
+        -Don't coerce z-index to auto on statically positioned flex-items.
+        -Use the parentStyle to determine if the parent is a flexbox instead of
+        looking at the element's parentNode's renderer.
+        * rendering/RenderBox.h:
+        -Add having a non-auto z-index to the list of things that require a layer.
+
 2012-08-15  Joanmarie Diggs  <jdiggs@igalia.com>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -2068 +2068 @@
 }
 
+static bool isDisplayFlexibleBox(EDisplay display)
+{
+#if ENABLE(CSS3_FLEXBOX)
+    return display == FLEX || display == INLINE_FLEX;
+#else
+    return false;
+#endif
+}
+
 void StyleResolver::adjustRenderStyle(RenderStyle* style, RenderStyle* parentStyle, Element *e)
 {
@@ -2155 +2164 @@
             style->setWritingMode(TopToBottomWritingMode);
 
-        if (e && e->parentNode() && e->parentNode()->renderer() && e->parentNode()->renderer()->isFlexibleBox()) {
+        if (isDisplayFlexibleBox(parentStyle->display())) {
             style->setFloating(NoFloat);
             style->setDisplay(equivalentBlockDisplay(style->display(), style->isFloating(), m_checker.strictParsing()));
@@ -2162 +2171 @@
 
     // Make sure our z-index value is only applied if the object is positioned.
-    if (style->position() == StaticPosition)
+    if (style->position() == StaticPosition && !isDisplayFlexibleBox(parentStyle->display()))
         style->setHasAutoZIndex();
 

trunk/Source/WebCore/rendering/RenderBox.h

@@ -43 +43 @@
     virtual ~RenderBox();
 
-    virtual bool requiresLayer() const OVERRIDE { return isRoot() || isOutOfFlowPositioned() || isRelPositioned() || isTransparent() || hasOverflowClip() || hasTransform() || hasHiddenBackface() || hasMask() || hasReflection() || hasFilter() || style()->specifiesColumns(); }
+    // hasAutoZIndex only returns true if the element is positioned or a flex-item since
+    // position:static elements that are not flex-items get their z-index coerced to auto.
+    virtual bool requiresLayer() const OVERRIDE { return isRoot() || isOutOfFlowPositioned() || isRelPositioned() || isTransparent() || hasOverflowClip() || hasTransform() || hasHiddenBackface() || hasMask() || hasReflection() || hasFilter() || style()->specifiesColumns() || !style()->hasAutoZIndex(); }
 
     // Use this with caution! No type checking is done!