Changeset 144561 in webkit

Timestamp:

Mar 3, 2013 12:33:44 AM (11 years ago)

Author:

abarth@webkit.org

Message:

REGRESSION(144520): Does not compile on chromium-win
​https://bugs.webkit.org/show_bug.cgi?id=111261

Unreviewed rollout of ​http://trac.webkit.org/changeset/144520. This
patch does not compile for chromium-win. See the bug for the compile
error.

• rendering/ExclusionShapeInsideInfo.cpp:
• rendering/ExclusionShapeInsideInfo.h:

(WebCore):
(LineSegmentRange):
(WebCore::LineSegmentRange::LineSegmentRange):
(WebCore::ExclusionShapeInsideInfo::isEnabledFor):

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::willBeDestroyed):
(WebCore::RenderBlock::exclusionShapeInsideInfo):
(WebCore):
(WebCore::RenderBlock::updateExclusionShapeInsideInfoAfterStyleChange):

• rendering/RenderBlock.h:

(WebCore):
(RenderBlock):
(RenderBlockRareData):

• rendering/RenderBlockLineLayout.cpp:

(WebCore::constructBidiRunsForLine):

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-03  Adam Barth  <abarth@webkit.org>
+
+        REGRESSION(144520): Does not compile on chromium-win
+        https://bugs.webkit.org/show_bug.cgi?id=111261
+
+        Unreviewed rollout of http://trac.webkit.org/changeset/144520. This
+        patch does not compile for chromium-win. See the bug for the compile
+        error.
+
+        * rendering/ExclusionShapeInsideInfo.cpp:
+        * rendering/ExclusionShapeInsideInfo.h:
+        (WebCore):
+        (LineSegmentRange):
+        (WebCore::LineSegmentRange::LineSegmentRange):
+        (WebCore::ExclusionShapeInsideInfo::isEnabledFor):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::willBeDestroyed):
+        (WebCore::RenderBlock::exclusionShapeInsideInfo):
+        (WebCore):
+        (WebCore::RenderBlock::updateExclusionShapeInsideInfoAfterStyleChange):
+        * rendering/RenderBlock.h:
+        (WebCore):
+        (RenderBlock):
+        (RenderBlockRareData):
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::constructBidiRunsForLine):
+
 2013-03-02  Zan Dobersek  <zdobersek@igalia.com>
 

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>
@@ -39 +40 @@
 namespace WebCore {
 
-class InlineIterator;
 class RenderBlock;
-class RenderObject;
 
-struct LineSegmentIterator {
-    RenderObject* root;
-    RenderObject* object;
-    unsigned offset;
-    LineSegmentIterator(RenderObject* root, RenderObject* object, unsigned offset)
-        : root(root)
-        , object(object)
-        , offset(offset)
+struct LineSegmentRange {
+    InlineIterator start;
+    InlineIterator end;
+    LineSegmentRange(InlineIterator start, InlineIterator end)
+        : start(start)
+        , end(end)
     {
     }
 };
-
-struct LineSegmentRange {
-    LineSegmentIterator start;
-    LineSegmentIterator end;
-    LineSegmentRange(const InlineIterator& start, const InlineIterator& end);
-};
-
 typedef Vector<LineSegmentRange> SegmentRangeList;
 
-class ExclusionShapeInsideInfo : public ExclusionShapeInfo<RenderBlock, &RenderStyle::resolvedShapeInside> {
+class ExclusionShapeInsideInfo : public ExclusionShapeInfo<RenderBlock, &RenderStyle::resolvedShapeInside>, public MappedInfo<RenderBlock, ExclusionShapeInsideInfo> {
 public:
     static PassOwnPtr<ExclusionShapeInsideInfo> createInfo(const RenderBlock* renderer) { return adoptPtr(new ExclusionShapeInsideInfo(renderer)); }
 
-    static bool isEnabledFor(const RenderBlock* renderer);
+    static bool isEnabledFor(const RenderBlock* renderer)
+    {
+        ExclusionShapeValue* shapeValue = renderer->style()->resolvedShapeInside();
+        return (shapeValue && shapeValue->type() == ExclusionShapeValue::SHAPE) ? shapeValue->shape() : 0;
+    }
     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);
@@ -1391 +1395 @@
 
 #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)
 {
@@ -1398 +1407 @@
 
     if (shapeInside) {
-        ExclusionShapeInsideInfo* exclusionShapeInsideInfo = ensureExclusionShapeInsideInfo();
+        ExclusionShapeInsideInfo* exclusionShapeInsideInfo = ExclusionShapeInsideInfo::ensureInfo(this);
         exclusionShapeInsideInfo->dirtyShapeSize();
     } else
-        setExclusionShapeInsideInfo(nullptr);
+        ExclusionShapeInsideInfo::removeInfo(this);
 }
 #endif

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -36 +36 @@
 
 #if ENABLE(CSS_EXCLUSIONS)
-#include "ExclusionShapeInsideInfo.h"
 #include "ExclusionShapeValue.h"
 #endif
@@ -56 +55 @@
 #if ENABLE(CSS_EXCLUSIONS)
 class BasicShape;
+class ExclusionShapeInsideInfo;
 #endif
 class TextLayout;
@@ -447 +447 @@
 
 #if ENABLE(CSS_EXCLUSIONS)
-    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* exclusionShapeInsideInfo() const;
     ExclusionShapeInsideInfo* layoutExclusionShapeInsideInfo() const;
     bool allowsExclusionShapeInsideInfoSharing() const { return !isInline() && !isFloating(); }
@@ -1251 +1236 @@
 
         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++) {
-        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);
+        InlineIterator segmentStart = segmentRanges[i].start;
+        InlineIterator segmentEnd = segmentRanges[i].end;
         if (i) {
             ASSERT(segmentStart.m_obj);