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

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

Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 8 years, 9 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 | Annotate | Revision Log
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_WIN_H_ 5 #ifndef UI_GFX_RENDER_TEXT_WIN_H_
6 #define UI_GFX_RENDER_TEXT_WIN_H_ 6 #define UI_GFX_RENDER_TEXT_WIN_H_
7 #pragma once 7 #pragma once
8 8
9 #include <usp10.h> 9 #include <usp10.h>
10 10
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 virtual SelectionModel AdjacentWordSelectionModel( 80 virtual SelectionModel AdjacentWordSelectionModel(
81 const SelectionModel& selection, 81 const SelectionModel& selection,
82 VisualCursorDirection direction) OVERRIDE; 82 VisualCursorDirection direction) OVERRIDE;
83 virtual SelectionModel EdgeSelectionModel( 83 virtual SelectionModel EdgeSelectionModel(
84 VisualCursorDirection direction) OVERRIDE; 84 VisualCursorDirection direction) OVERRIDE;
85 virtual std::vector<Rect> GetSubstringBounds(size_t from, size_t to) OVERRIDE; 85 virtual std::vector<Rect> GetSubstringBounds(size_t from, size_t to) OVERRIDE;
86 virtual void SetSelectionModel(const SelectionModel& model) OVERRIDE; 86 virtual void SetSelectionModel(const SelectionModel& model) OVERRIDE;
87 virtual bool IsCursorablePosition(size_t position) OVERRIDE; 87 virtual bool IsCursorablePosition(size_t position) OVERRIDE;
88 virtual void UpdateLayout() OVERRIDE; 88 virtual void UpdateLayout() OVERRIDE;
89 virtual void EnsureLayout() OVERRIDE; 89 virtual void EnsureLayout() OVERRIDE;
90 virtual void DrawVisualText(Canvas* canvas) OVERRIDE; 90 virtual void DrawVisualText(CanvasSkia* canvas) OVERRIDE;
91 91
92 private: 92 private:
93 virtual size_t IndexOfAdjacentGrapheme( 93 virtual size_t IndexOfAdjacentGrapheme(
94 size_t index, 94 size_t index,
95 LogicalCursorDirection direction) OVERRIDE; 95 LogicalCursorDirection direction) OVERRIDE;
96 96
97 void ItemizeLogicalText(); 97 void ItemizeLogicalText();
98 void LayoutVisualText(); 98 void LayoutVisualText();
99 99
100 // Returns a vector of linked fonts corresponding to |font|. 100 // Returns a vector of linked fonts corresponding to |font|.
(...skipping 26 matching lines...) Expand all
127 scoped_array<int> logical_to_visual_; 127 scoped_array<int> logical_to_visual_;
128 128
129 bool needs_layout_; 129 bool needs_layout_;
130 130
131 DISALLOW_COPY_AND_ASSIGN(RenderTextWin); 131 DISALLOW_COPY_AND_ASSIGN(RenderTextWin);
132 }; 132 };
133 133
134 } // namespace gfx 134 } // namespace gfx
135 135
136 #endif // UI_GFX_RENDER_TEXT_WIN_H_ 136 #endif // UI_GFX_RENDER_TEXT_WIN_H_
OLDNEW
« ash/app_list/app_list_item_view.h ('K') | « ui/gfx/render_text_linux.h ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698