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

Unified Diff: content/renderer/browser_plugin/browser_plugin_backing_store.cc

Issue 11270042: Add non-member non-mutating methods for common gfx::Rect operations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/browser_plugin/browser_plugin_backing_store.cc
diff --git a/content/renderer/browser_plugin/browser_plugin_backing_store.cc b/content/renderer/browser_plugin/browser_plugin_backing_store.cc
index 131b0d097be594d5efe5be3569e34c1690249e99..7a923e8003ade80e21b058ffcc884d4243b0b299 100644
--- a/content/renderer/browser_plugin/browser_plugin_backing_store.cc
+++ b/content/renderer/browser_plugin/browser_plugin_backing_store.cc
@@ -37,9 +37,8 @@ void BrowserPluginBackingStore::PaintToBackingStore(
if (bitmap_rect.IsEmpty())
return;
- gfx::RectF scaled_bitmap_rect = bitmap_rect;
- scaled_bitmap_rect.Scale(scale_factor_);
- gfx::Rect pixel_bitmap_rect = gfx::ToEnclosingRect(scaled_bitmap_rect);
+ gfx::Rect pixel_bitmap_rect = gfx::ToEnclosingRect(
+ gfx::Scale(bitmap_rect, scale_factor_));
const int width = pixel_bitmap_rect.width();
const int height = pixel_bitmap_rect.height();
@@ -58,9 +57,8 @@ void BrowserPluginBackingStore::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++) {
- 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);
+ const gfx::Rect& pixel_copy_rect = gfx::ToEnclosingRect(
+ gfx::Scale(copy_rects[i], scale_factor_));
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,
@@ -81,9 +79,8 @@ void BrowserPluginBackingStore::ScrollBackingStore(
int dy,
const gfx::Rect& clip_rect,
const gfx::Size& view_size) {
- gfx::RectF scaled_clip_rect = clip_rect;
- scaled_clip_rect.Scale(scale_factor_);
- gfx::Rect pixel_rect = gfx::ToEnclosingRect(scaled_clip_rect);
+ gfx::Rect pixel_rect = gfx::ToEnclosingRect(
+ gfx::Scale(clip_rect, scale_factor_));
int pixel_dx = dx * scale_factor_;
int pixel_dy = dy * scale_factor_;

Powered by Google App Engine
This is Rietveld 408576698