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

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

Issue 453533002: cc: Remove unused arguments from CalculateContentsScale (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « cc/layers/contents_scaling_layer.h ('k') | cc/layers/image_layer.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/contents_scaling_layer.h" 5 #include "cc/layers/contents_scaling_layer.h"
6 #include "ui/gfx/size_conversions.h" 6 #include "ui/gfx/size_conversions.h"
7 7
8 namespace cc { 8 namespace cc {
9 9
10 gfx::Size ContentsScalingLayer::ComputeContentBoundsForScale( 10 gfx::Size ContentsScalingLayer::ComputeContentBoundsForScale(
11 float scale_x, 11 float scale_x,
12 float scale_y) const { 12 float scale_y) const {
13 return gfx::ToCeiledSize(gfx::ScaleSize(bounds(), scale_x, scale_y)); 13 return gfx::ToCeiledSize(gfx::ScaleSize(bounds(), scale_x, scale_y));
14 } 14 }
15 15
16 ContentsScalingLayer::ContentsScalingLayer() 16 ContentsScalingLayer::ContentsScalingLayer()
17 : last_update_contents_scale_x_(0.f), 17 : last_update_contents_scale_x_(0.f),
18 last_update_contents_scale_y_(0.f) {} 18 last_update_contents_scale_y_(0.f) {}
19 19
20 ContentsScalingLayer::~ContentsScalingLayer() { 20 ContentsScalingLayer::~ContentsScalingLayer() {
21 } 21 }
22 22
23 void ContentsScalingLayer::CalculateContentsScale( 23 void ContentsScalingLayer::CalculateContentsScale(
24 float ideal_contents_scale, 24 float ideal_contents_scale,
25 float device_scale_factor,
26 float page_scale_factor,
27 float maximum_animation_contents_scale,
28 bool animating_transform_to_screen,
29 float* contents_scale_x, 25 float* contents_scale_x,
30 float* contents_scale_y, 26 float* contents_scale_y,
31 gfx::Size* content_bounds) { 27 gfx::Size* content_bounds) {
32 *contents_scale_x = ideal_contents_scale; 28 *contents_scale_x = ideal_contents_scale;
33 *contents_scale_y = ideal_contents_scale; 29 *contents_scale_y = ideal_contents_scale;
34 *content_bounds = ComputeContentBoundsForScale( 30 *content_bounds = ComputeContentBoundsForScale(
35 ideal_contents_scale, 31 ideal_contents_scale,
36 ideal_contents_scale); 32 ideal_contents_scale);
37 } 33 }
38 34
39 bool ContentsScalingLayer::Update(ResourceUpdateQueue* queue, 35 bool ContentsScalingLayer::Update(ResourceUpdateQueue* queue,
40 const OcclusionTracker<Layer>* occlusion) { 36 const OcclusionTracker<Layer>* occlusion) {
41 bool updated = Layer::Update(queue, occlusion); 37 bool updated = Layer::Update(queue, occlusion);
42 38
43 if (draw_properties().contents_scale_x == last_update_contents_scale_x_ && 39 if (draw_properties().contents_scale_x == last_update_contents_scale_x_ &&
44 draw_properties().contents_scale_y == last_update_contents_scale_y_) 40 draw_properties().contents_scale_y == last_update_contents_scale_y_)
45 return updated; 41 return updated;
46 42
47 last_update_contents_scale_x_ = draw_properties().contents_scale_x; 43 last_update_contents_scale_x_ = draw_properties().contents_scale_x;
48 last_update_contents_scale_y_ = draw_properties().contents_scale_y; 44 last_update_contents_scale_y_ = draw_properties().contents_scale_y;
49 // Invalidate the whole layer if scale changed. 45 // Invalidate the whole layer if scale changed.
50 SetNeedsDisplayRect(gfx::Rect(paint_properties().bounds)); 46 SetNeedsDisplayRect(gfx::Rect(paint_properties().bounds));
51 return updated; 47 return updated;
52 } 48 }
53 49
54 } // namespace cc 50 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/contents_scaling_layer.h ('k') | cc/layers/image_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698