OLD | NEW |
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 "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "cc/contents_scaling_layer.h" | 7 #include "cc/contents_scaling_layer.h" |
| 8 #include "ui/gfx/size_conversions.h" |
8 | 9 |
9 namespace cc { | 10 namespace cc { |
10 | 11 |
11 ContentsScalingLayer::ContentsScalingLayer() | 12 ContentsScalingLayer::ContentsScalingLayer() |
12 : m_contentsScale(1.0) { | 13 : m_contentsScale(1.0) { |
13 } | 14 } |
14 | 15 |
15 ContentsScalingLayer::~ContentsScalingLayer() { | 16 ContentsScalingLayer::~ContentsScalingLayer() { |
16 } | 17 } |
17 | 18 |
18 IntSize ContentsScalingLayer::contentBounds() const { | 19 gfx::Size ContentsScalingLayer::contentBounds() const { |
19 return IntSize(ceil(bounds().width() * contentsScaleX()), | 20 return gfx::ToCeiledSize(bounds().Scale(contentsScaleX(), contentsScaleY())); |
20 ceil(bounds().height() * contentsScaleY())); | |
21 } | 21 } |
22 | 22 |
23 float ContentsScalingLayer::contentsScaleX() const { | 23 float ContentsScalingLayer::contentsScaleX() const { |
24 return m_contentsScale; | 24 return m_contentsScale; |
25 } | 25 } |
26 | 26 |
27 float ContentsScalingLayer::contentsScaleY() const { | 27 float ContentsScalingLayer::contentsScaleY() const { |
28 return m_contentsScale; | 28 return m_contentsScale; |
29 } | 29 } |
30 | 30 |
31 void ContentsScalingLayer::setContentsScale(float contentsScale) { | 31 void ContentsScalingLayer::setContentsScale(float contentsScale) { |
32 if (m_contentsScale == contentsScale) | 32 if (m_contentsScale == contentsScale) |
33 return; | 33 return; |
34 m_contentsScale = contentsScale; | 34 m_contentsScale = contentsScale; |
35 setNeedsDisplay(); | 35 setNeedsDisplay(); |
36 } | 36 } |
37 | 37 |
38 } // namespace cc | 38 } // namespace cc |
OLD | NEW |