| Index: cc/tiled_layer.h
|
| diff --git a/cc/tiled_layer.h b/cc/tiled_layer.h
|
| index e09780cbe18b8a1933fad80b756c4e3dccab13ad..95fb84379782c037290a952f06ce4a3b2b8d3cae 100644
|
| --- a/cc/tiled_layer.h
|
| +++ b/cc/tiled_layer.h
|
| @@ -8,9 +8,11 @@
|
| #include "cc/cc_export.h"
|
| #include "cc/contents_scaling_layer.h"
|
| #include "cc/layer_tiling_data.h"
|
| -#include "cc/layer_updater.h"
|
|
|
| namespace cc {
|
| +class LayerUpdater;
|
| +class PrioritizedResourceManager;
|
| +class PrioritizedResource;
|
| class UpdatableTile;
|
|
|
| class CC_EXPORT TiledLayer : public ContentsScalingLayer {
|
| @@ -44,7 +46,7 @@ protected:
|
|
|
| // Exposed to subclasses for testing.
|
| void setTileSize(const gfx::Size&);
|
| - void setTextureFormat(GLenum textureFormat) { m_textureFormat = textureFormat; }
|
| + void setTextureFormat(unsigned textureFormat) { m_textureFormat = textureFormat; }
|
| void setBorderTexelOption(LayerTilingData::BorderTexelOption);
|
| size_t numPaintedTiles() { return m_tiler->tiles().size(); }
|
|
|
| @@ -90,7 +92,7 @@ private:
|
|
|
| bool isSmallAnimatedLayer() const;
|
|
|
| - GLenum m_textureFormat;
|
| + unsigned m_textureFormat;
|
| bool m_skipsDraw;
|
| bool m_failedUpdate;
|
|
|
|
|