Index: cc/ImageLayerChromium.h |
diff --git a/cc/ImageLayerChromium.h b/cc/ImageLayerChromium.h |
index 12ac39716b844604a86b3c0e88164fec8baff696..7b7e0c79c11bc2b3812780b03c11d75b24f321d5 100644 |
--- a/cc/ImageLayerChromium.h |
+++ b/cc/ImageLayerChromium.h |
@@ -1,48 +1,6 @@ |
-// Copyright 2010 The Chromium Authors. All rights reserved. |
+// Copyright 2012 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
- |
-#ifndef ImageLayerChromium_h |
-#define ImageLayerChromium_h |
- |
-#if USE(ACCELERATED_COMPOSITING) |
- |
-#include "ContentLayerChromium.h" |
-#include "SkBitmap.h" |
- |
-namespace cc { |
- |
-class ImageLayerTextureUpdater; |
- |
-// A Layer that contains only an Image element. |
-class ImageLayerChromium : public TiledLayerChromium { |
-public: |
- static scoped_refptr<ImageLayerChromium> create(); |
- |
- virtual bool drawsContent() const OVERRIDE; |
- virtual void setTexturePriorities(const CCPriorityCalculator&) OVERRIDE; |
- virtual void update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&) OVERRIDE; |
- virtual bool needsContentsScale() const OVERRIDE; |
- |
- void setBitmap(const SkBitmap& image); |
- |
-private: |
- ImageLayerChromium(); |
- virtual ~ImageLayerChromium(); |
- |
- void setTilingOption(TilingOption); |
- |
- virtual LayerTextureUpdater* textureUpdater() const OVERRIDE; |
- virtual void createTextureUpdaterIfNeeded() OVERRIDE; |
- virtual IntSize contentBounds() const OVERRIDE; |
- |
- SkBitmap m_bitmap; |
- |
- RefPtr<ImageLayerTextureUpdater> m_textureUpdater; |
-}; |
- |
-} |
-#endif // USE(ACCELERATED_COMPOSITING) |
- |
-#endif |
+// Temporary forwarding header |
+#include "cc/image_layer.h" |