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

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

Issue 8515012: Avoid unnecessary work in |RenderTextWin::UpdateLayout()| if there are no runs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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
« no previous file with comments | « no previous file | ui/gfx/render_text_win.cc » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 virtual SelectionModel LeftEndSelectionModel() OVERRIDE; 72 virtual SelectionModel LeftEndSelectionModel() OVERRIDE;
73 virtual SelectionModel RightEndSelectionModel() OVERRIDE; 73 virtual SelectionModel RightEndSelectionModel() OVERRIDE;
74 virtual std::vector<Rect> GetSubstringBounds(size_t from, size_t to) OVERRIDE; 74 virtual std::vector<Rect> GetSubstringBounds(size_t from, size_t to) OVERRIDE;
75 virtual bool IsCursorablePosition(size_t position) OVERRIDE; 75 virtual bool IsCursorablePosition(size_t position) OVERRIDE;
76 virtual void UpdateLayout() OVERRIDE; 76 virtual void UpdateLayout() OVERRIDE;
77 77
78 private: 78 private:
79 virtual size_t IndexOfAdjacentGrapheme(size_t index, bool next) OVERRIDE; 79 virtual size_t IndexOfAdjacentGrapheme(size_t index, bool next) OVERRIDE;
80 80
81 void ItemizeLogicalText(); 81 void ItemizeLogicalText();
82 void LayoutVisualText(HDC hdc); 82 void LayoutVisualText();
83 83
84 // Return the run index that contains the argument; or the length of the 84 // Return the run index that contains the argument; or the length of the
85 // |runs_| vector if argument exceeds the text length or width. 85 // |runs_| vector if argument exceeds the text length or width.
86 size_t GetRunContainingPosition(size_t position) const; 86 size_t GetRunContainingPosition(size_t position) const;
87 size_t GetRunContainingPoint(const Point& point) const; 87 size_t GetRunContainingPoint(const Point& point) const;
88 88
89 // Given a |run|, returns the SelectionModel that contains the logical first 89 // Given a |run|, returns the SelectionModel that contains the logical first
90 // or last caret position inside (not at a boundary of) the run. 90 // or last caret position inside (not at a boundary of) the run.
91 // The returned value represents a cursor/caret position without a selection. 91 // The returned value represents a cursor/caret position without a selection.
92 SelectionModel FirstSelectionModelInsideRun(internal::TextRun*); 92 SelectionModel FirstSelectionModelInsideRun(internal::TextRun*);
(...skipping 25 matching lines...) Expand all
118 118
119 scoped_array<int> visual_to_logical_; 119 scoped_array<int> visual_to_logical_;
120 scoped_array<int> logical_to_visual_; 120 scoped_array<int> logical_to_visual_;
121 121
122 DISALLOW_COPY_AND_ASSIGN(RenderTextWin); 122 DISALLOW_COPY_AND_ASSIGN(RenderTextWin);
123 }; 123 };
124 124
125 } // namespace gfx 125 } // namespace gfx
126 126
127 #endif // UI_GFX_RENDER_TEXT_WIN_H_ 127 #endif // UI_GFX_RENDER_TEXT_WIN_H_
OLDNEW
« no previous file with comments | « no previous file | ui/gfx/render_text_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698