| Index: cc/layers/tiled_layer.h
|
| diff --git a/cc/layers/tiled_layer.h b/cc/layers/tiled_layer.h
|
| index 51afed2ef131189638980f8d428251531a9c0824..3870d69956be32326fc14e228241d7a66e3e9d02 100644
|
| --- a/cc/layers/tiled_layer.h
|
| +++ b/cc/layers/tiled_layer.h
|
| @@ -8,6 +8,7 @@
|
| #include "cc/base/cc_export.h"
|
| #include "cc/layers/contents_scaling_layer.h"
|
| #include "cc/resources/layer_tiling_data.h"
|
| +#include "cc/resources/resource_format.h"
|
|
|
| namespace cc {
|
| class LayerUpdater;
|
| @@ -45,7 +46,7 @@ class CC_EXPORT TiledLayer : public ContentsScalingLayer {
|
|
|
| // Exposed to subclasses for testing.
|
| void SetTileSize(gfx::Size size);
|
| - void SetTextureFormat(unsigned texture_format) {
|
| + void SetTextureFormat(ResourceFormat texture_format) {
|
| texture_format_ = texture_format;
|
| }
|
| void SetBorderTexelOption(LayerTilingData::BorderTexelOption option);
|
| @@ -120,7 +121,7 @@ class CC_EXPORT TiledLayer : public ContentsScalingLayer {
|
|
|
| bool IsSmallAnimatedLayer() const;
|
|
|
| - unsigned texture_format_;
|
| + ResourceFormat texture_format_;
|
| bool skips_draw_;
|
| bool failed_update_;
|
|
|
|
|