cc: Make LayerTreeHostImpl unittests use a delegating output surface.

cc/test/fake_output_surface.h

 // 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.
 
 #ifndef CC_TEST_FAKE_OUTPUT_SURFACE_H_
 #define CC_TEST_FAKE_OUTPUT_SURFACE_H_
 
 #include <stddef.h>
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/managed_memory_policy.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/software_output_device.h"
 #include "cc/test/test_context_provider.h"
+#include "cc/test/test_gles2_interface.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 
 namespace cc {
 
 class FakeOutputSurface : public OutputSurface {
  public:
   ~FakeOutputSurface() override;
 
   static std::unique_ptr<FakeOutputSurface> Create3d() {
     return base::WrapUnique(
         new FakeOutputSurface(TestContextProvider::Create(),
                               TestContextProvider::CreateWorker(), false));
   }
 
   static std::unique_ptr<FakeOutputSurface> Create3d(
       scoped_refptr<ContextProvider> context_provider) {
     return base::WrapUnique(new FakeOutputSurface(
         context_provider, TestContextProvider::CreateWorker(), false));
   }
 
   static std::unique_ptr<FakeOutputSurface> Create3d(
       scoped_refptr<ContextProvider> context_provider,
       scoped_refptr<ContextProvider> worker_context_provider) {
     return base::WrapUnique(new FakeOutputSurface(
         context_provider, worker_context_provider, false));
   }
 
   static std::unique_ptr<FakeOutputSurface> Create3d(
+      std::unique_ptr<TestGLES2Interface> gl) {
+    return base::WrapUnique(

[vmpstr, 2016/07/20 01:11:22]

nit: MakeUnique here? Or keep it for consistency.

[danakj, 2016/07/20 18:57:41]

That doesnt work for Create functions where the constructors are private.

+        new FakeOutputSurface(TestContextProvider::Create(std::move(gl)),
+                              TestContextProvider::CreateWorker(), false));
+  }
+
+  static std::unique_ptr<FakeOutputSurface> Create3d(
       std::unique_ptr<TestWebGraphicsContext3D> context) {
     return base::WrapUnique(
         new FakeOutputSurface(TestContextProvider::Create(std::move(context)),
                               TestContextProvider::CreateWorker(), false));
   }
 
   static std::unique_ptr<FakeOutputSurface> CreateSoftware(
       std::unique_ptr<SoftwareOutputDevice> software_device) {
     return base::WrapUnique(
         new FakeOutputSurface(std::move(software_device), false));
@@ skipping 80 matching lines @@
   }
 
   void set_suspended_for_recycle(bool suspended) {
     suspended_for_recycle_ = suspended;
   }
 
   void SetMemoryPolicyToSetAtBind(
       std::unique_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind);
 
   gfx::Rect last_swap_rect() const {
+    DCHECK(last_swap_rect_valid_);
     return last_swap_rect_;
   }
 
   void ReturnResourcesHeldByParent();
 
  protected:
   FakeOutputSurface(scoped_refptr<ContextProvider> context_provider,
                     scoped_refptr<ContextProvider> worker_context_provider,
                     bool delegated_rendering);
 
   FakeOutputSurface(std::unique_ptr<SoftwareOutputDevice> software_device,
                     bool delegated_rendering);
 
   FakeOutputSurface(scoped_refptr<ContextProvider> context_provider,
                     scoped_refptr<ContextProvider> worker_context_provider,
                     std::unique_ptr<SoftwareOutputDevice> software_device,
                     bool delegated_rendering);
 
   OutputSurfaceClient* client_ = nullptr;
   std::unique_ptr<CompositorFrame> last_sent_frame_;
   size_t num_sent_frames_ = 0;
   bool has_external_stencil_test_ = false;
   bool suspended_for_recycle_ = false;
   GLint framebuffer_ = 0;
   GLenum framebuffer_format_ = 0;
   TransferableResourceArray resources_held_by_parent_;
   std::unique_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind_;
   OverlayCandidateValidator* overlay_candidate_validator_ = nullptr;
+  bool last_swap_rect_valid_ = false;
   gfx::Rect last_swap_rect_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_FAKE_OUTPUT_SURFACE_H_