Index: cc/test/FakeWebCompositorSoftwareOutputDevice.h |
diff --git a/cc/test/FakeWebCompositorSoftwareOutputDevice.h b/cc/test/FakeWebCompositorSoftwareOutputDevice.h |
index 6a17e6871c97683dd04b348a9260b6a972f2c0d4..4d87f1c0748cb11218a09a98e2a76ac0f2ce5d67 100644 |
--- a/cc/test/FakeWebCompositorSoftwareOutputDevice.h |
+++ b/cc/test/FakeWebCompositorSoftwareOutputDevice.h |
@@ -2,43 +2,5 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef FakeWebCompositorSoftwareOutputDevice_h |
-#define FakeWebCompositorSoftwareOutputDevice_h |
- |
-#include "base/memory/scoped_ptr.h" |
-#include "SkDevice.h" |
-#include <public/WebCompositorSoftwareOutputDevice.h> |
-#include <public/WebImage.h> |
-#include <public/WebSize.h> |
- |
-namespace WebKit { |
- |
-class FakeWebCompositorSoftwareOutputDevice : public WebCompositorSoftwareOutputDevice { |
-public: |
- virtual WebImage* lock(bool forWrite) OVERRIDE |
- { |
- ASSERT(m_device.get()); |
- m_image = m_device->accessBitmap(forWrite); |
- return &m_image; |
- } |
- virtual void unlock() OVERRIDE |
- { |
- m_image.reset(); |
- } |
- |
- virtual void didChangeViewportSize(WebSize size) OVERRIDE |
- { |
- if (m_device.get() && size.width == m_device->width() && size.height == m_device->height()) |
- return; |
- |
- m_device.reset(new SkDevice(SkBitmap::kARGB_8888_Config, size.width, size.height, true)); |
- } |
- |
-private: |
- scoped_ptr<SkDevice> m_device; |
- WebImage m_image; |
-}; |
- |
-} // namespace WebKit |
- |
-#endif // FakeWebCompositorSoftwareOutputDevice_h |
+// Temporary forwarding header |
+#include "cc/test/fake_web_compositor_software_output_device.h" |