Index: cc/layer_tree_host_unittest.cc |
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc |
index 41744911e8c1e6414d4d0205f2add1044be15241..ba83f3763a24c14417cf5eb6c8c0303e87a48026 100644 |
--- a/cc/layer_tree_host_unittest.cc |
+++ b/cc/layer_tree_host_unittest.cc |
@@ -30,9 +30,6 @@ |
#include <public/WebLayerScrollClient.h> |
#include <public/WebSize.h> |
-using namespace WebKit; |
-using namespace WebKitTests; |
- |
namespace cc { |
namespace { |
@@ -1858,8 +1855,8 @@ public: |
setTestLayerPropertiesForTesting(child2.get(), rootLayer.get(), identityMatrix, gfx::PointF(0, 0), gfx::PointF(10, 70), gfx::Size(500, 500), true); |
{ |
- WebFilterOperations filters; |
- filters.append(WebFilterOperation::createOpacityFilter(0.5)); |
+ WebKit::WebFilterOperations filters; |
+ filters.append(WebKit::WebFilterOperation::createOpacityFilter(0.5)); |
child->setFilters(filters); |
} |
@@ -1883,8 +1880,8 @@ public: |
setTestLayerPropertiesForTesting(child2.get(), rootLayer.get(), identityMatrix, gfx::PointF(0, 0), gfx::PointF(10, 70), gfx::Size(500, 500), true); |
{ |
- WebFilterOperations filters; |
- filters.append(WebFilterOperation::createBlurFilter(10)); |
+ WebKit::WebFilterOperations filters; |
+ filters.append(WebKit::WebFilterOperation::createBlurFilter(10)); |
child->setFilters(filters); |
} |
@@ -2183,7 +2180,7 @@ private: |
SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestLayerAddedWithAnimation) |
-class LayerTreeHostTestScrollChildLayer : public LayerTreeHostTest, public WebLayerScrollClient { |
+class LayerTreeHostTestScrollChildLayer : public LayerTreeHostTest, public WebKit::WebLayerScrollClient { |
public: |
LayerTreeHostTestScrollChildLayer(float deviceScaleFactor) |
: m_deviceScaleFactor(deviceScaleFactor) |
@@ -2924,7 +2921,7 @@ private: |
SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestLostContextAfterEvictTextures) |
-class CompositorFakeWebGraphicsContext3DWithEndQueryCausingLostContext : public WebKit::CompositorFakeWebGraphicsContext3D { |
+class CompositorFakeWebGraphicsContext3DWithEndQueryCausingLostContext : public CompositorFakeWebGraphicsContext3D { |
public: |
static scoped_ptr<CompositorFakeWebGraphicsContext3DWithEndQueryCausingLostContext> create(Attributes attrs) |
{ |
@@ -2934,8 +2931,8 @@ public: |
virtual void setContextLostCallback(WebGraphicsContextLostCallback* callback) { m_contextLostCallback = callback; } |
virtual bool isContextLost() { return m_isContextLost; } |
- virtual void beginQueryEXT(WGC3Denum, WebGLId) { } |
- virtual void endQueryEXT(WGC3Denum) |
+ virtual void beginQueryEXT(WebKit::WGC3Denum, WebKit::WebGLId) { } |
+ virtual void endQueryEXT(WebKit::WGC3Denum) |
{ |
// Lose context. |
if (!m_isContextLost) { |
@@ -2943,7 +2940,7 @@ public: |
m_isContextLost = true; |
} |
} |
- virtual void getQueryObjectuivEXT(WebGLId, WGC3Denum pname, WGC3Duint* params) |
+ virtual void getQueryObjectuivEXT(WebKit::WebGLId, WebKit::WGC3Denum pname, WebKit::WGC3Duint* params) |
{ |
// Context is lost. We need to behave as if result is available. |
if (pname == GL_QUERY_RESULT_AVAILABLE_EXT) |