Split more Paragraph-specific code from RenderBlock into RenderParagraph

sky/engine/core/rendering/RenderBlock.h

Index: sky/engine/core/rendering/RenderBlock.h
diff --git a/sky/engine/core/rendering/RenderBlock.h b/sky/engine/core/rendering/RenderBlock.h
index efda1b0e7eed6c8823e975140b26ade7228b6e18..4d492c0c6a7e2fc3a09736b7132c3877a7321dc0 100644
--- a/sky/engine/core/rendering/RenderBlock.h
+++ b/sky/engine/core/rendering/RenderBlock.h
@@ -121,9 +121,6 @@ public:
         return descendants && !descendants->isEmpty();
     }
 
-    void setHasMarkupTruncation(bool b) { m_hasMarkupTruncation = b; }

[rafaelw, 2014/11/28 03:53:50]

note that setHasMarkupTruncation was only ever set to false. It appears to have
been used by a deprecated flex-box layout

[ojan, 2014/11/28 04:02:23]

Yup. deprecated flex + webkit-line-clamp. Did we remove webkit-line-clamp? We
should if we haven't already.

-    bool hasMarkupTruncation() const { return m_hasMarkupTruncation; }
-
     void setHasMarginBeforeQuirk(bool b) { m_hasMarginBeforeQuirk = b; }
     void setHasMarginAfterQuirk(bool b) { m_hasMarginAfterQuirk = b; }
 
@@ -159,9 +156,9 @@ public:
     LayoutRect logicalRectToPhysicalRect(const LayoutPoint& physicalPosition, const LayoutRect& logicalRect);
 
     // Helper methods for computing line counts and heights for line counts.
-    RootInlineBox* lineAtIndex(int) const;
-    int lineCount(const RootInlineBox* = 0, bool* = 0) const;
-    int heightForLineCount(int);
+    virtual RootInlineBox* lineAtIndex(int) const;
+    virtual int lineCount(const RootInlineBox* = 0, bool* = 0) const;
+    virtual int heightForLineCount(int);

[ojan, 2014/11/28 04:02:23]

I wonder what uses these three outside of RenderParagraph. Maybe once you're
done with the refactoring here we'll be able to move these methods into
RenderParagraph.h and get rid of the RenderBlock versions.

     void clearTruncation();
 
     static RenderBlock* createAnonymousWithParentRendererAndDisplay(const RenderObject*, EDisplay = PARAGRAPH);
@@ -239,7 +236,7 @@ protected:
 
     virtual int firstLineBoxBaseline() const override;
     virtual int inlineBlockBaseline(LineDirectionMode) const override;
-    int lastLineBoxBaseline(LineDirectionMode) const;
+    virtual int lastLineBoxBaseline(LineDirectionMode) const;
 
     virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) override;
 
@@ -347,7 +344,6 @@ protected:
     unsigned m_hasMarginBeforeQuirk : 1; // Note these quirk values can't be put in RenderBlockRareData since they are set too frequently.
     unsigned m_hasMarginAfterQuirk : 1;
     unsigned m_beingDestroyed : 1;
-    unsigned m_hasMarkupTruncation : 1;
     unsigned m_hasBorderOrPaddingLogicalWidthChanged : 1;
 
     // FIXME-BLOCKFLOW: Remove this when the line layout stuff has all moved out of RenderBlock