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

Side by Side Diff: third_party/WebKit/Source/core/layout/line/InlineTextBox.h

Issue 2246383002: Remove unused Font argument from InlineTextBox::constructTextRun (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@combine
Patch Set: Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * (C) 1999 Lars Knoll (knoll@kde.org) 2 * (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Dirk Mueller (mueller@kde.org) 3 * (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 LayoutUnit lineHeight() const final; 82 LayoutUnit lineHeight() const final;
83 83
84 bool getEmphasisMarkPosition(const ComputedStyle&, TextEmphasisPosition&) co nst; 84 bool getEmphasisMarkPosition(const ComputedStyle&, TextEmphasisPosition&) co nst;
85 85
86 LayoutRect logicalOverflowRect() const; 86 LayoutRect logicalOverflowRect() const;
87 void setLogicalOverflowRect(const LayoutRect&); 87 void setLogicalOverflowRect(const LayoutRect&);
88 LayoutUnit logicalTopVisualOverflow() const { return logicalOverflowRect().y (); } 88 LayoutUnit logicalTopVisualOverflow() const { return logicalOverflowRect().y (); }
89 LayoutUnit logicalBottomVisualOverflow() const { return logicalOverflowRect( ).maxY(); } 89 LayoutUnit logicalBottomVisualOverflow() const { return logicalOverflowRect( ).maxY(); }
90 90
91 // charactersWithHyphen, if provided, must not be destroyed before the TextR un. 91 // charactersWithHyphen, if provided, must not be destroyed before the TextR un.
92 TextRun constructTextRun(const ComputedStyle&, const Font&, StringBuilder* c haractersWithHyphen = nullptr) const; 92 TextRun constructTextRun(const ComputedStyle&, StringBuilder* charactersWith Hyphen = nullptr) const;
93 TextRun constructTextRun(const ComputedStyle&, const Font&, StringView, int maximumLength, StringBuilder* charactersWithHyphen = nullptr) const; 93 TextRun constructTextRun(const ComputedStyle&, StringView, int maximumLength , StringBuilder* charactersWithHyphen = nullptr) const;
94 94
95 #ifndef NDEBUG 95 #ifndef NDEBUG
96 void showBox(int = 0) const override; 96 void showBox(int = 0) const override;
97 #endif 97 #endif
98 const char* boxName() const override; 98 const char* boxName() const override;
99 String debugName() const override; 99 String debugName() const override;
100 100
101 String text() const; 101 String text() const;
102 102
103 public: 103 public:
104 TextRun constructTextRunForInspector(const ComputedStyle&, const Font&) cons t; 104 TextRun constructTextRunForInspector(const ComputedStyle&) const;
105 LayoutRect calculateBoundaries() const override { return LayoutRect(x(), y() , width(), height()); } 105 LayoutRect calculateBoundaries() const override { return LayoutRect(x(), y() , width(), height()); }
106 106
107 virtual LayoutRect localSelectionRect(int startPos, int endPos) const; 107 virtual LayoutRect localSelectionRect(int startPos, int endPos) const;
108 bool isSelected(int startPos, int endPos) const; 108 bool isSelected(int startPos, int endPos) const;
109 void selectionStartEnd(int& sPos, int& ePos) const; 109 void selectionStartEnd(int& sPos, int& ePos) const;
110 110
111 // These functions both paint markers and update the DocumentMarker's render edRect. 111 // These functions both paint markers and update the DocumentMarker's render edRect.
112 virtual void paintDocumentMarker(GraphicsContext&, const LayoutPoint& boxOri gin, DocumentMarker*, const ComputedStyle&, const Font&, bool grammar) const; 112 virtual void paintDocumentMarker(GraphicsContext&, const LayoutPoint& boxOri gin, DocumentMarker*, const ComputedStyle&, const Font&, bool grammar) const;
113 virtual void paintTextMatchMarkerForeground(const PaintInfo&, const LayoutPo int& boxOrigin, DocumentMarker*, const ComputedStyle&, const Font&) const; 113 virtual void paintTextMatchMarkerForeground(const PaintInfo&, const LayoutPo int& boxOrigin, DocumentMarker*, const ComputedStyle&, const Font&) const;
114 virtual void paintTextMatchMarkerBackground(const PaintInfo&, const LayoutPo int& boxOrigin, DocumentMarker*, const ComputedStyle&, const Font&) const; 114 virtual void paintTextMatchMarkerBackground(const PaintInfo&, const LayoutPo int& boxOrigin, DocumentMarker*, const ComputedStyle&, const Font&) const;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 return (canHaveLeadingExpansion() ? TextRun::AllowLeadingExpansion : Tex tRun::ForbidLeadingExpansion) 180 return (canHaveLeadingExpansion() ? TextRun::AllowLeadingExpansion : Tex tRun::ForbidLeadingExpansion)
181 | (expansion() && nextLeafChild() ? TextRun::AllowTrailingExpansion : TextRun::ForbidTrailingExpansion); 181 | (expansion() && nextLeafChild() ? TextRun::AllowTrailingExpansion : TextRun::ForbidTrailingExpansion);
182 } 182 }
183 }; 183 };
184 184
185 DEFINE_INLINE_BOX_TYPE_CASTS(InlineTextBox); 185 DEFINE_INLINE_BOX_TYPE_CASTS(InlineTextBox);
186 186
187 } // namespace blink 187 } // namespace blink
188 188
189 #endif // InlineTextBox_h 189 #endif // InlineTextBox_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698