Changeset 104802 in webkit

Timestamp:

Jan 12, 2012 2:22:48 AM (12 years ago)

Author:

mihnea@adobe.com

Message:

Add RenderStyle::isPositioned() helper method
​https://bugs.webkit.org/show_bug.cgi?id=75959

Reviewed by Tony Chang.

No new tests since this is refactoring of existing code.

Replace (style()->position() == AbsolutePosition

style()->position() == FixedPosition)

with (style()->isPositioned()).
Replace (style()->position() != AbsolutePosition && style()->position() != FixedPosition)
with (!style()->isPositioned()).

• rendering/RenderBox.cpp:

(WebCore::RenderBox::updateBoxModelInfoFromStyle):
(WebCore::RenderBox::offsetFromContainer):

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::mapAbsoluteToLocalPoint):

• rendering/RenderInline.cpp:

(WebCore::RenderInline::computeRectForRepaint):

• rendering/RenderObject.cpp:

(WebCore::RenderObject::markContainingBlocksForLayout):
(WebCore::RenderObject::setPreferredLogicalWidthsDirty):
(WebCore::RenderObject::invalidateContainerPreferredLogicalWidths):

• rendering/style/RenderStyle.h:

(WebCore::RenderStyleBitfields::isPositioned):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (2 diffs)
• rendering/RenderBoxModelObject.cpp (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (3 diffs)
• rendering/style/RenderStyle.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-12  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        Add RenderStyle::isPositioned() helper method
+        https://bugs.webkit.org/show_bug.cgi?id=75959
+
+        Reviewed by Tony Chang.
+
+        No new tests since this is refactoring of existing code.
+        Replace (style()->position() == AbsolutePosition || style()->position() == FixedPosition) 
+        with (style()->isPositioned()).
+        Replace (style()->position() != AbsolutePosition && style()->position() != FixedPosition) 
+        with (!style()->isPositioned()).
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::updateBoxModelInfoFromStyle):
+        (WebCore::RenderBox::offsetFromContainer):
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::mapAbsoluteToLocalPoint):
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::computeRectForRepaint):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::markContainingBlocksForLayout):
+        (WebCore::RenderObject::setPreferredLogicalWidthsDirty):
+        (WebCore::RenderObject::invalidateContainerPreferredLogicalWidths):
+        * rendering/style/RenderStyle.h:
+        (WebCore::RenderStyleBitfields::isPositioned):
+
 2012-01-11  KwangHyuk Kim  <hyuki.kim@samsung.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -410 +410 @@
         setHasBoxDecorations(true);
 
-    setPositioned(style()->position() == AbsolutePosition || style()->position() == FixedPosition);
+    setPositioned(style()->isPositioned());
     setFloating(style()->isFloating() && (!isPositioned() || style()->floating() == PositionedFloat));
 
@@ -1398 +1398 @@
 
     if (!isInline() || isReplaced()) {
-        if (style()->position() != AbsolutePosition && style()->position() != FixedPosition && o->hasColumns()) {
+        if (!style()->isPositioned() && o->hasColumns()) {
             RenderBlock* block = toRenderBlock(o);
             LayoutRect columnRect(frameRect());

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -2760 +2760 @@
     LayoutSize containerOffset = offsetFromContainer(o, LayoutPoint());
 
-    if (style()->position() != AbsolutePosition && style()->position() != FixedPosition && o->hasColumns()) {
+    if (!style()->isPositioned() && o->hasColumns()) {
         RenderBlock* block = static_cast<RenderBlock*>(o);
         LayoutPoint point(roundedLayoutPoint(transformState.mappedPoint()));

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -1054 +1054 @@
     LayoutPoint topLeft = rect.location();
 
-    if (o->isBlockFlow() && style()->position() != AbsolutePosition && style()->position() != FixedPosition) {
+    if (o->isBlockFlow() && !style()->isPositioned()) {
         RenderBlock* cb = toRenderBlock(o);
         if (cb->hasColumns()) {

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -627 +627 @@
         if (!container && !object->isRenderView())
             return;
-        if (!last->isText() && (last->style()->position() == FixedPosition || last->style()->position() == AbsolutePosition)) {
+        if (!last->isText() && last->style()->isPositioned()) {
             bool willSkipRelativelyPositionedInlines = !object->isRenderBlock();
             while (object && !object->isRenderBlock()) // Skip relatively positioned inlines and get to the enclosing RenderBlock.
@@ -667 +667 @@
     bool alreadyDirty = preferredLogicalWidthsDirty();
     m_bitfields.setPreferredLogicalWidthsDirty(b);
-    if (b && !alreadyDirty && markParents && (isText() || (style()->position() != FixedPosition && style()->position() != AbsolutePosition)))
+    if (b && !alreadyDirty && markParents && (isText() || !style()->isPositioned()))
         invalidateContainerPreferredLogicalWidths();
 }
@@ -684 +684 @@
 
         o->m_bitfields.setPreferredLogicalWidthsDirty(true);
-        if (o->style()->position() == FixedPosition || o->style()->position() == AbsolutePosition)
+        if (o->style()->isPositioned())
             // A positioned object has no effect on the min/max width of its containing block ever.
             // We can optimize this case and not go up any further.

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

@@ -509 +509 @@
 
     EPosition position() const { return static_cast<EPosition>(noninherited_flags._position); }
+    bool isPositioned() const { return position() == AbsolutePosition || position() == FixedPosition; }
     EFloat floating() const { return static_cast<EFloat>(noninherited_flags._floating); }