Index: cc/LayerTextureSubImage.h |
diff --git a/cc/LayerTextureSubImage.h b/cc/LayerTextureSubImage.h |
index 2c6cc14744430bf68e3ed2924d8051eefd40d1e1..3efbf6a807cbcd3cb9497cadc252950b6f9ff248 100644 |
--- a/cc/LayerTextureSubImage.h |
+++ b/cc/LayerTextureSubImage.h |
@@ -1,46 +1,6 @@ |
-// Copyright 2011 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 LayerTextureSubImage_h |
-#define LayerTextureSubImage_h |
- |
-#if USE(ACCELERATED_COMPOSITING) |
- |
-#include "GraphicsTypes3D.h" |
-#include "IntRect.h" |
-#include "IntSize.h" |
-#include <wtf/OwnArrayPtr.h> |
- |
-namespace WebKit { |
-class WebGraphicsContext3D; |
-} |
- |
-namespace cc { |
- |
-class LayerTextureSubImage { |
-public: |
- explicit LayerTextureSubImage(bool useMapSubForUpload); |
- ~LayerTextureSubImage(); |
- |
- void upload(const uint8_t* image, const IntRect& imageRect, |
- const IntRect& sourceRect, const IntSize& destOffset, |
- GC3Denum format, WebKit::WebGraphicsContext3D*); |
- |
-private: |
- void uploadWithTexSubImage(const uint8_t* image, const IntRect& imageRect, |
- const IntRect& sourceRect, const IntSize& destOffset, |
- GC3Denum format, WebKit::WebGraphicsContext3D*); |
- void uploadWithMapTexSubImage(const uint8_t* image, const IntRect& imageRect, |
- const IntRect& sourceRect, const IntSize& destOffset, |
- GC3Denum format, WebKit::WebGraphicsContext3D*); |
- |
- bool m_useMapTexSubImage; |
- size_t m_subImageSize; |
- OwnArrayPtr<uint8_t> m_subImage; |
-}; |
- |
-} // namespace cc |
-#endif // USE(ACCELERATED_COMPOSITING) |
-#endif // LayerTextureSubImage_h |
+// Temporary forwarding header |
+#include "cc/layer_texture_sub_image.h" |