Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/view_manager/surfaces/top_level_display_client.h

 // Copyright 2015 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 COMPONENTS_VIEW_MANAGER_SURFACES_DISPLAY_IMPL_H_
 #define COMPONENTS_VIEW_MANAGER_SURFACES_DISPLAY_IMPL_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/surface_factory.h"
@@ skipping 25 matching lines @@
 class TopLevelDisplayClient
     : public cc::DisplayClient,
       public cc::SurfaceFactoryClient,
       public surfaces::SurfacesContextProvider::Delegate {
  public:
   TopLevelDisplayClient(gfx::AcceleratedWidget widget,
                         const scoped_refptr<gles2::GpuState>& gpu_state,
                         const scoped_refptr<SurfacesState>& surfaces_state);
   ~TopLevelDisplayClient() override;
 
-  void SubmitFrame(mojo::FramePtr frame, const base::Closure& callback);
+  void SubmitFrame(scoped_ptr<cc::CompositorFrame> frame,
+                   const base::Closure& callback);
 
  private:
   // DisplayClient implementation.
   // TODO(rjkroege, fsamuel): This won't work correctly with multiple displays.
   void CommitVSyncParameters(base::TimeTicks timebase,
                              base::TimeDelta interval) override;
   void OutputSurfaceLost() override;
   void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override;
 
   // SurfacesContextProvider::Delegate:
   void OnContextCreated();
   void OnVSyncParametersUpdated(int64_t timebase, int64_t interval) override;
 
   // SurfaceFactoryClient implementation.
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;
 
   void Draw();
 
   scoped_refptr<gles2::GpuState> gpu_state_;
   scoped_refptr<SurfacesState> surfaces_state_;
   cc::SurfaceFactory factory_;
   cc::SurfaceId cc_id_;
 
   gfx::Size last_submitted_frame_size_;
-  mojo::FramePtr pending_frame_;
+  scoped_ptr<cc::CompositorFrame> pending_frame_;
   base::Closure pending_callback_;
 
   scoped_ptr<cc::Display> display_;
 
   DISALLOW_COPY_AND_ASSIGN(TopLevelDisplayClient);
 };
 
 }  // namespace surfaces
 
 #endif  // COMPONENTS_VIEW_MANAGER_SURFACES_DISPLAY_IMPL_H_