| Index: ui/gfx/render_text_harfbuzz.h
|
| diff --git a/ui/gfx/render_text_harfbuzz.h b/ui/gfx/render_text_harfbuzz.h
|
| index 329be9f9f10cf6bc1728d3034520ccf8e32c8146..c3508ff258c8da9d247bdb3ad71d4a31000f0344 100644
|
| --- a/ui/gfx/render_text_harfbuzz.h
|
| +++ b/ui/gfx/render_text_harfbuzz.h
|
| @@ -77,31 +77,31 @@ struct GFX_EXPORT TextRunHarfBuzz {
|
| class GFX_EXPORT RenderTextHarfBuzz : public RenderText {
|
| public:
|
| RenderTextHarfBuzz();
|
| - virtual ~RenderTextHarfBuzz();
|
| + ~RenderTextHarfBuzz() override;
|
|
|
| // Overridden from RenderText.
|
| - virtual Size GetStringSize() override;
|
| - virtual SizeF GetStringSizeF() override;
|
| - virtual SelectionModel FindCursorPosition(const Point& point) override;
|
| - virtual std::vector<FontSpan> GetFontSpansForTesting() override;
|
| - virtual Range GetGlyphBounds(size_t index) override;
|
| + Size GetStringSize() override;
|
| + SizeF GetStringSizeF() override;
|
| + SelectionModel FindCursorPosition(const Point& point) override;
|
| + std::vector<FontSpan> GetFontSpansForTesting() override;
|
| + Range GetGlyphBounds(size_t index) override;
|
|
|
| protected:
|
| // Overridden from RenderText.
|
| - virtual int GetLayoutTextBaseline() override;
|
| - virtual SelectionModel AdjacentCharSelectionModel(
|
| + int GetLayoutTextBaseline() override;
|
| + SelectionModel AdjacentCharSelectionModel(
|
| const SelectionModel& selection,
|
| VisualCursorDirection direction) override;
|
| - virtual SelectionModel AdjacentWordSelectionModel(
|
| + SelectionModel AdjacentWordSelectionModel(
|
| const SelectionModel& selection,
|
| VisualCursorDirection direction) override;
|
| - virtual std::vector<Rect> GetSubstringBounds(const Range& range) override;
|
| - virtual size_t TextIndexToLayoutIndex(size_t index) const override;
|
| - virtual size_t LayoutIndexToTextIndex(size_t index) const override;
|
| - virtual bool IsValidCursorIndex(size_t index) override;
|
| - virtual void ResetLayout() override;
|
| - virtual void EnsureLayout() override;
|
| - virtual void DrawVisualText(Canvas* canvas) override;
|
| + std::vector<Rect> GetSubstringBounds(const Range& range) override;
|
| + size_t TextIndexToLayoutIndex(size_t index) const override;
|
| + size_t LayoutIndexToTextIndex(size_t index) const override;
|
| + bool IsValidCursorIndex(size_t index) override;
|
| + void ResetLayout() override;
|
| + void EnsureLayout() override;
|
| + void DrawVisualText(Canvas* canvas) override;
|
|
|
| private:
|
| friend class RenderTextTest;
|
|
|