Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / graphics / GraphicsLayerTest.cpp

diff --git a/src/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp b/src/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp
index 20fefbd..df17919 100644 (file)
--- a/src/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp
+++ b/src/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp
@@ -41,7 +41,6 @@
 
 #include <gtest/gtest.h>
 
-using namespace WebCore;
 using namespace blink;
 
 namespace {
@@ -58,7 +57,7 @@ public:
     explicit GraphicsLayerForTesting(GraphicsLayerClient* client)
         : GraphicsLayer(client) { };
 
-    virtual blink::WebLayer* contentsLayer() const { return GraphicsLayer::contentsLayer(); }
+    virtual WebLayer* contentsLayer() const { return GraphicsLayer::contentsLayer(); }
 };
 
 class GraphicsLayerTest : public testing::Test {
@@ -71,12 +70,12 @@ public:
         m_graphicsLayer->platformLayer()->setScrollClipLayer(
             m_clipLayer->platformLayer());
         m_platformLayer = m_graphicsLayer->platformLayer();
-        m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeUnitTest));
+        m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting());
         ASSERT(m_layerTreeView);
         m_layerTreeView->setRootLayer(*m_clipLayer->platformLayer());
         m_layerTreeView->registerViewportLayers(
             m_clipLayer->platformLayer(), m_graphicsLayer->platformLayer(), 0);
-        m_layerTreeView->setViewportSize(WebSize(1, 1), WebSize(1, 1));
+        m_layerTreeView->setViewportSize(WebSize(1, 1));
     }
 
     virtual ~GraphicsLayerTest()
@@ -101,7 +100,7 @@ TEST_F(GraphicsLayerTest, updateLayerShouldFlattenTransformWithAnimations)
 
     OwnPtr<WebFloatAnimationCurve> curve = adoptPtr(Platform::current()->compositorSupport()->createFloatAnimationCurve());
     curve->add(WebFloatKeyframe(0.0, 0.0));
-    OwnPtr<WebAnimation> floatAnimation(adoptPtr(Platform::current()->compositorSupport()->createAnimation(*curve, WebAnimation::TargetPropertyOpacity)));
+    OwnPtr<WebCompositorAnimation> floatAnimation(adoptPtr(Platform::current()->compositorSupport()->createAnimation(*curve, WebCompositorAnimation::TargetPropertyOpacity)));
     int animationId = floatAnimation->id();
     ASSERT_TRUE(m_platformLayer->addAnimation(floatAnimation.leakPtr()));