Add a Display and ContextProvider concept to mojom, use to recreate

services/view_manager/display_manager.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 SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
 #define SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
-#include "cc/surfaces/surface_id.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/public/interfaces/display.mojom.h"
 #include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
 #include "ui/gfx/rect.h"
 
 namespace cc {
 class SurfaceIdAllocator;
 }
 
 namespace mojo {
 class ApplicationConnection;
 class ApplicationImpl;
@@ skipping 31 matching lines @@
       const mojo::Callback<void()>& native_viewport_closed_callback);
   ~DefaultDisplayManager() override;
 
   // DisplayManager:
   void Init(ConnectionManager* connection_manager) override;
   void SchedulePaint(const ServerView* view, const gfx::Rect& bounds) override;
   void SetViewportSize(const gfx::Size& size) override;
   const mojo::ViewportMetrics& GetViewportMetrics() override;
 
  private:
-  void OnCreatedNativeViewport(uint64_t native_viewport_id,
-                               mojo::ViewportMetricsPtr metrics);
+  void WantToDraw();
   void Draw();
+  void DidDraw();
 
   void OnMetricsChanged(mojo::ViewportMetricsPtr metrics);
 
-  void SetIdNamespace(uint32_t id_namespace);
-
   // ErrorHandler:
   void OnConnectionError() override;
 
   mojo::ApplicationImpl* app_impl_;
   mojo::ApplicationConnection* app_connection_;
   ConnectionManager* connection_manager_;
 
   mojo::ViewportMetrics metrics_;
   gfx::Rect dirty_rect_;
   base::Timer draw_timer_;
+  bool frame_pending_;
 
-  mojo::SurfacePtr surface_;
-  uint32_t id_namespace_;
-  bool surface_allocated_;
+  mojo::DisplayPtr display_;
   mojo::NativeViewportPtr native_viewport_;
   mojo::Callback<void()> native_viewport_closed_callback_;
   base::WeakPtrFactory<DefaultDisplayManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager);
 };
 
 }  // namespace view_manager
 
 #endif  // SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_