| Index: ui/gfx/render_text_mac.h
|
| diff --git a/ui/gfx/render_text_mac.h b/ui/gfx/render_text_mac.h
|
| index f69bedb6067941a415a8c0e0feda5afa89f036f1..247bd53c038eef0c7438d4e4137c30ca360c069b 100644
|
| --- a/ui/gfx/render_text_mac.h
|
| +++ b/ui/gfx/render_text_mac.h
|
| @@ -23,31 +23,31 @@ namespace gfx {
|
| class RenderTextMac : public RenderText {
|
| public:
|
| RenderTextMac();
|
| - virtual ~RenderTextMac();
|
| + ~RenderTextMac() 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;
|
| + Size GetStringSize() override;
|
| + SizeF GetStringSizeF() override;
|
| + SelectionModel FindCursorPosition(const Point& point) override;
|
| + std::vector<FontSpan> GetFontSpansForTesting() 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 Range GetGlyphBounds(size_t index) 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;
|
| + Range GetGlyphBounds(size_t index) 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:
|
| struct TextRun {
|
|
|