Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(859)

Unified Diff: Source/core/rendering/InlineTextBox.h

Issue 620243002: Move painting code from InlineTextBox to InlineTextBoxPainter. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Final version. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/paint/InlineTextBoxPainter.cpp ('k') | Source/core/rendering/InlineTextBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/InlineTextBox.h
diff --git a/Source/core/rendering/InlineTextBox.h b/Source/core/rendering/InlineTextBox.h
index f82a860ba6e93db65c589735b64990f43a9a1cdf..9b5093815c6e7f727a1f5a0cc633093bfa4b7359 100644
--- a/Source/core/rendering/InlineTextBox.h
+++ b/Source/core/rendering/InlineTextBox.h
@@ -90,6 +90,10 @@ public:
LayoutUnit logicalTopVisualOverflow() const { return logicalOverflowRect().y(); }
LayoutUnit logicalBottomVisualOverflow() const { return logicalOverflowRect().maxY(); }
+ // charactersWithHyphen, if provided, must not be destroyed before the TextRun.
+ TextRun constructTextRun(RenderStyle*, const Font&, StringBuilder* charactersWithHyphen = 0) const;
+ TextRun constructTextRun(RenderStyle*, const Font&, StringView, int maximumLength, StringBuilder* charactersWithHyphen = 0) const;
+
#ifndef NDEBUG
virtual void showBox(int = 0) const OVERRIDE;
virtual const char* boxName() const OVERRIDE;
@@ -97,14 +101,6 @@ public:
enum RotationDirection { Counterclockwise, Clockwise };
static AffineTransform rotation(const FloatRect& boxRect, RotationDirection);
-private:
- LayoutUnit selectionTop();
- LayoutUnit selectionBottom();
- LayoutUnit selectionHeight();
-
- // charactersWithHyphen, if provided, must not be destroyed before the TextRun.
- TextRun constructTextRun(RenderStyle*, const Font&, StringBuilder* charactersWithHyphen = 0) const;
- TextRun constructTextRun(RenderStyle*, const Font&, StringView, int maximumLength, StringBuilder* charactersWithHyphen = 0) const;
public:
TextRun constructTextRunForInspector(RenderStyle*, const Font&) const;
@@ -114,6 +110,10 @@ public:
bool isSelected(int startPos, int endPos) const;
void selectionStartEnd(int& sPos, int& ePos) const;
+ // These functions both paint markers and update the DocumentMarker's renderedRect.
+ virtual void paintDocumentMarker(GraphicsContext*, const FloatPoint& boxOrigin, DocumentMarker*, RenderStyle*, const Font&, bool grammar);
+ virtual void paintTextMatchMarker(GraphicsContext*, const FloatPoint& boxOrigin, DocumentMarker*, RenderStyle*, const Font&);
+
protected:
virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) OVERRIDE;
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) OVERRIDE;
@@ -147,7 +147,6 @@ public:
virtual int caretMinOffset() const OVERRIDE FINAL;
virtual int caretMaxOffset() const OVERRIDE FINAL;
-private:
float textPos() const; // returns the x position relative to the left start of the text line.
public:
@@ -169,23 +168,7 @@ private:
unsigned short m_truncation; // Where to truncate when text overflow is applied. We use special constants to
// denote no truncation (the whole run paints) and full truncation (nothing paints at all).
- unsigned underlinePaintStart(const CompositionUnderline&);
- unsigned underlinePaintEnd(const CompositionUnderline&);
-
-protected:
- void paintSingleCompositionBackgroundRun(GraphicsContext*, const FloatPoint& boxOrigin, RenderStyle*, const Font&, Color backgroundColor, int startPos, int endPos);
- void paintCompositionBackgrounds(GraphicsContext*, const FloatPoint& boxOrigin, RenderStyle*, const Font&, bool useCustomUnderlines);
- void paintDocumentMarkers(GraphicsContext*, const FloatPoint& boxOrigin, RenderStyle*, const Font&, bool background);
- void paintCompositionUnderline(GraphicsContext*, const FloatPoint& boxOrigin, const CompositionUnderline&);
-
- // These functions both paint markers and update the DocumentMarker's renderedRect.
- virtual void paintDocumentMarker(GraphicsContext*, const FloatPoint& boxOrigin, DocumentMarker*, RenderStyle*, const Font&, bool grammar);
- virtual void paintTextMatchMarker(GraphicsContext*, const FloatPoint& boxOrigin, DocumentMarker*, RenderStyle*, const Font&);
-
private:
- void paintDecoration(GraphicsContext*, const FloatPoint& boxOrigin, TextDecoration);
- void paintSelection(GraphicsContext*, const FloatPoint& boxOrigin, RenderStyle*, const Font&, Color textColor);
-
TextRun::ExpansionBehavior expansionBehavior() const
{
return (canHaveLeadingExpansion() ? TextRun::AllowLeadingExpansion : TextRun::ForbidLeadingExpansion)
« no previous file with comments | « Source/core/paint/InlineTextBoxPainter.cpp ('k') | Source/core/rendering/InlineTextBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698