Move WebGraphicsContext3D related tests from web/tests/ to platform/graphics/gpu/

Move Canvas2DLayerBridgeTest.cpp, Canvas2DLayerManagerTest.cpp and
DrawingBufferTest.cpp.

BUG=353585

Review URL: https://codereview.chromium.org/203513002

git-svn-id: svn://svn.chromium.org/blink/trunk@169474 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 774fd756
...@@ -913,10 +913,14 @@ ...@@ -913,10 +913,14 @@
# NOTE: these are legacy unit tests, do not add more! # NOTE: these are legacy unit tests, do not add more!
'platform_web_unittest_files': [ 'platform_web_unittest_files': [
'animation/TimingFunctionTest.cpp', 'animation/TimingFunctionTest.cpp',
'graphics/Canvas2DLayerBridgeTest.cpp',
'graphics/Canvas2DLayerManagerTest.cpp',
'graphics/DeferredImageDecoderTest.cpp', 'graphics/DeferredImageDecoderTest.cpp',
'graphics/ImageDecodingStoreTest.cpp', 'graphics/ImageDecodingStoreTest.cpp',
'graphics/ImageFrameGeneratorTest.cpp', 'graphics/ImageFrameGeneratorTest.cpp',
'graphics/gpu/DrawingBufferTest.cpp',
'graphics/test/MockImageDecoder.h', 'graphics/test/MockImageDecoder.h',
'graphics/test/MockWebGraphicsContext3D.h',
], ],
}, },
} }
...@@ -29,12 +29,12 @@ ...@@ -29,12 +29,12 @@
#include "SkDeferredCanvas.h" #include "SkDeferredCanvas.h"
#include "SkSurface.h" #include "SkSurface.h"
#include "platform/graphics/ImageBuffer.h" #include "platform/graphics/ImageBuffer.h"
#include "platform/graphics/test/MockWebGraphicsContext3D.h"
#include "public/platform/Platform.h" #include "public/platform/Platform.h"
#include "public/platform/WebExternalBitmap.h" #include "public/platform/WebExternalBitmap.h"
#include "public/platform/WebGraphicsContext3DProvider.h" #include "public/platform/WebGraphicsContext3DProvider.h"
#include "public/platform/WebThread.h" #include "public/platform/WebThread.h"
#include "third_party/skia/include/core/SkDevice.h" #include "third_party/skia/include/core/SkDevice.h"
#include "web/tests/MockWebGraphicsContext3D.h"
#include "wtf/RefPtr.h" #include "wtf/RefPtr.h"
#include <gmock/gmock.h> #include <gmock/gmock.h>
......
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
#include "SkDevice.h" #include "SkDevice.h"
#include "SkSurface.h" #include "SkSurface.h"
#include "platform/graphics/test/MockWebGraphicsContext3D.h"
#include "public/platform/Platform.h" #include "public/platform/Platform.h"
#include "public/platform/WebGraphicsContext3DProvider.h" #include "public/platform/WebGraphicsContext3DProvider.h"
#include "public/platform/WebThread.h" #include "public/platform/WebThread.h"
#include "web/tests/MockWebGraphicsContext3D.h"
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
......
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
#include "platform/graphics/ImageBuffer.h" #include "platform/graphics/ImageBuffer.h"
#include "platform/graphics/UnacceleratedImageBufferSurface.h" #include "platform/graphics/UnacceleratedImageBufferSurface.h"
#include "platform/graphics/test/MockWebGraphicsContext3D.h"
#include "public/platform/Platform.h" #include "public/platform/Platform.h"
#include "public/platform/WebExternalTextureMailbox.h" #include "public/platform/WebExternalTextureMailbox.h"
#include "web/tests/MockWebGraphicsContext3D.h"
#include "wtf/RefPtr.h" #include "wtf/RefPtr.h"
#include <gmock/gmock.h> #include <gmock/gmock.h>
...@@ -105,8 +105,6 @@ static const int initialWidth = 100; ...@@ -105,8 +105,6 @@ static const int initialWidth = 100;
static const int initialHeight = 100; static const int initialHeight = 100;
static const int alternateHeight = 50; static const int alternateHeight = 50;
} // namespace
class DrawingBufferTest : public Test { class DrawingBufferTest : public Test {
protected: protected:
virtual void SetUp() virtual void SetUp()
...@@ -125,8 +123,6 @@ protected: ...@@ -125,8 +123,6 @@ protected:
RefPtr<DrawingBuffer> m_drawingBuffer; RefPtr<DrawingBuffer> m_drawingBuffer;
}; };
namespace {
TEST_F(DrawingBufferTest, testPaintRenderingResultsToCanvas) TEST_F(DrawingBufferTest, testPaintRenderingResultsToCanvas)
{ {
OwnPtr<ImageBufferSurface> imageBufferSurface = adoptPtr(new UnacceleratedImageBufferSurface(IntSize(initialWidth, initialHeight))); OwnPtr<ImageBufferSurface> imageBufferSurface = adoptPtr(new UnacceleratedImageBufferSurface(IntSize(initialWidth, initialHeight)));
......
...@@ -261,13 +261,10 @@ ...@@ -261,13 +261,10 @@
'web_unittest_files': [ 'web_unittest_files': [
'tests/AssociatedURLLoaderTest.cpp', 'tests/AssociatedURLLoaderTest.cpp',
'tests/BitmapImageTest.cpp', 'tests/BitmapImageTest.cpp',
'tests/Canvas2DLayerBridgeTest.cpp',
'tests/Canvas2DLayerManagerTest.cpp',
'tests/ChromeClientImplTest.cpp', 'tests/ChromeClientImplTest.cpp',
'tests/CompositedLayerMappingTest.cpp', 'tests/CompositedLayerMappingTest.cpp',
'tests/CustomEventTest.cpp', 'tests/CustomEventTest.cpp',
'tests/DragImageTest.cpp', 'tests/DragImageTest.cpp',
'tests/DrawingBufferTest.cpp',
'tests/FakeWebPlugin.cpp', 'tests/FakeWebPlugin.cpp',
'tests/FakeWebPlugin.h', 'tests/FakeWebPlugin.h',
'tests/FilterOperationsTest.cpp', 'tests/FilterOperationsTest.cpp',
...@@ -284,7 +281,6 @@ ...@@ -284,7 +281,6 @@
'tests/LinkHighlightTest.cpp', 'tests/LinkHighlightTest.cpp',
'tests/ListenerLeakTest.cpp', 'tests/ListenerLeakTest.cpp',
'tests/MemoryInfo.cpp', 'tests/MemoryInfo.cpp',
'tests/MockWebGraphicsContext3D.h',
'tests/OpaqueRectTrackingContentLayerDelegateTest.cpp', 'tests/OpaqueRectTrackingContentLayerDelegateTest.cpp',
'tests/OpenTypeVerticalDataTest.cpp', 'tests/OpenTypeVerticalDataTest.cpp',
'tests/PageSerializerTest.cpp', 'tests/PageSerializerTest.cpp',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment