| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 #ifndef TiledLayerChromium_h | 5 #ifndef TiledLayerChromium_h |
| 6 #define TiledLayerChromium_h | 6 #define TiledLayerChromium_h |
| 7 | 7 |
| 8 #include "cc/layer.h" | 8 #include "cc/contents_scaling_layer.h" |
| 9 #include "cc/layer_updater.h" | 9 #include "cc/layer_updater.h" |
| 10 #include "cc/layer_tiling_data.h" | 10 #include "cc/layer_tiling_data.h" |
| 11 | 11 |
| 12 namespace cc { | 12 namespace cc { |
| 13 class UpdatableTile; | 13 class UpdatableTile; |
| 14 | 14 |
| 15 class TiledLayer : public Layer { | 15 class TiledLayer : public ContentsScalingLayer { |
| 16 public: | 16 public: |
| 17 enum TilingOption { AlwaysTile, NeverTile, AutoTile }; | 17 enum TilingOption { AlwaysTile, NeverTile, AutoTile }; |
| 18 | 18 |
| 19 virtual void setIsMask(bool) OVERRIDE; | 19 virtual void setIsMask(bool) OVERRIDE; |
| 20 | 20 |
| 21 virtual void pushPropertiesTo(LayerImpl*) OVERRIDE; | 21 virtual void pushPropertiesTo(LayerImpl*) OVERRIDE; |
| 22 | 22 |
| 23 virtual bool drawsContent() const OVERRIDE; | 23 virtual bool drawsContent() const OVERRIDE; |
| 24 virtual bool needsContentsScale() const OVERRIDE; | |
| 25 | |
| 26 virtual IntSize contentBounds() const OVERRIDE; | |
| 27 | 24 |
| 28 virtual void setNeedsDisplayRect(const FloatRect&) OVERRIDE; | 25 virtual void setNeedsDisplayRect(const FloatRect&) OVERRIDE; |
| 29 | 26 |
| 30 virtual void setUseLCDText(bool) OVERRIDE; | 27 virtual void setUseLCDText(bool) OVERRIDE; |
| 31 | 28 |
| 32 virtual void setLayerTreeHost(LayerTreeHost*) OVERRIDE; | 29 virtual void setLayerTreeHost(LayerTreeHost*) OVERRIDE; |
| 33 | 30 |
| 34 virtual void setTexturePriorities(const PriorityCalculator&) OVERRIDE; | 31 virtual void setTexturePriorities(const PriorityCalculator&) OVERRIDE; |
| 35 | 32 |
| 36 virtual Region visibleContentOpaqueRegion() const OVERRIDE; | 33 virtual Region visibleContentOpaqueRegion() const OVERRIDE; |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 IntRect m_predictedVisibleRect; | 94 IntRect m_predictedVisibleRect; |
| 98 IntRect m_previousVisibleRect; | 95 IntRect m_previousVisibleRect; |
| 99 IntSize m_previousContentBounds; | 96 IntSize m_previousContentBounds; |
| 100 | 97 |
| 101 TilingOption m_tilingOption; | 98 TilingOption m_tilingOption; |
| 102 scoped_ptr<LayerTilingData> m_tiler; | 99 scoped_ptr<LayerTilingData> m_tiler; |
| 103 }; | 100 }; |
| 104 | 101 |
| 105 } | 102 } |
| 106 #endif | 103 #endif |
| OLD | NEW |