Chromium Code Reviews| Index: Source/core/rendering/RenderBlockFlow.h |
| diff --git a/Source/core/rendering/RenderBlockFlow.h b/Source/core/rendering/RenderBlockFlow.h |
| index 27be3aec49ae955e4bc9d97fbd60b074d0aa3552..187b1001d25471e8b30fa102e293751ee492d1a1 100644 |
| --- a/Source/core/rendering/RenderBlockFlow.h |
| +++ b/Source/core/rendering/RenderBlockFlow.h |
| @@ -190,7 +190,7 @@ public: |
| protected: |
| void rebuildFloatsFromIntruding(); |
| - void layoutInlineChildren(bool relayoutChildren, LayoutUnit& repaintLogicalTop, LayoutUnit& repaintLogicalBottom, LayoutUnit afterEdge); |
| + void layoutInlineChildren(bool relayoutChildren, LayoutUnit& paintInvalidationLogicalTop, LayoutUnit& paintInvalidationLogicalBottom, LayoutUnit afterEdge); |
| void createFloatingObjects(); |
| @@ -450,8 +450,8 @@ private: |
| RenderBlockFlowRareData& ensureRareData(); |
| - LayoutUnit m_repaintLogicalTop; |
| - LayoutUnit m_repaintLogicalBottom; |
| + LayoutUnit m_paintInvalidationLogicalTop; |
| + LayoutUnit m_paintInvalidationLogicalBottom; |
| virtual bool isSelfCollapsingBlock() const OVERRIDE; |
| @@ -485,7 +485,7 @@ private: |
| void layoutRunsAndFloatsInRange(LineLayoutState&, InlineBidiResolver&, |
| const InlineIterator& cleanLineStart, const BidiStatus& cleanLineBidiStatus); |
| void linkToEndLineIfNeeded(LineLayoutState&); |
| - static void repaintDirtyFloats(Vector<FloatWithRect>& floats); |
| + static void paintInvalidationForDirtyFloats(Vector<FloatWithRect>& floats); |
|
leviw_travelin_and_unemployed
2014/08/15 18:45:48
markDirtyFloatsForPaintInvalidation?
dsinclair
2014/08/15 19:03:19
Done.
|
| void checkFloatsInCleanLine(RootInlineBox*, Vector<FloatWithRect>&, size_t& floatIndex, bool& encounteredNewFloat, bool& dirtiedByFloat); |
| RootInlineBox* determineStartPosition(LineLayoutState&, InlineBidiResolver&); |
| void determineEndPosition(LineLayoutState&, RootInlineBox* startBox, InlineIterator& cleanLineStart, BidiStatus& cleanLineBidiStatus); |