| Index: ui/gfx/render_text_mac.h
|
| diff --git a/ui/gfx/render_text_mac.h b/ui/gfx/render_text_mac.h
|
| index ad03b84593549852ce44cdbb6b4dedf60cf81f0e..f69bedb6067941a415a8c0e0feda5afa89f036f1 100644
|
| --- a/ui/gfx/render_text_mac.h
|
| +++ b/ui/gfx/render_text_mac.h
|
| @@ -26,28 +26,28 @@ class RenderTextMac : public RenderText {
|
| virtual ~RenderTextMac();
|
|
|
| // 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 Size GetStringSize() override;
|
| + virtual SizeF GetStringSizeF() override;
|
| + virtual SelectionModel FindCursorPosition(const Point& point) override;
|
| + virtual std::vector<FontSpan> GetFontSpansForTesting() override;
|
|
|
| protected:
|
| // Overridden from RenderText:
|
| - virtual int GetLayoutTextBaseline() OVERRIDE;
|
| + virtual int GetLayoutTextBaseline() override;
|
| virtual SelectionModel AdjacentCharSelectionModel(
|
| const SelectionModel& selection,
|
| - VisualCursorDirection direction) OVERRIDE;
|
| + VisualCursorDirection direction) override;
|
| virtual 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;
|
| + 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;
|
|
|
| private:
|
| struct TextRun {
|
|
|