Diff
Modified: trunk/Source/WebCore/ChangeLog (155301 => 155302)
--- trunk/Source/WebCore/ChangeLog 2013-09-08 11:01:01 UTC (rev 155301)
+++ trunk/Source/WebCore/ChangeLog 2013-09-08 11:02:24 UTC (rev 155302)
@@ -1,5 +1,14 @@
2013-09-08 Andreas Kling <[email protected]>
+ Render{Block,Inline}::lineBoxes() should return a reference.
+ <https://webkit.org/b/120995>
+
+ Reviewed by Antti Koivisto.
+
+ This function was already just returning the address of a member variable.
+
+2013-09-08 Andreas Kling <[email protected]>
+
Move "using software CSS filters" optimization flag to RenderView.
<https://webkit.org/b/120999>
Modified: trunk/Source/WebCore/rendering/InlineFlowBox.cpp (155301 => 155302)
--- trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2013-09-08 11:01:01 UTC (rev 155301)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2013-09-08 11:02:24 UTC (rev 155302)
@@ -225,7 +225,7 @@
void InlineFlowBox::removeLineBoxFromRenderObject()
{
- toRenderInline(renderer()).lineBoxes()->removeLineBox(this);
+ toRenderInline(renderer()).lineBoxes().removeLineBox(this);
}
void InlineFlowBox::extractLine()
@@ -238,7 +238,7 @@
void InlineFlowBox::extractLineBoxFromRenderObject()
{
- toRenderInline(renderer()).lineBoxes()->extractLineBox(this);
+ toRenderInline(renderer()).lineBoxes().extractLineBox(this);
}
void InlineFlowBox::attachLine()
@@ -251,7 +251,7 @@
void InlineFlowBox::attachLineBoxToRenderObject()
{
- toRenderInline(renderer()).lineBoxes()->attachLineBox(this);
+ toRenderInline(renderer()).lineBoxes().attachLineBox(this);
}
void InlineFlowBox::adjustPosition(float dx, float dy)
@@ -263,7 +263,7 @@
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
+RenderLineBoxList& InlineFlowBox::rendererLineBoxes() const
{
return toRenderInline(renderer()).lineBoxes();
}
@@ -315,20 +315,20 @@
// 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();
- if (!lineBoxList->firstLineBox()->isConstructed() && !renderer().isInlineElementContinuation()) {
+ RenderLineBoxList& lineBoxList = rendererLineBoxes();
+ if (!lineBoxList.firstLineBox()->isConstructed() && !renderer().isInlineElementContinuation()) {
#if ENABLE(CSS_BOX_DECORATION_BREAK)
if (renderer().style()->boxDecorationBreak() == DCLONE)
includeLeftEdge = includeRightEdge = true;
else
#endif
- if (ltr && lineBoxList->firstLineBox() == this)
+ if (ltr && lineBoxList.firstLineBox() == this)
includeLeftEdge = true;
- else if (!ltr && lineBoxList->lastLineBox() == this)
+ else if (!ltr && lineBoxList.lastLineBox() == this)
includeRightEdge = true;
}
- if (!lineBoxList->lastLineBox()->isConstructed()) {
+ if (!lineBoxList.lastLineBox()->isConstructed()) {
RenderInline& inlineFlow = toRenderInline(renderer());
bool isLastObjectOnLine = !isAncestorAndWithinBlock(renderer(), logicallyLastRunRenderer) || (isLastChildForRenderer(&renderer(), logicallyLastRunRenderer) && !isLogicallyLastRunWrapped);
Modified: trunk/Source/WebCore/rendering/InlineFlowBox.h (155301 => 155302)
--- trunk/Source/WebCore/rendering/InlineFlowBox.h 2013-09-08 11:01:01 UTC (rev 155301)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.h 2013-09-08 11:02:24 UTC (rev 155302)
@@ -119,7 +119,7 @@
bool boxShadowCanBeAppliedToBackground(const FillLayer&) const;
- virtual RenderLineBoxList* rendererLineBoxes() const;
+ virtual RenderLineBoxList& rendererLineBoxes() const;
// logicalLeft = left in a horizontal line and top in a vertical line.
LayoutUnit marginBorderPaddingLogicalLeft() const { return marginLogicalLeft() + borderLogicalLeft() + paddingLogicalLeft(); }
Modified: trunk/Source/WebCore/rendering/RenderBlock.h (155301 => 155302)
--- trunk/Source/WebCore/rendering/RenderBlock.h 2013-09-08 11:01:01 UTC (rev 155301)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2013-09-08 11:02:24 UTC (rev 155302)
@@ -108,8 +108,8 @@
virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE FINAL;
virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
- RenderLineBoxList* lineBoxes() { return &m_lineBoxes; }
- const RenderLineBoxList* lineBoxes() const { return &m_lineBoxes; }
+ RenderLineBoxList& lineBoxes() { return m_lineBoxes; }
+ const RenderLineBoxList& lineBoxes() const { return m_lineBoxes; }
InlineFlowBox* firstLineBox() const { return m_lineBoxes.firstLineBox(); }
InlineFlowBox* lastLineBox() const { return m_lineBoxes.lastLineBox(); }
Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (155301 => 155302)
--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-09-08 11:01:01 UTC (rev 155301)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-09-08 11:02:24 UTC (rev 155302)
@@ -2126,7 +2126,7 @@
LineLayoutState layoutState(isFullLayout, repaintLogicalTop, repaintLogicalBottom, flowThread);
if (isFullLayout)
- lineBoxes()->deleteLineBoxes(renderArena());
+ lineBoxes().deleteLineBoxes(renderArena());
// Text truncation kicks in in two cases:
// 1) If your overflow isn't visible and your text-overflow-mode isn't clip.
Modified: trunk/Source/WebCore/rendering/RenderInline.h (155301 => 155302)
--- trunk/Source/WebCore/rendering/RenderInline.h 2013-09-08 11:01:01 UTC (rev 155301)
+++ trunk/Source/WebCore/rendering/RenderInline.h 2013-09-08 11:02:24 UTC (rev 155302)
@@ -66,8 +66,8 @@
void dirtyLineBoxes(bool fullLayout);
void deleteLineBoxTree();
- RenderLineBoxList* lineBoxes() { return &m_lineBoxes; }
- const RenderLineBoxList* lineBoxes() const { return &m_lineBoxes; }
+ RenderLineBoxList& lineBoxes() { return m_lineBoxes; }
+ const RenderLineBoxList& lineBoxes() const { return m_lineBoxes; }
InlineFlowBox* firstLineBox() const { return m_lineBoxes.firstLineBox(); }
InlineFlowBox* lastLineBox() const { return m_lineBoxes.lastLineBox(); }
Modified: trunk/Source/WebCore/rendering/RootInlineBox.cpp (155301 => 155302)
--- trunk/Source/WebCore/rendering/RootInlineBox.cpp 2013-09-08 11:01:01 UTC (rev 155301)
+++ trunk/Source/WebCore/rendering/RootInlineBox.cpp 2013-09-08 11:02:24 UTC (rev 155302)
@@ -82,7 +82,7 @@
}
}
-RenderLineBoxList* RootInlineBox::rendererLineBoxes() const
+RenderLineBoxList& RootInlineBox::rendererLineBoxes() const
{
return block().lineBoxes();
}
@@ -724,17 +724,17 @@
void RootInlineBox::removeLineBoxFromRenderObject()
{
- block().lineBoxes()->removeLineBox(this);
+ block().lineBoxes().removeLineBox(this);
}
void RootInlineBox::extractLineBoxFromRenderObject()
{
- block().lineBoxes()->extractLineBox(this);
+ block().lineBoxes().extractLineBox(this);
}
void RootInlineBox::attachLineBoxToRenderObject()
{
- block().lineBoxes()->attachLineBox(this);
+ block().lineBoxes().attachLineBox(this);
}
LayoutRect RootInlineBox::paddedLayoutOverflowRect(LayoutUnit endPadding) const
Modified: trunk/Source/WebCore/rendering/RootInlineBox.h (155301 => 155302)
--- trunk/Source/WebCore/rendering/RootInlineBox.h 2013-09-08 11:01:01 UTC (rev 155301)
+++ trunk/Source/WebCore/rendering/RootInlineBox.h 2013-09-08 11:02:24 UTC (rev 155302)
@@ -85,7 +85,7 @@
m_lineBottomWithLeading = bottomWithLeading;
}
- virtual RenderLineBoxList* rendererLineBoxes() const OVERRIDE FINAL;
+ virtual RenderLineBoxList& rendererLineBoxes() const OVERRIDE FINAL;
RenderObject* lineBreakObj() const { return m_lineBreakObj; }
BidiStatus lineBreakBidiStatus() const;
