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

Side by Side Diff: cc/layers/picture_image_layer.cc

Issue 93663004: [#2] Pass gfx structs by const ref (gfx::Rect, gfx::RectF) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to ToT, fix builds on non-linux platforms! Created 6 years, 11 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 unified diff | Download patch
« no previous file with comments | « cc/layers/picture_image_layer.h ('k') | cc/layers/picture_layer_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/layers/picture_image_layer.h" 5 #include "cc/layers/picture_image_layer.h"
6 6
7 #include "cc/layers/picture_image_layer_impl.h" 7 #include "cc/layers/picture_image_layer_impl.h"
8 #include "third_party/skia/include/core/SkCanvas.h" 8 #include "third_party/skia/include/core/SkCanvas.h"
9 9
10 namespace cc { 10 namespace cc {
(...skipping 23 matching lines...) Expand all
34 // affect the actual contents of the image (e.g. a CSS animation). 34 // affect the actual contents of the image (e.g. a CSS animation).
35 // With this check in place we avoid unecessary texture uploads. 35 // With this check in place we avoid unecessary texture uploads.
36 if (bitmap.pixelRef() && bitmap.pixelRef() == bitmap_.pixelRef()) 36 if (bitmap.pixelRef() && bitmap.pixelRef() == bitmap_.pixelRef())
37 return; 37 return;
38 38
39 bitmap_ = bitmap; 39 bitmap_ = bitmap;
40 SetNeedsDisplay(); 40 SetNeedsDisplay();
41 } 41 }
42 42
43 void PictureImageLayer::PaintContents(SkCanvas* canvas, 43 void PictureImageLayer::PaintContents(SkCanvas* canvas,
44 gfx::Rect clip, 44 const gfx::Rect& clip,
45 gfx::RectF* opaque) { 45 gfx::RectF* opaque) {
46 if (!bitmap_.width() || !bitmap_.height()) 46 if (!bitmap_.width() || !bitmap_.height())
47 return; 47 return;
48 48
49 SkScalar content_to_layer_scale_x = 49 SkScalar content_to_layer_scale_x =
50 SkFloatToScalar(static_cast<float>(bounds().width()) / bitmap_.width()); 50 SkFloatToScalar(static_cast<float>(bounds().width()) / bitmap_.width());
51 SkScalar content_to_layer_scale_y = 51 SkScalar content_to_layer_scale_y =
52 SkFloatToScalar(static_cast<float>(bounds().height()) / bitmap_.height()); 52 SkFloatToScalar(static_cast<float>(bounds().height()) / bitmap_.height());
53 canvas->scale(content_to_layer_scale_x, content_to_layer_scale_y); 53 canvas->scale(content_to_layer_scale_x, content_to_layer_scale_y);
54 54
55 canvas->drawBitmap(bitmap_, 0, 0); 55 canvas->drawBitmap(bitmap_, 0, 0);
56 } 56 }
57 57
58 } // namespace cc 58 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/picture_image_layer.h ('k') | cc/layers/picture_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698