Changeset 160073 in webkit

Timestamp:

Dec 3, 2013 11:56:26 PM (10 years ago)

Author:

zoltan@webkit.org

Message:

Remove BreakingContext's friendship from RenderBlockFlow
<​https://webkit.org/b/124958>

Reviewed by David Hyatt.

BreakingContext uses only 2 functions from RenderBlockFlow: insertFloatingObject/positionNewFloatOnLine. I added helper
functions to LineBreaker, what is already a friend of RenderBlockFlow, so BreakingContext doesn't need to be anymore.

No new tests, no behavior change.

• rendering/RenderBlockFlow.h:
• rendering/line/BreakingContextInlineHeaders.h:

(WebCore::BreakingContext::handleFloat):

• rendering/line/LineBreaker.h:

(WebCore::LineBreaker::insertFloatingObject):
(WebCore::LineBreaker::positionNewFloatOnLine):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlockFlow.h (modified) (1 diff)
• rendering/line/BreakingContextInlineHeaders.h (modified) (2 diffs)
• rendering/line/LineBreaker.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-03  Zoltan Horvath  <zoltan@webkit.org>
+
+        Remove BreakingContext's friendship from RenderBlockFlow
+        <https://webkit.org/b/124958>
+
+        Reviewed by David Hyatt.
+
+        BreakingContext uses only 2 functions from RenderBlockFlow: insertFloatingObject/positionNewFloatOnLine. I added helper
+        functions to LineBreaker, what is already a friend of RenderBlockFlow, so BreakingContext doesn't need to be anymore.
+ 
+        No new tests, no behavior change.
+
+        * rendering/RenderBlockFlow.h:
+        * rendering/line/BreakingContextInlineHeaders.h:
+        (WebCore::BreakingContext::handleFloat):
+        * rendering/line/LineBreaker.h:
+        (WebCore::LineBreaker::insertFloatingObject):
+        (WebCore::LineBreaker::positionNewFloatOnLine):
+
 2013-12-03  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/rendering/RenderBlockFlow.h

@@ -532 +532 @@
     std::unique_ptr<SimpleLineLayout::Layout> m_simpleLineLayout;
 
-    friend class BreakingContext;
     friend class LineBreaker;
     friend class LineWidth; // Needs to know FloatingObject

trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h

@@ -457 +457 @@
 {
     RenderBox& floatBox = toRenderBox(*m_current.renderer());
-    FloatingObject* floatingObject = m_block.insertFloatingObject(floatBox);
+    FloatingObject* floatingObject = m_lineBreaker.insertFloatingObject(floatBox);
     // check if it fits in the current line.
     // If it does, position it now, otherwise, position
@@ -463 +463 @@
     // FIXME: Bug 110372: Properly position multiple stacked floats with non-rectangular shape outside.
     if (m_floatsFitOnLine && m_width.fitsOnLineExcludingTrailingWhitespace(m_block.logicalWidthForFloat(floatingObject))) {
-        m_block.positionNewFloatOnLine(floatingObject, m_lastFloatFromPreviousLine, m_lineInfo, m_width);
+        m_lineBreaker.positionNewFloatOnLine(floatingObject, m_lastFloatFromPreviousLine, m_lineInfo, m_width);
         if (m_lineBreak.renderer() == m_current.renderer()) {
             ASSERT(!m_lineBreak.m_pos);

trunk/Source/WebCore/rendering/line/LineBreaker.h

@@ -68 +68 @@
     void skipLeadingWhitespace(InlineBidiResolver&, LineInfo&, FloatingObject* lastFloatFromPreviousLine, LineWidth&);
 
+    FloatingObject* insertFloatingObject(RenderBox& floatBox) { return m_block.insertFloatingObject(floatBox); }
+    bool positionNewFloatOnLine(FloatingObject* newFloat, FloatingObject* lastFloatFromPreviousLine, LineInfo& lineInfo, LineWidth& width)
+    {
+        return m_block.positionNewFloatOnLine(newFloat, lastFloatFromPreviousLine, lineInfo, width);
+    }
+
     RenderBlockFlow& m_block;
     bool m_hyphenated;