Cleanup SurfaceVisibility code.

cc/output/gl_renderer_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/output/gl_renderer.h"
 
 #include <set>
 
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 829 matching lines @@
       .Times(1);
   EXPECT_CALL(*context, clear(_)).Times(AnyNumber());
   renderer.DrawFrame(&render_passes_in_draw_order_,
                      1.f,
                      viewport_rect,
                      viewport_rect,
                      false);
   Mock::VerifyAndClearExpectations(context);
 }
 
-class VisibilityChangeIsLastCallTrackingContext
-    : public TestWebGraphicsContext3D {
- public:
-  VisibilityChangeIsLastCallTrackingContext()
-      : last_call_was_set_visibility_(false) {}
-
-  // TestWebGraphicsContext3D methods.
-  void flush() override { last_call_was_set_visibility_ = false; }
-  void deleteTexture(GLuint) override { last_call_was_set_visibility_ = false; }
-  void deleteFramebuffer(GLuint) override {
-    last_call_was_set_visibility_ = false;
-  }
-  void deleteQueryEXT(GLuint) override {
-    last_call_was_set_visibility_ = false;
-  }
-  void deleteRenderbuffer(GLuint) override {
-    last_call_was_set_visibility_ = false;
-  }
-
-  // Methods added for test.
-  void set_last_call_was_visibility(bool visible) {
-    DCHECK(last_call_was_set_visibility_ == false);
-    last_call_was_set_visibility_ = true;
-  }
-  bool last_call_was_set_visibility() const {
-    return last_call_was_set_visibility_;
-  }
-
- private:
-  bool last_call_was_set_visibility_;
-};
-
-TEST_F(GLRendererTest, VisibilityChangeIsLastCall) {
-  scoped_ptr<VisibilityChangeIsLastCallTrackingContext> context_owned(
-      new VisibilityChangeIsLastCallTrackingContext);
-  VisibilityChangeIsLastCallTrackingContext* context = context_owned.get();
-
-  scoped_refptr<TestContextProvider> provider =
-      TestContextProvider::Create(context_owned.Pass());
-
-  provider->support()->SetSurfaceVisibleCallback(base::Bind(
-      &VisibilityChangeIsLastCallTrackingContext::set_last_call_was_visibility,
-      base::Unretained(context)));
-
-  FakeOutputSurfaceClient output_surface_client;
-  scoped_ptr<OutputSurface> output_surface(
-      FakeOutputSurface::Create3d(provider));
-  CHECK(output_surface->BindToClient(&output_surface_client));
-
-  scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
-      new TestSharedBitmapManager());
-  scoped_ptr<ResourceProvider> resource_provider = FakeResourceProvider::Create(
-      output_surface.get(), shared_bitmap_manager.get());
-
-  RendererSettings settings;
-  FakeRendererClient renderer_client;
-  FakeRendererGL renderer(&renderer_client,
-                          &settings,
-                          output_surface.get(),
-                          resource_provider.get());
-
-  gfx::Rect viewport_rect(1, 1);
-  AddRenderPass(&render_passes_in_draw_order_,
-                RenderPassId(1, 0),
-                viewport_rect,
-                gfx::Transform());
-
-  // Ensure that the call to SetSurfaceVisible is the last call issue to the
-  // GPU process, after glFlush is called, and after the RendererClient's
-  // SetManagedMemoryPolicy is called. Plumb this tracking between both the
-  // RenderClient and the Context by giving them both a pointer to a variable on
-  // the stack.
-  renderer.SetVisible(true);
-  renderer.DrawFrame(&render_passes_in_draw_order_,
-                     1.f,
-                     viewport_rect,
-                     viewport_rect,
-                     false);
-  renderer.SetVisible(false);
-  EXPECT_TRUE(context->last_call_was_set_visibility());
-}
-
 class TextureStateTrackingContext : public TestWebGraphicsContext3D {
  public:
   TextureStateTrackingContext() : active_texture_(GL_INVALID_ENUM) {
     test_capabilities_.gpu.egl_image_external = true;
   }
 
   MOCK_METHOD1(waitSyncToken, void(const GLbyte* sync_token));
   MOCK_METHOD3(texParameteri, void(GLenum target, GLenum pname, GLint param));
   MOCK_METHOD4(drawElements,
                void(GLenum mode, GLsizei count, GLenum type, GLintptr offset));
@@ skipping 1289 matching lines @@
   EXPECT_CALL(overlay_scheduler,
               Schedule(1, gfx::OVERLAY_TRANSFORM_NONE, _, viewport_rect,
                        BoundingRect(uv_top_left, uv_bottom_right))).Times(1);
 
   renderer.DrawFrame(&render_passes_in_draw_order_, 1.f, viewport_rect,
                      viewport_rect, false);
 }
 
 }  // namespace
 }  // namespace cc