native_viewport support for ozone

services/native_viewport/main.cc

 // 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.
 
 #include <algorithm>
 
+#include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/tracing_impl.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
 #include "mojo/services/native_viewport/public/cpp/args.h"
 #include "services/gles2/gpu_impl.h"
 #include "services/native_viewport/native_viewport_impl.h"
 #include "ui/events/event_switches.h"
 #include "ui/gl/gl_surface.h"
 
+#if defined(USE_OZONE)
+#include "mojo/services/ozone_drm_gpu/public/interfaces/ozone_drm_gpu.mojom.h"  //nogncheck
+#include "mojo/services/ozone_drm_host/public/interfaces/ozone_drm_host.mojom.h"  //nogncheck
+#include "services/native_viewport/ozone/display_manager.h"      //nogncheck
+#include "services/native_viewport/ozone/ozone_drm_gpu_impl.h"   //nogncheck
+#include "services/native_viewport/ozone/ozone_drm_host_impl.h"  //nogncheck
+#include "ui/ozone/public/ozone_platform.h"                      //nogncheck
+#endif
+
 using mojo::ApplicationConnection;
 using mojo::Gpu;
 using mojo::NativeViewport;
 
+#if defined(USE_OZONE)
+using mojo::OzoneDrmGpu;
+using mojo::OzoneDrmHost;
+#endif
+
 namespace native_viewport {
 
 class NativeViewportAppDelegate : public mojo::ApplicationDelegate,
                                   public mojo::InterfaceFactory<NativeViewport>,
                                   public mojo::InterfaceFactory<Gpu> {
  public:
   NativeViewportAppDelegate() : is_headless_(false) {}
   ~NativeViewportAppDelegate() override {}
 
- private:
   // mojo::ApplicationDelegate implementation.
   void Initialize(mojo::ApplicationImpl* application) override {
     application_ = application;
+
     tracing_.Initialize(application);
 
     // Apply the switch for kTouchEvents to CommandLine (if set). This allows
     // redirecting the mouse to a touch device on X for testing.
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
     const std::string touch_event_string("--" +
                                          std::string(switches::kTouchDevices));
     auto touch_iter = std::find(application->args().begin(),
                                 application->args().end(), touch_event_string);
     if (touch_iter != application->args().end() &&
@@ skipping 34 matching lines @@
     new gles2::GpuImpl(request.Pass(), gpu_state_);
   }
 
   mojo::ApplicationImpl* application_;
   scoped_refptr<gles2::GpuState> gpu_state_;
   bool is_headless_;
   mojo::TracingImpl tracing_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeViewportAppDelegate);
 };
-}
+
+#if defined(USE_OZONE)

[jamesr, 2015/08/25 00:30:28]

can this stuff go somewhere other than main.cc?  you could make another
source_set with the ozone specific check and leave gn checking on for all of the
includes within that target

[cdotstout, 2015/08/27 19:10:21]

Done.

+class NativeViewportOzoneDrmAppDelegate
+    : public NativeViewportAppDelegate,
+      public mojo::InterfaceFactory<OzoneDrmHost>,
+      public mojo::InterfaceFactory<OzoneDrmGpu> {
+ public:
+  using NativeViewportAppDelegate::Create;
+
+  void Initialize(mojo::ApplicationImpl* application) override {
+    NativeViewportAppDelegate::Initialize(application);
+    application->ConnectToService("mojo:native_viewport_service",
+                                  &ozone_drm_gpu_);
+    application->ConnectToService("mojo:native_viewport_service",
+                                  &ozone_drm_host_);
+  }
+
+  bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
+    if (!NativeViewportAppDelegate::ConfigureIncomingConnection(connection))
+      return false;
+    connection->AddService<OzoneDrmGpu>(this);
+    connection->AddService<OzoneDrmHost>(this);
+    return true;
+  }
+
+  // mojo::InterfaceFactory<OzoneDrmGpu> implementation.
+  void Create(ApplicationConnection* connection,
+              mojo::InterfaceRequest<OzoneDrmGpu> request) override {
+    new OzoneDrmGpuImpl(request.Pass(), ozone_drm_host_);
+  }
+
+  // mojo::InterfaceFactory<OzoneDrmHost> implementation.
+  void Create(ApplicationConnection* connection,
+              mojo::InterfaceRequest<OzoneDrmHost> request) override {
+    ui::OzonePlatform::InitializeForUI();
+    new OzoneDrmHostImpl(request.Pass(), ozone_drm_gpu_);
+
+    display_manager_.reset(new DisplayManager());
+  }
+
+ private:
+  std::unique_ptr<DisplayManager> display_manager_;
+  mojo::OzoneDrmHostPtr ozone_drm_host_;
+  mojo::OzoneDrmGpuPtr ozone_drm_gpu_;
+};
+
+#endif
+
+}  // namespace
 
 MojoResult MojoMain(MojoHandle application_request) {
+#if defined(USE_OZONE)
+  mojo::ApplicationRunnerChromium runner(
+      new native_viewport::NativeViewportOzoneDrmAppDelegate);
+#else
   mojo::ApplicationRunnerChromium runner(
       new native_viewport::NativeViewportAppDelegate);
+#endif
   runner.set_message_loop_type(base::MessageLoop::TYPE_UI);
   return runner.Run(application_request);
 }