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

Unified Diff: ui/gfx/render_text.cc

Issue 2164483006: [MacViews] Implemented text context menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed msw's comments, changed 2016 to 2017 Created 3 years, 11 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
Index: ui/gfx/render_text.cc
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc
index 3b36ea0b3fea9d6ad80cce7cdc52272976169f97..aea95995c7b0b7ddddd4facc5f194cdfe11f5a2d 100644
--- a/ui/gfx/render_text.cc
+++ b/ui/gfx/render_text.cc
@@ -1028,9 +1028,10 @@ Vector2d RenderText::GetLineOffset(size_t line_number) {
return offset;
}
-bool RenderText::GetDecoratedWordAtPoint(const Point& point,
- DecoratedText* decorated_word,
- Point* baseline_point) {
+bool RenderText::GetDecoratedWordAndBaselineAtPoint(
+ const Point& point,
+ DecoratedText* decorated_word,
+ Point* baseline_point) {
if (obscured())
return false;
@@ -1045,9 +1046,19 @@ bool RenderText::GetDecoratedWordAtPoint(const Point& point,
DCHECK(!word_range.is_reversed());
DCHECK(!word_range.is_empty());
+ return GetDecoratedTextAndBaselineForRange(word_range, decorated_word,
+ baseline_point);
+}
+
+bool RenderText::GetDecoratedTextAndBaselineForRange(
+ const Range& word_range,
+ DecoratedText* decorated_text,
+ Point* baseline_point) {
+ EnsureLayout();
+
const std::vector<Rect> word_bounds = GetSubstringBounds(word_range);
if (word_bounds.empty() ||
- !GetDecoratedTextForRange(word_range, decorated_word)) {
+ !GetDecoratedTextForRange(word_range, decorated_text)) {
return false;
}

Powered by Google App Engine
This is Rietveld 408576698