Changeset 144520 in webkit

Timestamp:

Mar 1, 2013 5:16:29 PM (11 years ago)

Author:

betravis@adobe.com

Message:

[css exclusions] Move ExclusionShapeInsideInfo into RenderBlockRareData
​https://bugs.webkit.org/show_bug.cgi?id=110995

Reviewed by Julien Chaffraix.

This patch moves ExclusionShapeInsideInfo into the RenderBlockRareData struct,
which enables us to move away from the global ExclusionShapeInsideInfo map.
Some additional refactoring was done to remove ExclusionShapeInsideInfo's
dependency on InlineIterator, which depended on RenderBlock. This work required
adding a new LineSegmentIterator struct.

Refactoring, no new tests.

• rendering/ExclusionShapeInsideInfo.cpp:

(WebCore):
(WebCore::LineSegmentRange::LineSegmentRange): Moving the InlineIterator
constructor to the .cpp file, as InlineIterator is now forward declared in
the .h file.
(WebCore::ExclusionShapeInsideInfo::isEnabledFor): Moving isEnabledFor to
the .cpp file, as RenderBlock is now forward declared in the .h file.

• rendering/ExclusionShapeInsideInfo.h:

(WebCore):
(LineSegmentIterator): A simple struct for containing segment positions for
layout.
(WebCore::LineSegmentIterator::LineSegmentIterator): Constructor.
(LineSegmentRange): Transitioning to store LineSegmentIterator.
(WebCore::LineSegmentRange::LineSegmentRange): Ditto.
(ExclusionShapeInsideInfo):

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::willBeDestroyed): Destroying a block will now destroy
its ExclusionShapeInsideInfo, so there is no need to remove it from the map.
(WebCore):
(WebCore::RenderBlock::updateExclusionShapeInsideInfoAfterStyleChange): Use
the RenderBlockRareData struct rather than the global map.

• rendering/RenderBlock.h:

(WebCore):
(WebCore::RenderBlock::ensureExclusionShapeInsideInfo): Ensure an info struct
is present if the shape-inside style is set.
(WebCore::RenderBlock::exclusionShapeInsideInfo): Look up the info struct for
the current block.
(WebCore::RenderBlock::setExclusionShapeInsideInfo): Update the info struct
for the current block.
(RenderBlockRareData): Add the ExclusionShapeInsideInfo member.

• rendering/RenderBlockLineLayout.cpp:

(WebCore::constructBidiRunsForLine): Construct the appropriate offsets during
layout based on the stored LineSegmentIterators.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/ExclusionShapeInsideInfo.cpp (modified) (1 diff)
• rendering/ExclusionShapeInsideInfo.h (modified) (2 diffs)
• rendering/RenderBlock.cpp (modified) (3 diffs)
• rendering/RenderBlock.h (modified) (4 diffs)
• rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-01  Bear Travis  <betravis@adobe.com>
+
+        [css exclusions] Move ExclusionShapeInsideInfo into RenderBlockRareData
+        https://bugs.webkit.org/show_bug.cgi?id=110995
+
+        Reviewed by Julien Chaffraix.
+
+        This patch moves ExclusionShapeInsideInfo into the RenderBlockRareData struct,
+        which enables us to move away from the global ExclusionShapeInsideInfo map.
+        Some additional refactoring was done to remove ExclusionShapeInsideInfo's
+        dependency on InlineIterator, which depended on RenderBlock. This work required
+        adding a new LineSegmentIterator struct.
+
+        Refactoring, no new tests.
+
+        * rendering/ExclusionShapeInsideInfo.cpp:
+        (WebCore):
+        (WebCore::LineSegmentRange::LineSegmentRange): Moving the InlineIterator
+        constructor to the .cpp file, as InlineIterator is now forward declared in
+        the .h file.
+        (WebCore::ExclusionShapeInsideInfo::isEnabledFor): Moving isEnabledFor to
+        the .cpp file, as RenderBlock is now forward declared in the .h file.
+        * rendering/ExclusionShapeInsideInfo.h:
+        (WebCore):
+        (LineSegmentIterator): A simple struct for containing segment positions for
+        layout.
+        (WebCore::LineSegmentIterator::LineSegmentIterator): Constructor.
+        (LineSegmentRange): Transitioning to store LineSegmentIterator.
+        (WebCore::LineSegmentRange::LineSegmentRange): Ditto.
+        (ExclusionShapeInsideInfo):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::willBeDestroyed): Destroying a block will now destroy
+        its ExclusionShapeInsideInfo, so there is no need to remove it from the map.
+        (WebCore):
+        (WebCore::RenderBlock::updateExclusionShapeInsideInfoAfterStyleChange): Use
+        the RenderBlockRareData struct rather than the global map.
+        * rendering/RenderBlock.h:
+        (WebCore):
+        (WebCore::RenderBlock::ensureExclusionShapeInsideInfo): Ensure an info struct
+        is present if the shape-inside style is set.
+        (WebCore::RenderBlock::exclusionShapeInsideInfo): Look up the info struct for
+        the current block.
+        (WebCore::RenderBlock::setExclusionShapeInsideInfo): Update the info struct
+        for the current block.
+        (RenderBlockRareData): Add the ExclusionShapeInsideInfo member.
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::constructBidiRunsForLine): Construct the appropriate offsets during
+        layout based on the stored LineSegmentIterators.
+
 2013-03-01  Terry Anderson  <tdanderson@chromium.org>
 

