cc: Allow TestDelegatingOutputSurface to be used for non-pixel tests.

cc/surfaces/display.h

 // Copyright 2014 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_SURFACES_DISPLAY_H_
 #define CC_SURFACES_DISPLAY_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 38 matching lines @@
 // A Display produces a surface that can be used to draw to a physical display
 // (OutputSurface). The client is responsible for creating and sizing the
 // surface IDs used to draw into the display and deciding when to draw.
 class CC_SURFACES_EXPORT Display : public DisplaySchedulerClient,
                                    public OutputSurfaceClient,
                                    public RendererClient,
                                    public SurfaceDamageObserver {
  public:
   // The |begin_frame_source| and |scheduler| may be null (together). In that
   // case, DrawAndSwap must be called externally when needed.
-  Display(SurfaceManager* manager,
-          SharedBitmapManager* bitmap_manager,
+  Display(SharedBitmapManager* bitmap_manager,
           gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
           const RendererSettings& settings,
-          uint32_t compositor_surface_namespace,
           std::unique_ptr<BeginFrameSource> begin_frame_source,
           std::unique_ptr<OutputSurface> output_surface,
           std::unique_ptr<DisplayScheduler> scheduler,
           std::unique_ptr<TextureMailboxDeleter> texture_mailbox_deleter);
 
   ~Display() override;
 
-  void Initialize(DisplayClient* client);
+  void Initialize(DisplayClient* client,
+                  SurfaceManager* surface_manager,
+                  uint32_t compositor_surface_namespace);
 
   // device_scale_factor is used to communicate to the external window system
   // what scale this was rendered at.
   void SetSurfaceId(const SurfaceId& id, float device_scale_factor);
   void Resize(const gfx::Size& new_size);
   void SetColorSpace(const gfx::ColorSpace& color_space);
   void SetExternalClip(const gfx::Rect& clip);
   void SetOutputIsSecure(bool secure);
 
   const SurfaceId& CurrentSurfaceId();
@@ skipping 25 matching lines @@
   void SetFullRootLayerDamage() override;
 
   // SurfaceDamageObserver implementation.
   void OnSurfaceDamaged(const SurfaceId& surface, bool* changed) override;
 
   void SetEnlargePassTextureAmountForTesting(
       const gfx::Size& enlarge_texture_amount) {
     enlarge_texture_amount_ = enlarge_texture_amount;
   }
 
+  bool has_scheduler() const { return !!scheduler_; }
+
  private:
   void InitializeRenderer();
   void UpdateRootSurfaceResourcesLocked();
 
+  SharedBitmapManager* const bitmap_manager_;
+  gpu::GpuMemoryBufferManager* const gpu_memory_buffer_manager_;
+  const RendererSettings settings_;
+
   DisplayClient* client_;
   SurfaceManager* surface_manager_;
-  SharedBitmapManager* bitmap_manager_;
-  gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
-  RendererSettings settings_;
+  uint32_t compositor_surface_namespace_;
   SurfaceId current_surface_id_;
-  uint32_t compositor_surface_namespace_;
   gfx::Size current_surface_size_;
   float device_scale_factor_ = 1.f;
   gfx::ColorSpace device_color_space_;
   bool swapped_since_resize_ = false;
   gfx::Rect external_clip_;
   gfx::Size enlarge_texture_amount_;
   bool output_is_secure_ = false;
 
   // The begin_frame_source_ is often known by the output_surface_ and
   // the scheduler_.
   std::unique_ptr<BeginFrameSource> begin_frame_source_;
   std::unique_ptr<OutputSurface> output_surface_;
   std::unique_ptr<DisplayScheduler> scheduler_;
   std::unique_ptr<ResourceProvider> resource_provider_;
   std::unique_ptr<SurfaceAggregator> aggregator_;
   std::unique_ptr<TextureMailboxDeleter> texture_mailbox_deleter_;
   std::unique_ptr<DirectRenderer> renderer_;
   SoftwareRenderer* software_renderer_ = nullptr;
   std::vector<ui::LatencyInfo> stored_latency_info_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_DISPLAY_H_