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

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

Index: content/browser/renderer_host/backing_store_aura.cc

diff --git a/content/browser/renderer_host/backing_store_aura.cc b/content/browser/renderer_host/backing_store_aura.cc

index 4a7adaf76f9fa07ae49fbb858464243c9749a217..5d1149a5f50466fb15d7466e55e929c5873d34ff 100644

--- a/content/browser/renderer_host/backing_store_aura.cc

+++ b/content/browser/renderer_host/backing_store_aura.cc

@@ -91,8 +91,9 @@ void BackingStoreAura::PaintToBackingStore(

if (bitmap_rect.IsEmpty())

return;

- gfx::Rect pixel_bitmap_rect =

- gfx::ToEnclosedRect(bitmap_rect.Scale(scale_factor));

+ gfx::RectF scaled_bitmap_rect = bitmap_rect;

+ scaled_bitmap_rect.Scale(scale_factor);

+ gfx::Rect pixel_bitmap_rect = gfx::ToEnclosedRect(scaled_bitmap_rect);

const int width = pixel_bitmap_rect.width();

const int height = pixel_bitmap_rect.height();

@@ -112,16 +113,19 @@ void BackingStoreAura::PaintToBackingStore(

sk_bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);

sk_bitmap.setPixels(dib->memory());

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

- const gfx::Rect pixel_copy_rect =

- gfx::ToEnclosingRect(copy_rects[i].Scale(scale_factor));

+ gfx::RectF scaled_copy_rect = copy_rects[i];

+ scaled_copy_rect.Scale(scale_factor);

+ const gfx::Rect pixel_copy_rect = gfx::ToEnclosingRect(scaled_copy_rect);

int x = pixel_copy_rect.x() - pixel_bitmap_rect.x();

int y = pixel_copy_rect.y() - pixel_bitmap_rect.y();

SkIRect srcrect = SkIRect::MakeXYWH(x, y,

pixel_copy_rect.width(),

pixel_copy_rect.height());

+ gfx::RectF scaled_copy_dst_rect = copy_rects[i];

+ scaled_copy_dst_rect.Scale(device_scale_factor_);

const gfx::Rect pixel_copy_dst_rect =

- gfx::ToEnclosingRect(copy_rects[i].Scale(device_scale_factor_));

+ gfx::ToEnclosingRect(scaled_copy_dst_rect);

SkRect dstrect = SkRect::MakeXYWH(

SkIntToScalar(pixel_copy_dst_rect.x()),

SkIntToScalar(pixel_copy_dst_rect.y()),

@@ -134,8 +138,9 @@ void BackingStoreAura::PaintToBackingStore(

void BackingStoreAura::ScrollBackingStore(int dx, int dy,

const gfx::Rect& clip_rect,

const gfx::Size& view_size) {

- gfx::Rect pixel_rect =

- gfx::ToEnclosingRect(clip_rect.Scale(device_scale_factor_));

+ gfx::RectF scaled_clip_rect = clip_rect;

+ scaled_clip_rect.Scale(device_scale_factor_);

+ gfx::Rect pixel_rect = gfx::ToEnclosingRect(scaled_clip_rect);

int pixel_dx = dx * device_scale_factor_;

int pixel_dy = dy * device_scale_factor_;