Move remained platform tests from web/tests/ to platform/

Move GraphicsLayerTest, ImageLayerChromiumTest,
OpaqueRectTrackingContentLayerDelegateTest, FilterOperationsTest,
ImageFilterBuilderTest, and WEBPImageDecoderTest.

BUG=353585

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

git-svn-id: svn://svn.chromium.org/blink/trunk@170681 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 9e3beaee
...@@ -880,6 +880,7 @@ ...@@ -880,6 +880,7 @@
'SharedBufferTest.cpp', 'SharedBufferTest.cpp',
'TestingPlatformSupport.cpp', 'TestingPlatformSupport.cpp',
'TestingPlatformSupport.h', 'TestingPlatformSupport.h',
'animation/TimingFunctionTest.cpp',
'animation/UnitBezierTest.cpp', 'animation/UnitBezierTest.cpp',
'clipboard/ClipboardUtilitiesTest.cpp', 'clipboard/ClipboardUtilitiesTest.cpp',
'fonts/FontCacheTest.cpp', 'fonts/FontCacheTest.cpp',
...@@ -892,6 +893,9 @@ ...@@ -892,6 +893,9 @@
'geometry/RoundedRectTest.cpp', 'geometry/RoundedRectTest.cpp',
'graphics/GraphicsContextTest.cpp', 'graphics/GraphicsContextTest.cpp',
'graphics/ThreadSafeDataTransportTest.cpp', 'graphics/ThreadSafeDataTransportTest.cpp',
'graphics/filters/FilterOperationsTest.cpp',
'graphics/filters/ImageFilterBuilderTest.cpp',
'graphics/gpu/DrawingBufferTest.cpp',
'graphics/test/MockDiscardablePixelRef.h', 'graphics/test/MockDiscardablePixelRef.h',
'image-decoders/ImageDecoderTest.cpp', 'image-decoders/ImageDecoderTest.cpp',
'testing/ArenaTestHelpers.h', 'testing/ArenaTestHelpers.h',
...@@ -909,18 +913,20 @@ ...@@ -909,18 +913,20 @@
], ],
# 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',
'graphics/BitmapImageTest.cpp', 'graphics/BitmapImageTest.cpp',
'graphics/Canvas2DLayerBridgeTest.cpp', 'graphics/Canvas2DLayerBridgeTest.cpp',
'graphics/Canvas2DLayerManagerTest.cpp', 'graphics/Canvas2DLayerManagerTest.cpp',
'graphics/DeferredImageDecoderTest.cpp', 'graphics/DeferredImageDecoderTest.cpp',
'graphics/GraphicsLayerTest.cpp',
'graphics/ImageDecodingStoreTest.cpp', 'graphics/ImageDecodingStoreTest.cpp',
'graphics/ImageFrameGeneratorTest.cpp', 'graphics/ImageFrameGeneratorTest.cpp',
'graphics/gpu/DrawingBufferTest.cpp', 'graphics/ImageLayerChromiumTest.cpp',
'graphics/OpaqueRectTrackingContentLayerDelegateTest.cpp',
'graphics/test/MockImageDecoder.h', 'graphics/test/MockImageDecoder.h',
'graphics/test/MockWebGraphicsContext3D.h', 'graphics/test/MockWebGraphicsContext3D.h',
'image-decoders/gif/GIFImageDecoderTest.cpp', 'image-decoders/gif/GIFImageDecoderTest.cpp',
'image-decoders/jpeg/JPEGImageDecoderTest.cpp', 'image-decoders/jpeg/JPEGImageDecoderTest.cpp',
'image-decoders/webp/WEBPImageDecoderTest.cpp',
], ],
}, },
} }
...@@ -30,9 +30,6 @@ ...@@ -30,9 +30,6 @@
#include "platform/transforms/Matrix3DTransformOperation.h" #include "platform/transforms/Matrix3DTransformOperation.h"
#include "platform/transforms/RotateTransformOperation.h" #include "platform/transforms/RotateTransformOperation.h"
#include "platform/transforms/TranslateTransformOperation.h" #include "platform/transforms/TranslateTransformOperation.h"
#include "wtf/PassOwnPtr.h"
#include <gtest/gtest.h>
#include "public/platform/Platform.h" #include "public/platform/Platform.h"
#include "public/platform/WebCompositorSupport.h" #include "public/platform/WebCompositorSupport.h"
#include "public/platform/WebFloatAnimationCurve.h" #include "public/platform/WebFloatAnimationCurve.h"
...@@ -40,6 +37,9 @@ ...@@ -40,6 +37,9 @@
#include "public/platform/WebLayer.h" #include "public/platform/WebLayer.h"
#include "public/platform/WebLayerTreeView.h" #include "public/platform/WebLayerTreeView.h"
#include "public/platform/WebUnitTestSupport.h" #include "public/platform/WebUnitTestSupport.h"
#include "wtf/PassOwnPtr.h"
#include <gtest/gtest.h>
using namespace WebCore; using namespace WebCore;
using namespace blink; using namespace blink;
......
...@@ -23,20 +23,21 @@ ...@@ -23,20 +23,21 @@
*/ */
#include "config.h" #include "config.h"
#include "platform/graphics/Image.h"
#include <gtest/gtest.h>
#include "platform/graphics/GraphicsLayer.h" #include "platform/graphics/GraphicsLayer.h"
#include "platform/graphics/Image.h"
#include "platform/graphics/skia/NativeImageSkia.h" #include "platform/graphics/skia/NativeImageSkia.h"
#include "public/platform/WebImageLayer.h" #include "public/platform/WebImageLayer.h"
#include "wtf/PassOwnPtr.h" #include "wtf/PassOwnPtr.h"
#include <gtest/gtest.h>
using namespace WebCore; using namespace WebCore;
namespace { namespace {
class MockGraphicsLayerClient : public GraphicsLayerClient { class MockGraphicsLayerClient : public GraphicsLayerClient {
public: public:
virtual void notifyAnimationStarted(const GraphicsLayer*, double monotonicTime) OVERRIDE { } virtual void notifyAnimationStarted(const GraphicsLayer*, double monotonicTime) OVERRIDE { }
virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect& inClip) OVERRIDE { } virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect& inClip) OVERRIDE { }
virtual String debugName(const GraphicsLayer*) OVERRIDE { return String(); } virtual String debugName(const GraphicsLayer*) OVERRIDE { return String(); }
......
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
#include "platform/geometry/IntRect.h" #include "platform/geometry/IntRect.h"
#include "platform/graphics/Color.h" #include "platform/graphics/Color.h"
#include "platform/graphics/GraphicsContext.h" #include "platform/graphics/GraphicsContext.h"
#include "skia/ext/platform_canvas.h"
#include "public/platform/WebFloatRect.h" #include "public/platform/WebFloatRect.h"
#include "public/platform/WebRect.h" #include "public/platform/WebRect.h"
#include "skia/ext/platform_canvas.h"
#include <gtest/gtest.h> #include <gtest/gtest.h>
...@@ -54,7 +54,7 @@ public: ...@@ -54,7 +54,7 @@ public:
m_callback(context, contentRect); m_callback(context, contentRect);
} }
private: private:
PaintCallback& m_callback; PaintCallback& m_callback;
}; };
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
#include "platform/graphics/filters/FEMerge.h" #include "platform/graphics/filters/FEMerge.h"
#include "platform/graphics/filters/FilterOperations.h" #include "platform/graphics/filters/FilterOperations.h"
#include "platform/graphics/filters/ReferenceFilter.h" #include "platform/graphics/filters/ReferenceFilter.h"
#include "platform/graphics/filters/SourceGraphic.h"
#include "platform/graphics/filters/SkiaImageFilterBuilder.h" #include "platform/graphics/filters/SkiaImageFilterBuilder.h"
#include "platform/graphics/filters/SourceGraphic.h"
#include <gtest/gtest.h> #include <gtest/gtest.h>
using testing::Test; using testing::Test;
......
...@@ -271,19 +271,14 @@ ...@@ -271,19 +271,14 @@
'tests/DragImageTest.cpp', 'tests/DragImageTest.cpp',
'tests/FakeWebPlugin.cpp', 'tests/FakeWebPlugin.cpp',
'tests/FakeWebPlugin.h', 'tests/FakeWebPlugin.h',
'tests/FilterOperationsTest.cpp',
'tests/FrameLoaderClientImplTest.cpp', 'tests/FrameLoaderClientImplTest.cpp',
'tests/FrameTestHelpers.cpp', 'tests/FrameTestHelpers.cpp',
'tests/FrameTestHelpers.h', 'tests/FrameTestHelpers.h',
'tests/GraphicsLayerTest.cpp',
'tests/ImageFilterBuilderTest.cpp',
'tests/ImageLayerChromiumTest.cpp',
'tests/KeyboardTest.cpp', 'tests/KeyboardTest.cpp',
'tests/LinkHighlightTest.cpp', 'tests/LinkHighlightTest.cpp',
'tests/ListenerLeakTest.cpp', 'tests/ListenerLeakTest.cpp',
'tests/MemoryInfo.cpp', 'tests/MemoryInfo.cpp',
'tests/MHTMLTest.cpp', 'tests/MHTMLTest.cpp',
'tests/OpaqueRectTrackingContentLayerDelegateTest.cpp',
'tests/OpenTypeVerticalDataTest.cpp', 'tests/OpenTypeVerticalDataTest.cpp',
'tests/PageSerializerTest.cpp', 'tests/PageSerializerTest.cpp',
'tests/PaintAggregatorTest.cpp', 'tests/PaintAggregatorTest.cpp',
...@@ -304,7 +299,6 @@ ...@@ -304,7 +299,6 @@
'tests/WebImageTest.cpp', 'tests/WebImageTest.cpp',
'tests/WebInputEventConversionTest.cpp', 'tests/WebInputEventConversionTest.cpp',
'tests/WebInputEventFactoryTestMac.mm', 'tests/WebInputEventFactoryTestMac.mm',
'tests/WEBPImageDecoderTest.cpp',
'tests/WebPageNewSerializerTest.cpp', 'tests/WebPageNewSerializerTest.cpp',
'tests/WebPageSerializerTest.cpp', 'tests/WebPageSerializerTest.cpp',
'tests/WebPluginContainerTest.cpp', 'tests/WebPluginContainerTest.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