Changeset 167283 in webkit

Timestamp:

Apr 14, 2014 5:27:13 PM (10 years ago)

Author:

Bem Jones-Bey

Message:

[CSS Shapes] Remove some leftover shape-inside code
​https://bugs.webkit.org/show_bug.cgi?id=131641

Reviewed by Dean Jackson.

I discovered that some code had been leftover from the shape-inside
removal. This removes that leftover code.

No new tests, no behavior change.

• platform/text/BidiResolver.h:
• rendering/BidiRun.cpp:

(WebCore::BidiRun::BidiRun):

• rendering/RenderBlockFlow.h:
• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlockFlow::createLineBoxes):
(WebCore::RenderBlockFlow::constructLine):
(WebCore::computeExpansionForJustifiedText):
(WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/text/BidiResolver.h (modified) (1 diff)
• rendering/BidiRun.cpp (modified) (1 diff)
• rendering/RenderBlockFlow.h (modified) (1 diff)
• rendering/RenderBlockLineLayout.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-14  Bem Jones-Bey  <bjonesbe@adobe.com>
+
+        [CSS Shapes] Remove some leftover shape-inside code
+        https://bugs.webkit.org/show_bug.cgi?id=131641
+
+        Reviewed by Dean Jackson.
+
+        I discovered that some code had been leftover from the shape-inside
+        removal. This removes that leftover code.
+
+        No new tests, no behavior change.
+
+        * platform/text/BidiResolver.h:
+        * rendering/BidiRun.cpp:
+        (WebCore::BidiRun::BidiRun):
+        * rendering/RenderBlockFlow.h:
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlockFlow::createLineBoxes):
+        (WebCore::RenderBlockFlow::constructLine):
+        (WebCore::computeExpansionForJustifiedText):
+        (WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment):
+
 2014-04-14  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/platform/text/BidiResolver.h

@@ -191 +191 @@
     bool m_override : 1;
     bool m_hasHyphen : 1; // Used by BidiRun subclass which is a layering violation but enables us to save 8 bytes per object on 64-bit.
-#if ENABLE(CSS_SHAPES)
-    bool m_startsSegment : 1; // Same comment as m_hasHyphen.
-#endif
     unsigned char m_level;
     BidiCharacterRun* m_next;

trunk/Source/WebCore/rendering/BidiRun.cpp

@@ -45 +45 @@
     // Stored in base class to save space.
     m_hasHyphen = false;
-#if ENABLE(CSS_SHAPES)
-    m_startsSegment = false;
-#endif
 }
 

trunk/Source/WebCore/rendering/RenderBlockFlow.h

@@ -528 +528 @@
 
     virtual std::unique_ptr<RootInlineBox> createRootInlineBox(); // Subclassed by RenderSVGText.
-    InlineFlowBox* createLineBoxes(RenderObject*, const LineInfo&, InlineBox* childBox, bool startsNewSegment);
+    InlineFlowBox* createLineBoxes(RenderObject*, const LineInfo&, InlineBox* childBox);
     RootInlineBox* constructLine(BidiRunList<BidiRun>&, const LineInfo&);
     void setMarginsForRubyRun(BidiRun*, RenderRubyRun&, RenderObject*, const LineInfo&);

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -183 +183 @@
 }
 
-InlineFlowBox* RenderBlockFlow::createLineBoxes(RenderObject* obj, const LineInfo& lineInfo, InlineBox* childBox, bool startNewSegment)
+InlineFlowBox* RenderBlockFlow::createLineBoxes(RenderObject* obj, const LineInfo& lineInfo, InlineBox* childBox)
 {
     // See if we have an unconstructed line box for this object that is also
@@ -206 +206 @@
         bool constructedNewBox = false;
         bool allowedToConstructNewBox = !hasDefaultLineBoxContain || !inlineFlow || inlineFlow->alwaysCreateLineBoxes();
-        bool mustCreateBoxesToRoot = startNewSegment && !(parentBox && parentBox->isRootInlineBox());
-        bool canUseExistingParentBox = parentBox && !parentIsConstructedOrHaveNext(parentBox) && !mustCreateBoxesToRoot;
+        bool canUseExistingParentBox = parentBox && !parentIsConstructedOrHaveNext(parentBox);
         if (allowedToConstructNewBox && !canUseExistingParentBox) {
             // We need to make a new box for this render object.  Once
@@ -302 +301 @@
         // run's inline box. Segments can only be siblings at the root level, as
         // they are positioned separately.
-#if ENABLE(CSS_SHAPES)
-        bool runStartsSegment = r->m_startsSegment;
-#else
-        bool runStartsSegment = false;
-#endif
-        if (!parentBox || &parentBox->renderer() != r->renderer().parent() || runStartsSegment)
+        if (!parentBox || &parentBox->renderer() != r->renderer().parent()) {
             // Create new inline boxes all the way back to the appropriate insertion point.
-            parentBox = createLineBoxes(r->renderer().parent(), lineInfo, box, runStartsSegment);
-        else {
+            parentBox = createLineBoxes(r->renderer().parent(), lineInfo, box);
+        } else {
             // Append the inline box to this line.
             parentBox->addToLine(box);
@@ -546 +540 @@
     size_t i = 0;
     for (BidiRun* r = firstRun; r; r = r->next()) {
-#if ENABLE(CSS_SHAPES)
-        // This method is called once per segment, do not move past the current segment.
-        if (r->m_startsSegment)
-            break;
-#endif
         if (!r->box() || r == trailingSpaceRun)
             continue;
@@ -673 +662 @@
     BidiRun* r = firstRun;
     for (; r; r = r->next()) {
-#if ENABLE(CSS_SHAPES)
-        // Once we have reached the start of the next segment, we have finished
-        // computing the positions for this segment's contents.
-        if (r->m_startsSegment)
-            break;
-#endif
         if (!r->box() || r->renderer().isOutOfFlowPositioned() || r->box()->isLineBreak())
             continue; // Positioned objects are only participating to figure out their