Title: [159049] trunk/Source/WebCore
- Revision
- 159049
- Author
- [email protected]
- Date
- 2013-11-11 02:33:12 -0800 (Mon, 11 Nov 2013)
Log Message
Kill InlineFlowBox::rendererLineBoxes().
<https://webkit.org/b/124141>
We only ever used this to access the RenderLineBoxList for non-root
boxes, and those always have a RenderInline renderer.
Tighten things up by losing the virtual rendererLineBoxes() and
calling RenderInline::lineBoxes() directly.
Reviewed by Antti Koivisto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (159048 => 159049)
--- trunk/Source/WebCore/ChangeLog 2013-11-11 10:13:26 UTC (rev 159048)
+++ trunk/Source/WebCore/ChangeLog 2013-11-11 10:33:12 UTC (rev 159049)
@@ -1,5 +1,18 @@
2013-11-11 Andreas Kling <[email protected]>
+ Kill InlineFlowBox::rendererLineBoxes().
+ <https://webkit.org/b/124141>
+
+ We only ever used this to access the RenderLineBoxList for non-root
+ boxes, and those always have a RenderInline renderer.
+
+ Tighten things up by losing the virtual rendererLineBoxes() and
+ calling RenderInline::lineBoxes() directly.
+
+ Reviewed by Antti Koivisto.
+
+2013-11-11 Andreas Kling <[email protected]>
+
Bring the LineFragmentationData back to RootInlineBox.
<https://webkit.org/b/124136>
Modified: trunk/Source/WebCore/rendering/InlineFlowBox.cpp (159048 => 159049)
--- trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2013-11-11 10:13:26 UTC (rev 159048)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2013-11-11 10:33:12 UTC (rev 159049)
@@ -261,11 +261,6 @@
m_overflow->move(dx, dy); // FIXME: Rounding error here since overflow was pixel snapped, but nobody other than list markers passes non-integral values here.
}
-RenderLineBoxList& InlineFlowBox::rendererLineBoxes() const
-{
- return toRenderInline(renderer()).lineBoxes();
-}
-
static inline bool isLastChildForRenderer(const RenderElement& ancestor, const RenderObject* child)
{
if (!child)
@@ -309,11 +304,13 @@
// The root inline box never has borders/margins/padding.
if (parent()) {
+ const auto& inlineFlow = toRenderInline(renderer());
+
bool ltr = renderer().style().isLeftToRightDirection();
// Check to see if all initial lines are unconstructed. If so, then
// we know the inline began on this line (unless we are a continuation).
- RenderLineBoxList& lineBoxList = rendererLineBoxes();
+ const auto& lineBoxList = inlineFlow.lineBoxes();
if (!lineBoxList.firstLineBox()->isConstructed() && !renderer().isInlineElementContinuation()) {
#if ENABLE(CSS_BOX_DECORATION_BREAK)
if (renderer().style().boxDecorationBreak() == DCLONE)
@@ -327,7 +324,6 @@
}
if (!lineBoxList.lastLineBox()->isConstructed()) {
- RenderInline& inlineFlow = toRenderInline(renderer());
bool isLastObjectOnLine = !isAncestorAndWithinBlock(inlineFlow, logicallyLastRunRenderer) || (isLastChildForRenderer(renderer(), logicallyLastRunRenderer) && !isLogicallyLastRunWrapped);
// We include the border under these conditions:
Modified: trunk/Source/WebCore/rendering/InlineFlowBox.h (159048 => 159049)
--- trunk/Source/WebCore/rendering/InlineFlowBox.h 2013-11-11 10:13:26 UTC (rev 159048)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.h 2013-11-11 10:33:12 UTC (rev 159049)
@@ -123,8 +123,6 @@
bool boxShadowCanBeAppliedToBackground(const FillLayer&) const;
- virtual RenderLineBoxList& rendererLineBoxes() const;
-
// logicalLeft = left in a horizontal line and top in a vertical line.
LayoutUnit marginBorderPaddingLogicalLeft() const { return marginLogicalLeft() + borderLogicalLeft() + paddingLogicalLeft(); }
LayoutUnit marginBorderPaddingLogicalRight() const { return marginLogicalRight() + borderLogicalRight() + paddingLogicalRight(); }
Modified: trunk/Source/WebCore/rendering/RootInlineBox.cpp (159048 => 159049)
--- trunk/Source/WebCore/rendering/RootInlineBox.cpp 2013-11-11 10:13:26 UTC (rev 159048)
+++ trunk/Source/WebCore/rendering/RootInlineBox.cpp 2013-11-11 10:33:12 UTC (rev 159049)
@@ -72,11 +72,6 @@
}
}
-RenderLineBoxList& RootInlineBox::rendererLineBoxes() const
-{
- return blockFlow().lineBoxes();
-}
-
void RootInlineBox::clearTruncation()
{
if (hasEllipsisBox()) {
Modified: trunk/Source/WebCore/rendering/RootInlineBox.h (159048 => 159049)
--- trunk/Source/WebCore/rendering/RootInlineBox.h 2013-11-11 10:13:26 UTC (rev 159048)
+++ trunk/Source/WebCore/rendering/RootInlineBox.h 2013-11-11 10:33:12 UTC (rev 159049)
@@ -85,8 +85,6 @@
m_lineBottomWithLeading = bottomWithLeading;
}
- virtual RenderLineBoxList& rendererLineBoxes() const OVERRIDE FINAL;
-
RenderObject* lineBreakObj() const { return m_lineBreakObj; }
BidiStatus lineBreakBidiStatus() const;
void setLineBreakInfo(RenderObject*, unsigned breakPos, const BidiStatus&);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