trunk/Source/WebCore/rendering/ExclusionShapeInsideInfo.cpp

@@ -33 +33 @@
 #if ENABLE(CSS_EXCLUSIONS)
 
+#include "InlineIterator.h"
 #include "RenderBlock.h"
 
 namespace WebCore {
+
+LineSegmentRange::LineSegmentRange(const InlineIterator& start, const InlineIterator& end)
+    : start(start.root(), start.object(), start.offset())
+    , end(end.root(), end.object(), end.offset())
+    {
+    }
+
+bool ExclusionShapeInsideInfo::isEnabledFor(const RenderBlock* renderer)
+{
+    ExclusionShapeValue* shapeValue = renderer->style()->resolvedShapeInside();
+    return (shapeValue && shapeValue->type() == ExclusionShapeValue::SHAPE) ? shapeValue->shape() : 0;
+}
+
 bool ExclusionShapeInsideInfo::computeSegmentsForLine(LayoutUnit lineTop, LayoutUnit lineHeight)
 {

trunk/Source/WebCore/rendering/ExclusionShapeInsideInfo.h

@@ -34 +34 @@
 
 #include "ExclusionShapeInfo.h"
-#include "InlineIterator.h"
 #include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
@@ -40 +39 @@
 namespace WebCore {
 
+class InlineIterator;
 class RenderBlock;
+class RenderObject;
 
-struct LineSegmentRange {
-    InlineIterator start;
-    InlineIterator end;
-    LineSegmentRange(InlineIterator start, InlineIterator end)
-        : start(start)
-        , end(end)
+struct LineSegmentIterator {
+    RenderObject* root;
+    RenderObject* object;
+    unsigned offset;
+    LineSegmentIterator(RenderObject* root, RenderObject* object, unsigned offset)
+        : root(root)
+        , object(object)
+        , offset(offset)
     {
     }
 };
+
+struct LineSegmentRange {
+    LineSegmentIterator start;
+    LineSegmentIterator end;
+    LineSegmentRange(const InlineIterator& start, const InlineIterator& end);
+};
+
 typedef Vector<LineSegmentRange> SegmentRangeList;
 
-class ExclusionShapeInsideInfo : public ExclusionShapeInfo<RenderBlock, &RenderStyle::resolvedShapeInside>, public MappedInfo<RenderBlock, ExclusionShapeInsideInfo> {
+class ExclusionShapeInsideInfo : public ExclusionShapeInfo<RenderBlock, &RenderStyle::resolvedShapeInside> {
 public:
     static PassOwnPtr<ExclusionShapeInsideInfo> createInfo(const RenderBlock* renderer) { return adoptPtr(new ExclusionShapeInsideInfo(renderer)); }
 
-    static bool isEnabledFor(const RenderBlock* renderer)
-    {
-        ExclusionShapeValue* shapeValue = renderer->style()->resolvedShapeInside();
-        return (shapeValue && shapeValue->type() == ExclusionShapeValue::SHAPE) ? shapeValue->shape() : 0;
-    }
+    static bool isEnabledFor(const RenderBlock* renderer);
     bool lineOverlapsShapeBounds() const { return logicalLineTop() < shapeLogicalBottom() && logicalLineBottom() >= shapeLogicalTop(); }
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -297 +297 @@
         lineGridBox()->destroy(renderArena());
 
-#if ENABLE(CSS_EXCLUSIONS)
-    ExclusionShapeInsideInfo::removeInfo(this);
-#endif
-
     if (UNLIKELY(gDelayedUpdateScrollInfoSet != 0))
         gDelayedUpdateScrollInfoSet->remove(this);
@@ -1395 +1391 @@
 
 #if ENABLE(CSS_EXCLUSIONS)
-ExclusionShapeInsideInfo* RenderBlock::exclusionShapeInsideInfo() const
-{
-    return style()->resolvedShapeInside() && ExclusionShapeInsideInfo::isEnabledFor(this) ? ExclusionShapeInsideInfo::info(this) : 0;
-}
-
 void RenderBlock::updateExclusionShapeInsideInfoAfterStyleChange(const ExclusionShapeValue* shapeInside, const ExclusionShapeValue* oldShapeInside)
 {
@@ -1407 +1398 @@
 
     if (shapeInside) {
-        ExclusionShapeInsideInfo* exclusionShapeInsideInfo = ExclusionShapeInsideInfo::ensureInfo(this);
+        ExclusionShapeInsideInfo* exclusionShapeInsideInfo = ensureExclusionShapeInsideInfo();
         exclusionShapeInsideInfo->dirtyShapeSize();
     } else
-        ExclusionShapeInsideInfo::removeInfo(this);
+        setExclusionShapeInsideInfo(nullptr);
 }
 #endif

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -36 +36 @@
 
 #if ENABLE(CSS_EXCLUSIONS)
+#include "ExclusionShapeInsideInfo.h"
 #include "ExclusionShapeValue.h"
 #endif
@@ -55 +56 @@
 #if ENABLE(CSS_EXCLUSIONS)
 class BasicShape;
-class ExclusionShapeInsideInfo;
 #endif
 class TextLayout;
@@ -447 +447 @@
 
 #if ENABLE(CSS_EXCLUSIONS)
-    ExclusionShapeInsideInfo* exclusionShapeInsideInfo() const;
+    ExclusionShapeInsideInfo* ensureExclusionShapeInsideInfo()
+    {
+        if (!m_rareData || !m_rareData->m_shapeInsideInfo)
+            setExclusionShapeInsideInfo(ExclusionShapeInsideInfo::createInfo(this));
+        return m_rareData->m_shapeInsideInfo.get();
+    }
+    ExclusionShapeInsideInfo* exclusionShapeInsideInfo() const
+    {
+        return m_rareData && m_rareData->m_shapeInsideInfo && ExclusionShapeInsideInfo::isEnabledFor(this) ? m_rareData->m_shapeInsideInfo.get() : 0;
+    }
+    void setExclusionShapeInsideInfo(PassOwnPtr<ExclusionShapeInsideInfo> value)
+    {
+        if (!m_rareData)
+            m_rareData = adoptPtr(new RenderBlockRareData(this));
+        m_rareData->m_shapeInsideInfo = value;
+    }
     ExclusionShapeInsideInfo* layoutExclusionShapeInsideInfo() const;
     bool allowsExclusionShapeInsideInfoSharing() const { return !isInline() && !isFloating(); }
@@ -1236 +1251 @@
 
         RootInlineBox* m_lineBreakToAvoidWidow;
+#if ENABLE(CSS_EXCLUSIONS)
+        OwnPtr<ExclusionShapeInsideInfo> m_shapeInsideInfo;
+#endif
         bool m_shouldBreakAtLineToAvoidWidow : 1;
         bool m_discardMarginBefore : 1;

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1285 +1285 @@
 
     for (size_t i = 0; i < segmentRanges.size(); i++) {
-        InlineIterator segmentStart = segmentRanges[i].start;
-        InlineIterator segmentEnd = segmentRanges[i].end;
+        LineSegmentIterator iterator = segmentRanges[i].start;
+        InlineIterator segmentStart(iterator.root, iterator.object, iterator.offset);
+        iterator = segmentRanges[i].end;
+        InlineIterator segmentEnd(iterator.root, iterator.object, iterator.offset);
         if (i) {
             ASSERT(segmentStart.m_obj);