Changeset 147495 in webkit

Timestamp:

Apr 2, 2013 2:18:09 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[CSS Exclusions] refactor shape-outside code to use isFloatingWithShapeOutside() helper method
​https://bugs.webkit.org/show_bug.cgi?id=113799

Patch by Bem Jones-Bey <Bem Jones-Bey> on 2013-04-02
Reviewed by Dirk Schulze.

When reviewing my patch for bug 110349, Julien mentioned that the
common test for floating with shape outside should be factored out.
This patch does that.

No new functionality, so no new tests.

• rendering/ExclusionShapeOutsideInfo.cpp:

(WebCore::ExclusionShapeOutsideInfo::isEnabledFor): Use helper method.

• rendering/RenderBox.h:

(WebCore::RenderBox::exclusionShapeOutsideInfo): Ditto.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::shouldBeNormalFlowOnly): Ditto.

• rendering/RenderObject.h:

(WebCore::RenderObject::hasPaintOffset): Ditto.
(WebCore::RenderObject::isFloatingWithShapeOutside): Add method to

encapsulate the common test.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/ExclusionShapeOutsideInfo.cpp (modified) (1 diff)
• rendering/RenderBox.h (modified) (2 diffs)
• rendering/RenderLayer.cpp (modified) (1 diff)
• rendering/RenderObject.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-02  Bem Jones-Bey  <bjonesbe@adobe.com>
+
+        [CSS Exclusions] refactor shape-outside code to use isFloatingWithShapeOutside() helper method
+        https://bugs.webkit.org/show_bug.cgi?id=113799
+
+        Reviewed by Dirk Schulze.
+
+        When reviewing my patch for bug 110349, Julien mentioned that the
+        common test for floating with shape outside should be factored out.
+        This patch does that.
+
+        No new functionality, so no new tests.
+
+        * rendering/ExclusionShapeOutsideInfo.cpp:
+        (WebCore::ExclusionShapeOutsideInfo::isEnabledFor): Use helper method.
+        * rendering/RenderBox.h:
+        (WebCore::RenderBox::exclusionShapeOutsideInfo): Ditto.
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::shouldBeNormalFlowOnly): Ditto.
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::hasPaintOffset):  Ditto.
+        (WebCore::RenderObject::isFloatingWithShapeOutside): Add method to
+            encapsulate the common test.
+
 2013-04-02  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/rendering/ExclusionShapeOutsideInfo.cpp

@@ -40 +40 @@
 {
     ExclusionShapeValue* value = box->style()->shapeOutside();
-    return (box->isFloating() && value && value->type() == ExclusionShapeValue::SHAPE) ? value->shape() : 0;
+    return (box->isFloatingWithShapeOutside() && value->type() == ExclusionShapeValue::SHAPE) ? value->shape() : 0;
 }
 

trunk/Source/WebCore/rendering/RenderBox.h

@@ -50 +50 @@
     // 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() || isPositioned() || createsGroup() || hasClipPath() || hasOverflowClip() || hasTransform() || hasHiddenBackface() || hasReflection() || style()->specifiesColumns() || !style()->hasAutoZIndex() || (style()->shapeOutside() && isFloating()); }
+    virtual bool requiresLayer() const OVERRIDE { return isRoot() || isPositioned() || createsGroup() || hasClipPath() || hasOverflowClip() || hasTransform() || hasHiddenBackface() || hasReflection() || style()->specifiesColumns() || !style()->hasAutoZIndex() || isFloatingWithShapeOutside(); }
 
     virtual bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) const OVERRIDE;
@@ -583 +583 @@
     ExclusionShapeOutsideInfo* exclusionShapeOutsideInfo() const
     {
-        return style()->shapeOutside() && ExclusionShapeOutsideInfo::isEnabledFor(this) ? ExclusionShapeOutsideInfo::info(this) : 0;
+        return isFloatingWithShapeOutside() && ExclusionShapeOutsideInfo::isEnabledFor(this) ? ExclusionShapeOutsideInfo::info(this) : 0;
     }
 #endif

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -5848 +5848 @@
             && !needsCompositedScrolling()
 #if ENABLE(CSS_EXCLUSIONS)
-            && !(renderer()->isFloating() && renderer()->style()->shapeOutside())
+            && !renderer()->isFloatingWithShapeOutside()
 #endif
             ;

trunk/Source/WebCore/rendering/RenderObject.h

@@ -555 +555 @@
         // Shape outside on a float can reposition the float in much the
         // same way as relative positioning, so treat it as such.
-        positioned = positioned || (m_bitfields.floating() && m_bitfields.isBox() && style()->shapeOutside());
+        positioned = positioned || isFloatingWithShapeOutside();
 #endif
         return positioned;
@@ -880 +880 @@
 
     bool isFloatingOrOutOfFlowPositioned() const { return (isFloating() || isOutOfFlowPositioned()); }
+    bool isFloatingWithShapeOutside() const { return isBox() && isFloating() && style()->shapeOutside(); }
 
     bool isTransparent() const { return style()->opacity() < 1.0f; }