| Index: cc/layers/ui_resource_layer.h
|
| diff --git a/cc/layers/ui_resource_layer.h b/cc/layers/ui_resource_layer.h
|
| index 69721a30faadf69435214fa85f5d7c173e06952b..b91b7e357624176167660fcd2a9128617b9f6b21 100644
|
| --- a/cc/layers/ui_resource_layer.h
|
| +++ b/cc/layers/ui_resource_layer.h
|
| @@ -7,7 +7,7 @@
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "cc/base/cc_export.h"
|
| -#include "cc/layers/layer.h"
|
| +#include "cc/layers/contents_scaling_layer.h"
|
| #include "cc/resources/ui_resource_client.h"
|
| #include "ui/gfx/rect.h"
|
|
|
| @@ -16,7 +16,7 @@ namespace cc {
|
| class LayerTreeHost;
|
| class ScopedUIResource;
|
|
|
| -class CC_EXPORT UIResourceLayer : public Layer {
|
| +class CC_EXPORT UIResourceLayer : public ContentsScalingLayer {
|
| public:
|
| static scoped_refptr<UIResourceLayer> Create();
|
|
|
| @@ -41,6 +41,14 @@ class CC_EXPORT UIResourceLayer : public Layer {
|
| float top_right,
|
| float bottom_right);
|
|
|
| + virtual void CalculateContentsScale(float ideal_contents_scale,
|
| + float device_scale_factor,
|
| + float page_scale_factor,
|
| + bool animating_transform_to_screen,
|
| + float* contents_scale_x,
|
| + float* contents_scale_y,
|
| + gfx::Size* content_bounds) OVERRIDE;
|
| +
|
| class UIResourceHolder {
|
| public:
|
| virtual UIResourceId id() = 0;
|
| @@ -63,8 +71,6 @@ class CC_EXPORT UIResourceLayer : public Layer {
|
| OVERRIDE;
|
| void RecreateUIResourceHolder();
|
|
|
| -
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(UIResourceLayer);
|
| };
|
|
|
|
|