Use IDCompositionSurface to implement DirectCompositionSurfaceWin.

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 <stdint.h>
 
 #include <set>
 #include <vector>
@@ skipping 1477 matching lines @@
 
   MOCK_METHOD0(EnsureBackbuffer, void());
   MOCK_METHOD0(DiscardBackbuffer, void());
   MOCK_METHOD5(Reshape,
                void(const gfx::Size& size,
                     float scale_factor,
                     const gfx::ColorSpace& color_space,
                     bool has_alpha,
                     bool use_stencil));
   MOCK_METHOD0(BindFramebuffer, void());
+  MOCK_METHOD1(SetDrawRectangle, void(const gfx::Rect&));
   MOCK_METHOD0(GetFramebufferCopyTextureFormat, GLenum());
   MOCK_METHOD1(SwapBuffers_, void(OutputSurfaceFrame& frame));  // NOLINT
   void SwapBuffers(OutputSurfaceFrame frame) override { SwapBuffers_(frame); }
   MOCK_CONST_METHOD0(GetOverlayCandidateValidator,
                      OverlayCandidateValidator*());
   MOCK_CONST_METHOD0(IsDisplayedAsOverlayPlane, bool());
   MOCK_CONST_METHOD0(GetOverlayTextureId, unsigned());
   MOCK_CONST_METHOD0(SurfaceIsSuspendForRecycle, bool());
   MOCK_CONST_METHOD0(HasExternalStencilTest, bool());
   MOCK_METHOD0(ApplyExternalStencil, void());
@@ skipping 347 matching lines @@
       Schedule(1, gfx::OVERLAY_TRANSFORM_NONE, _, gfx::Rect(viewport_size),
                BoundingRect(uv_top_left, uv_bottom_right)))
       .Times(1);
 
   DrawFrame(&renderer, viewport_size);
 }
 
 class PartialSwapMockGLES2Interface : public TestGLES2Interface {
  public:
   void InitializeTestContext(TestWebGraphicsContext3D* context) override {
     context->set_have_post_sub_buffer(true);

[danakj, 2017/02/23 23:38:51]

can you set_support_set_draw_rectangle here instead of using TestContext3d()? I
think this is how things will look on the way to getting rid of TestWGC3D, and
makes it consistently present for the full lifetime

   }
 
   MOCK_METHOD1(Enable, void(GLenum cap));
   MOCK_METHOD1(Disable, void(GLenum cap));
   MOCK_METHOD4(Scissor, void(GLint x, GLint y, GLsizei width, GLsizei height));
 };
 
 class GLRendererPartialSwapTest : public GLRendererTest {
  protected:
-  void RunTest(bool partial_swap) {
+  void RunTest(bool partial_swap, bool set_draw_rectangle) {
     auto gl_owned = base::MakeUnique<PartialSwapMockGLES2Interface>();
     auto* gl = gl_owned.get();
 
     auto provider = TestContextProvider::Create(std::move(gl_owned));
     provider->BindToCurrentThread();
+    provider->TestContext3d()->set_support_set_draw_rectangle(
+        set_draw_rectangle);
 
     FakeOutputSurfaceClient output_surface_client;
     std::unique_ptr<FakeOutputSurface> output_surface(
         FakeOutputSurface::Create3d(std::move(provider)));
     output_surface->BindToClient(&output_surface_client);
 
     std::unique_ptr<ResourceProvider> resource_provider =
         FakeResourceProvider::Create(output_surface->context_provider(),
                                      nullptr);
 
@@ skipping 19 matching lines @@
       EXPECT_CALL(*gl, Disable(GL_DEPTH_TEST)).InSequence(seq);
       EXPECT_CALL(*gl, Disable(GL_CULL_FACE)).InSequence(seq);
       EXPECT_CALL(*gl, Disable(GL_STENCIL_TEST)).InSequence(seq);
       EXPECT_CALL(*gl, Enable(GL_BLEND)).InSequence(seq);
       EXPECT_CALL(*gl, Disable(GL_SCISSOR_TEST)).InSequence(seq);
       EXPECT_CALL(*gl, Scissor(0, 0, 0, 0)).InSequence(seq);
 
       // Partial frame, we should use a scissor to swap only that part when
       // partial swap is enabled.
       root_pass->damage_rect = gfx::Rect(2, 2, 3, 3);
+      gfx::Rect output_rectangle =
+          partial_swap ? root_pass->damage_rect : gfx::Rect(viewport_size);
 
-      if (partial_swap) {
+      if (partial_swap || set_draw_rectangle) {
         EXPECT_CALL(*gl, Enable(GL_SCISSOR_TEST)).InSequence(seq);
         // The scissor is flipped, so subtract the y coord and height from the
         // bottom of the GL viewport.
-        EXPECT_CALL(*gl, Scissor(2, viewport_size.height() - 3 - 2, 3, 3))
+        EXPECT_CALL(
+            *gl, Scissor(output_rectangle.x(),
+                         viewport_size.height() - output_rectangle.y() -
+                             output_rectangle.height(),
+                         output_rectangle.width(), output_rectangle.height()))
             .InSequence(seq);
       }
 
       // The quad doesn't need blending.
       EXPECT_CALL(*gl, Disable(GL_BLEND)).InSequence(seq);
 
       // Blending is disabled at the end of the frame.
       EXPECT_CALL(*gl, Disable(GL_BLEND)).InSequence(seq);
 
       renderer.DecideRenderPassAllocationsForFrame(
           render_passes_in_draw_order_);
       DrawFrame(&renderer, viewport_size);
+      if (set_draw_rectangle) {
+        EXPECT_EQ(output_rectangle, output_surface->last_set_draw_rectangle());

[danakj, 2017/02/23 23:38:51]

FWIW you could mock and EXPECT the method instead of adding state+getters on
FakeOutputSurface. up to u

+      }
     }
   }
 };
 
 TEST_F(GLRendererPartialSwapTest, PartialSwap) {
-  RunTest(true);
+  RunTest(true, false);
 }
 
 TEST_F(GLRendererPartialSwapTest, NoPartialSwap) {
-  RunTest(false);
+  RunTest(false, false);
+}
+
+TEST_F(GLRendererPartialSwapTest, SetDrawRectangle) {

[danakj, 2017/02/23 23:38:51]

nit: maybe name the two test variants a bit more explicitly?
SetDrawRectangle_PartialSwap and SetDrawRectangle_NoPartialSwap?

+  RunTest(true, true);
+}
+
+TEST_F(GLRendererPartialSwapTest, SetDrawRectangleNoPartialSwap) {
+  RunTest(false, true);
 }
 
 class GLRendererWithMockContextTest : public ::testing::Test {
  protected:
   class MockContextSupport : public TestContextSupport {
    public:
     MockContextSupport() {}
     MOCK_METHOD1(SetAggressivelyFreeResources,
                  void(bool aggressively_free_resources));
   };
@@ skipping 28 matching lines @@
   renderer_->SetVisible(true);
   Mock::VerifyAndClearExpectations(context_support_ptr_);
 
   EXPECT_CALL(*context_support_ptr_, SetAggressivelyFreeResources(true));
   renderer_->SetVisible(false);
   Mock::VerifyAndClearExpectations(context_support_ptr_);
 }
 
 }  // namespace
 }  // namespace cc