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

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

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Blind fix for Mac. Created 5 years, 11 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
Index: Source/core/rendering/InlineTextBox.h
diff --git a/Source/core/rendering/InlineTextBox.h b/Source/core/rendering/InlineTextBox.h
index 8a25a6d85bb5e7e6401b89dbdb6e92187a4658a0..d0108f3477c1c73726dedef2e4305f54c1884227 100644
--- a/Source/core/rendering/InlineTextBox.h
+++ b/Source/core/rendering/InlineTextBox.h
@@ -80,7 +80,7 @@ public:
virtual int baselinePosition(FontBaseline) const override final;
virtual LayoutUnit lineHeight() const override final;
- bool getEmphasisMarkPosition(RenderStyle*, TextEmphasisPosition&) const;
+ bool getEmphasisMarkPosition(const RenderStyle*, TextEmphasisPosition&) const;
LayoutRect logicalOverflowRect() const;
void setLogicalOverflowRect(const LayoutRect&);
@@ -88,8 +88,8 @@ public:
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;
+ TextRun constructTextRun(const RenderStyle*, const Font&, StringBuilder* charactersWithHyphen = 0) const;
+ TextRun constructTextRun(const RenderStyle*, const Font&, StringView, int maximumLength, StringBuilder* charactersWithHyphen = 0) const;
#ifndef NDEBUG
virtual void showBox(int = 0) const override;
@@ -97,7 +97,7 @@ public:
#endif
public:
- TextRun constructTextRunForInspector(RenderStyle*, const Font&) const;
+ TextRun constructTextRunForInspector(const RenderStyle*, const Font&) const;
virtual FloatRectWillBeLayoutRect calculateBoundaries() const override { return FloatRectWillBeLayoutRect(x(), y(), width(), height()); }
virtual LayoutRect localSelectionRect(int startPos, int endPos);
@@ -105,8 +105,8 @@ public:
void selectionStartEnd(int& sPos, int& ePos) const;
// These functions both paint markers and update the DocumentMarker's renderedRect.
- virtual void paintDocumentMarker(GraphicsContext*, const FloatPointWillBeLayoutPoint& boxOrigin, DocumentMarker*, RenderStyle*, const Font&, bool grammar);
- virtual void paintTextMatchMarker(GraphicsContext*, const FloatPointWillBeLayoutPoint& boxOrigin, DocumentMarker*, RenderStyle*, const Font&);
+ virtual void paintDocumentMarker(GraphicsContext*, const FloatPointWillBeLayoutPoint& boxOrigin, DocumentMarker*, const RenderStyle*, const Font&, bool grammar);
+ virtual void paintTextMatchMarker(GraphicsContext*, const FloatPointWillBeLayoutPoint& boxOrigin, DocumentMarker*, const RenderStyle*, const Font&);
protected:
virtual void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override;

Powered by Google App Engine
This is Rietveld 408576698