content/renderer/disambiguation_popup_helper.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: content/renderer/disambiguation_popup_helper.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: content/renderer/disambiguation_popup_helper.cc

diff --git a/content/renderer/disambiguation_popup_helper.cc b/content/renderer/disambiguation_popup_helper.cc

index 1a55414c03f698fd3396539980d2e30a3c7a2b84..1399518701b56cfc6bf932d8a641304802cc14d8 100644

--- a/content/renderer/disambiguation_popup_helper.cc

+++ b/content/renderer/disambiguation_popup_helper.cc

@@ -92,9 +92,9 @@ float DisambiguationPopupHelper::ComputeZoomAreaAndScaleFactor(

gfx::Rect* zoom_rect) {

*zoom_rect = tap_rect;

for (size_t i = 0; i < target_rects.size(); i++)

- *zoom_rect = zoom_rect->Union(gfx::Rect(target_rects[i]));

+ zoom_rect->Union(gfx::Rect(target_rects[i]));

zoom_rect->Inset(-kDisambiguationPopupPadding, -kDisambiguationPopupPadding);

- *zoom_rect = zoom_rect->Intersect(gfx::Rect(viewport_size));

+ zoom_rect->Intersect(gfx::Rect(viewport_size));

float scale = FindOptimalScaleFactor(target_rects);

*zoom_rect = CropZoomArea(

« no previous file with comments | « content/renderer/browser_plugin/browser_plugin_backing_store.cc ('k') | content/renderer/paint_aggregator.cc » ('j') | no next file with comments »