ui/gfx/render_text_win.cc - Issue 11110004: Make gfx::Rect class operations consistently mutate the class they are called on.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/render_text_win.cc

Issue 11110004: Make gfx::Rect class operations consistently mutate the class they are called on. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: cc/ fixes Created 8 years, 2 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_win.cc

diff --git a/ui/gfx/render_text_win.cc b/ui/gfx/render_text_win.cc

index 0b72ab68b4888b0aa100df9f411c98fe267a4d25..1e73d130f78f9debca0712a668e53eb3142d6e66 100644

--- a/ui/gfx/render_text_win.cc

+++ b/ui/gfx/render_text_win.cc

@@ -381,7 +381,7 @@ std::vector<Rect> RenderTextWin::GetSubstringBounds(const ui::Range& range) {

rect.set_origin(ToViewPoint(rect.origin()));

// Union this with the last rect if they're adjacent.

if (!bounds.empty() && rect.SharesEdgeWith(bounds.back())) {

- rect = rect.Union(bounds.back());

+ rect.Union(bounds.back());

bounds.pop_back();

}

bounds.push_back(rect);

« no previous file with comments | « ui/gfx/rect_unittest.cc ('k') | ui/gfx/screen_gtk.cc » ('j') | no next file with comments »