content/browser/renderer_host/render_widget_host_view_mac.mm - 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/browser/renderer_host/render_widget_host_view_mac.mm

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

« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_gtk.cc ('k') | content/browser/renderer_host/render_widget_host_view_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_mac.mm

diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm

index a8d05a8235e3586b5629ed96d82d27156d2a0af1..69bb0cfb5655eea510d05e766782eee9c0de14e0 100644

--- a/content/browser/renderer_host/render_widget_host_view_mac.mm

+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm

@@ -852,8 +852,9 @@ void RenderWidgetHostViewMac::CopyFromCompositingSurface(

gfx::Rect src_gl_subrect = src_subrect;

src_gl_subrect.set_y(GetViewBounds().height() - src_subrect.bottom());

- gfx::Rect src_pixel_gl_subrect =

- gfx::ToEnclosingRect(src_gl_subrect.Scale(scale));

+ gfx::RectF scaled_src_gl_subrect = src_gl_subrect;

+ scaled_src_gl_subrect.Scale(scale);

+ gfx::Rect src_pixel_gl_subrect = gfx::ToEnclosingRect(scaled_src_gl_subrect);

compositing_iosurface_->CopyTo(

src_pixel_gl_subrect,

dst_pixel_size,

@@ -1118,7 +1119,7 @@ gfx::Rect RenderWidgetHostViewMac::GetFirstRectForCompositionRange(

*actual_range = ui::Range(range.start(), end_idx);

gfx::Rect rect = composition_bounds_[range.start()];

for (size_t i = range.start() + 1; i < end_idx; ++i) {

- rect = rect.Union(composition_bounds_[i]);

+ rect.Union(composition_bounds_[i]);

}

return rect;

}

@@ -2269,7 +2270,8 @@ void RenderWidgetHostViewMac::SetTextInputActive(bool active) {

// smaller and the renderer hasn't yet repainted.

int yOffset = NSHeight([self bounds]) - backingStore->size().height();

- gfx::Rect paintRect = bitmapRect.Intersect(damagedRect);

+ gfx::Rect paintRect = bitmapRect;

+ paintRect.Intersect(damagedRect);

if (!paintRect.IsEmpty()) {

// if we have a CGLayer, draw that into the window

if (backingStore->cg_layer()) {