Index: cc/layer_tree_host_unittest.cc |
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc |
index 479138aafd1cc204db27e83ed44d49d7faf685bc..0fb459f66ecf2c1be38b0ad430123c848c7b6436 100644 |
--- a/cc/layer_tree_host_unittest.cc |
+++ b/cc/layer_tree_host_unittest.cc |
@@ -11,7 +11,7 @@ |
#include "cc/layer_tree_host_impl.h" |
#include "cc/single_thread_proxy.h" |
#include "cc/test/fake_content_layer_client.h" |
-#include "cc/test/fake_web_compositor_output_surface.h" |
+#include "cc/test/fake_output_surface.h" |
#include "cc/test/geometry_test_utils.h" |
#include "cc/test/layer_tree_test_common.h" |
#include "cc/test/occlusion_tracker_test_common.h" |
@@ -1399,7 +1399,7 @@ public: |
virtual void commitCompleteOnThread(LayerTreeHostImpl* impl) OVERRIDE |
{ |
- CompositorFakeWebGraphicsContext3DWithTextureTracking* context = static_cast<CompositorFakeWebGraphicsContext3DWithTextureTracking*>(impl->context()->context3D()); |
+ CompositorFakeWebGraphicsContext3DWithTextureTracking* context = static_cast<CompositorFakeWebGraphicsContext3DWithTextureTracking*>(impl->context()->Context3D()); |
switch (impl->sourceFrameNumber()) { |
case 0: |
@@ -1433,7 +1433,7 @@ public: |
virtual void drawLayersOnThread(LayerTreeHostImpl* impl) OVERRIDE |
{ |
- CompositorFakeWebGraphicsContext3DWithTextureTracking* context = static_cast<CompositorFakeWebGraphicsContext3DWithTextureTracking*>(impl->context()->context3D()); |
+ CompositorFakeWebGraphicsContext3DWithTextureTracking* context = static_cast<CompositorFakeWebGraphicsContext3DWithTextureTracking*>(impl->context()->Context3D()); |
// Number of textures used for draw should always be one. |
EXPECT_EQ(1, context->numUsedTextures()); |
@@ -1503,7 +1503,7 @@ public: |
virtual void commitCompleteOnThread(LayerTreeHostImpl* impl) OVERRIDE |
{ |
- CompositorFakeWebGraphicsContext3DWithTextureTracking* context = static_cast<CompositorFakeWebGraphicsContext3DWithTextureTracking*>(impl->context()->context3D()); |
+ CompositorFakeWebGraphicsContext3DWithTextureTracking* context = static_cast<CompositorFakeWebGraphicsContext3DWithTextureTracking*>(impl->context()->Context3D()); |
switch (impl->sourceFrameNumber()) { |
case 0: |
@@ -1555,7 +1555,7 @@ public: |
virtual void drawLayersOnThread(LayerTreeHostImpl* impl) OVERRIDE |
{ |
- CompositorFakeWebGraphicsContext3DWithTextureTracking* context = static_cast<CompositorFakeWebGraphicsContext3DWithTextureTracking*>(impl->context()->context3D()); |
+ CompositorFakeWebGraphicsContext3DWithTextureTracking* context = static_cast<CompositorFakeWebGraphicsContext3DWithTextureTracking*>(impl->context()->Context3D()); |
// Number of textures used for drawing should two except for frame 4 |
// where the viewport only contains one layer. |
@@ -2956,9 +2956,9 @@ public: |
m_children.push_back(ContentLayerWithUpdateTracking::create(&m_client)); |
} |
- virtual scoped_ptr<WebKit::WebCompositorOutputSurface> createOutputSurface() |
+ virtual scoped_ptr<OutputSurface> createOutputSurface() |
{ |
- return FakeWebCompositorOutputSurface::create(CompositorFakeWebGraphicsContext3DWithEndQueryCausingLostContext::create(WebGraphicsContext3D::Attributes()).PassAs<WebKit::WebGraphicsContext3D>()).PassAs<WebKit::WebCompositorOutputSurface>(); |
+ return FakeOutputSurface::Create(CompositorFakeWebGraphicsContext3DWithEndQueryCausingLostContext::create(WebGraphicsContext3D::Attributes()).PassAs<WebKit::WebGraphicsContext3D>()).PassAs<OutputSurface>(); |
} |
virtual void beginTest() |