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

Side by Side Diff: ui/gfx/render_text_mac.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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
« no previous file with comments | « ui/gfx/render_text_harfbuzz.cc ('k') | ui/gfx/render_text_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GFX_RENDER_TEXT_MAC_H_ 5 #ifndef UI_GFX_RENDER_TEXT_MAC_H_
6 #define UI_GFX_RENDER_TEXT_MAC_H_ 6 #define UI_GFX_RENDER_TEXT_MAC_H_
7 7
8 #include <ApplicationServices/ApplicationServices.h> 8 #include <ApplicationServices/ApplicationServices.h>
9 #include <stddef.h> 9 #include <stddef.h>
10 #include <stdint.h> 10 #include <stdint.h>
(...skipping 13 matching lines...) Expand all
24 // layout and Skia for drawing. 24 // layout and Skia for drawing.
25 // 25 //
26 // Note: The current implementation only supports drawing and sizing the text, 26 // Note: The current implementation only supports drawing and sizing the text,
27 // but not text selection or cursor movement. 27 // but not text selection or cursor movement.
28 class GFX_EXPORT RenderTextMac : public RenderText { 28 class GFX_EXPORT RenderTextMac : public RenderText {
29 public: 29 public:
30 RenderTextMac(); 30 RenderTextMac();
31 ~RenderTextMac() override; 31 ~RenderTextMac() override;
32 32
33 // RenderText: 33 // RenderText:
34 scoped_ptr<RenderText> CreateInstanceOfSameType() const override; 34 std::unique_ptr<RenderText> CreateInstanceOfSameType() const override;
35 bool MultilineSupported() const override; 35 bool MultilineSupported() const override;
36 const base::string16& GetDisplayText() override; 36 const base::string16& GetDisplayText() override;
37 Size GetStringSize() override; 37 Size GetStringSize() override;
38 SizeF GetStringSizeF() override; 38 SizeF GetStringSizeF() override;
39 SelectionModel FindCursorPosition(const Point& point) override; 39 SelectionModel FindCursorPosition(const Point& point) override;
40 std::vector<FontSpan> GetFontSpansForTesting() override; 40 std::vector<FontSpan> GetFontSpansForTesting() override;
41 41
42 protected: 42 protected:
43 // RenderText: 43 // RenderText:
44 int GetDisplayTextBaseline() override; 44 int GetDisplayTextBaseline() override;
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 126
127 // Indicates that |runs_| are valid, set by |ComputeRuns()|. 127 // Indicates that |runs_| are valid, set by |ComputeRuns()|.
128 bool runs_valid_; 128 bool runs_valid_;
129 129
130 DISALLOW_COPY_AND_ASSIGN(RenderTextMac); 130 DISALLOW_COPY_AND_ASSIGN(RenderTextMac);
131 }; 131 };
132 132
133 } // namespace gfx 133 } // namespace gfx
134 134
135 #endif // UI_GFX_RENDER_TEXT_MAC_H_ 135 #endif // UI_GFX_RENDER_TEXT_MAC_H_
OLDNEW
« no previous file with comments | « ui/gfx/render_text_harfbuzz.cc ('k') | ui/gfx/render_text_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698