Index: Source/core/rendering/RenderBlock.h |
diff --git a/Source/core/rendering/RenderBlock.h b/Source/core/rendering/RenderBlock.h |
index ee6f7d151813f38524022365b9e14fbf8480ef84..0ffae9b05ff357431d4466ffbbc39adfe660b703 100644 |
--- a/Source/core/rendering/RenderBlock.h |
+++ b/Source/core/rendering/RenderBlock.h |
@@ -82,7 +82,6 @@ public: |
LayoutUnit minLineHeightForReplacedRenderer(bool isFirstLine, LayoutUnit replacedHeight) const; |
-protected: |
RenderLineBoxList* lineBoxes() { return &m_lineBoxes; } |
InlineFlowBox* firstLineBox() const { return m_lineBoxes.firstLineBox(); } |
@@ -274,11 +273,12 @@ protected: |
int beforeMarginInLineDirection(LineDirectionMode) const; |
virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; |
+public: |
virtual void paintObject(PaintInfo&, const LayoutPoint&) OVERRIDE; |
virtual void paintChildren(PaintInfo&, const LayoutPoint&); |
void paintChild(RenderBox*, PaintInfo&, const LayoutPoint&); |
void paintChildAsInlineBlock(RenderBox*, PaintInfo&, const LayoutPoint&); |
- |
+protected: |
virtual void adjustInlineDirectionLineBounds(unsigned /* expansionOpportunityCount */, float& /* logicalLeft */, float& /* logicalWidth */) const { } |
virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE; |
@@ -362,16 +362,11 @@ private: |
Node* nodeForHitTest() const; |
- // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to RenderBlockFlow |
+ public: |
Stephen Chennney
2014/09/15 20:18:05
Indent.
chrishtr
2014/09/15 20:52:08
Done.
|
+// FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to RenderBlockFlow |
virtual void paintFloats(PaintInfo&, const LayoutPoint&, bool) { } |
- void paintContents(PaintInfo&, const LayoutPoint&); |
- void paintColumnContents(PaintInfo&, const LayoutPoint&, bool paintFloats = false); |
- void paintColumnRules(PaintInfo&, const LayoutPoint&); |
void paintSelection(PaintInfo&, const LayoutPoint&); |
- void paintCarets(PaintInfo&, const LayoutPoint&); |
- |
- bool hasCaret() const; |
- |
+private: |
virtual bool avoidsFloats() const OVERRIDE { return true; } |
bool hitTestColumns(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction); |
@@ -414,9 +409,9 @@ private: |
virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const OVERRIDE; |
LayoutUnit desiredColumnWidth() const; |
- |
+public: |
void paintContinuationOutlines(PaintInfo&, const LayoutPoint&); |
- |
+private: |
virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0) OVERRIDE FINAL; |
void adjustPointToColumnContents(LayoutPoint&) const; |