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

Unified Diff: ui/gfx/render_text_mac.h

Issue 916203002: Reduce the number of text reshaping in RenderText (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/render_text_harfbuzz.cc ('k') | ui/gfx/render_text_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/render_text_mac.h
diff --git a/ui/gfx/render_text_mac.h b/ui/gfx/render_text_mac.h
index 5b33e00af0e885b313c8b8a7602945d53cb43606..737207fe19af6060b893b4b38a0cfb582e1f847a 100644
--- a/ui/gfx/render_text_mac.h
+++ b/ui/gfx/render_text_mac.h
@@ -25,16 +25,17 @@ class RenderTextMac : public RenderText {
RenderTextMac();
~RenderTextMac() override;
- // Overridden from RenderText:
+ // RenderText:
scoped_ptr<RenderText> CreateInstanceOfSameType() const override;
+ const base::string16& GetDisplayText() override;
Size GetStringSize() override;
SizeF GetStringSizeF() override;
SelectionModel FindCursorPosition(const Point& point) override;
std::vector<FontSpan> GetFontSpansForTesting() override;
protected:
- // Overridden from RenderText:
- int GetLayoutTextBaseline() override;
+ // RenderText:
+ int GetDisplayTextBaseline() override;
SelectionModel AdjacentCharSelectionModel(
const SelectionModel& selection,
VisualCursorDirection direction) override;
@@ -43,10 +44,11 @@ class RenderTextMac : public RenderText {
VisualCursorDirection direction) 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;
+ size_t TextIndexToDisplayIndex(size_t index) override;
+ size_t DisplayIndexToTextIndex(size_t index) override;
bool IsValidCursorIndex(size_t index) override;
- void ResetLayout() override;
+ void OnLayoutTextAttributeChanged(bool text_changed) override;
+ void OnDisplayTextAttributeChanged() override;
void EnsureLayout() override;
void DrawVisualText(Canvas* canvas) override;
« no previous file with comments | « ui/gfx/render_text_harfbuzz.cc ('k') | ui/gfx/render_text_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698