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..43b60a88c1a9e690e67a79900ff601fe6958c5e6 100644 |
--- a/cc/layer_tree_host_unittest.cc |
+++ b/cc/layer_tree_host_unittest.cc |
@@ -7,8 +7,8 @@ |
#include "base/synchronization/lock.h" |
#include "cc/content_layer.h" |
#include "cc/content_layer_client.h" |
-#include "cc/graphics_context.h" |
#include "cc/layer_tree_host_impl.h" |
+#include "cc/output_surface.h" |
#include "cc/single_thread_proxy.h" |
#include "cc/test/fake_content_layer_client.h" |
#include "cc/test/fake_web_compositor_output_surface.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->outputSurface()->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->outputSurface()->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->outputSurface()->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->outputSurface()->context3D()); |
// Number of textures used for drawing should two except for frame 4 |
// where the viewport only contains one layer. |
@@ -1956,7 +1956,7 @@ public: |
SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestManySurfaces) |
-// A loseContext(1) should lead to a didRecreateOutputSurface(true) |
+// A loseOutputSurface(1) should lead to a didRecreateOutputSurface(true) |
class LayerTreeHostTestSetSingleLostContext : public LayerTreeHostTest { |
public: |
LayerTreeHostTestSetSingleLostContext() |
@@ -1970,7 +1970,7 @@ public: |
virtual void didCommitAndDrawFrame() OVERRIDE |
{ |
- m_layerTreeHost->loseContext(1); |
+ m_layerTreeHost->loseOutputSurface(1); |
} |
virtual void didRecreateOutputSurface(bool succeeded) OVERRIDE |
@@ -1989,7 +1989,7 @@ TEST_F(LayerTreeHostTestSetSingleLostContext, runMultiThread) |
runTest(true); |
} |
-// A loseContext(10) should lead to a didRecreateOutputSurface(false), and |
+// A loseOutputSurface(10) should lead to a didRecreateOutputSurface(false), and |
// a finishAllRendering() should not hang. |
class LayerTreeHostTestSetRepeatedLostContext : public LayerTreeHostTest { |
public: |
@@ -2004,7 +2004,7 @@ public: |
virtual void didCommitAndDrawFrame() OVERRIDE |
{ |
- m_layerTreeHost->loseContext(10); |
+ m_layerTreeHost->loseOutputSurface(10); |
} |
virtual void didRecreateOutputSurface(bool succeeded) OVERRIDE |
@@ -2878,7 +2878,7 @@ public: |
EXPECT_TRUE(m_layer->haveBackingTexture()); |
m_layerTreeHost->setVisible(false); |
postEvictTextures(); |
- m_layerTreeHost->loseContext(1); |
+ m_layerTreeHost->loseOutputSurface(1); |
m_layerTreeHost->setVisible(true); |
break; |
default: |