services/ui: Move cc::SoftwareOutputDevice implementation into the client lib.

services/ui/public/cpp/BUILD.gn

 # 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.
 
 # This is the public target. It contains only the public headers. The
 # implementation (and private haders) are in 'internal'.
 source_set("cpp") {
   sources = [
-    "bitmap_uploader.h",
     "input_event_handler.h",
     "output_surface.h",
     "property_type_converters.h",
     "raster_thread_helper.h",
     "scoped_window_ptr.h",
+    "software_output_device.h",
     "window.h",
     "window_manager_delegate.h",
     "window_observer.h",
     "window_property.h",
     "window_surface.h",
     "window_surface_client.h",
     "window_tracker.h",
     "window_tree_client.h",
     "window_tree_client_delegate.h",
     "window_tree_client_observer.h",
@@ skipping 53 matching lines @@
 
   deps = [
     "//base",
     "//mojo/public/cpp/bindings",
   ]
 }
 
 source_set("internal") {
   # This target is an implementation detail and is intended only to be used by
   # the 'cpp' target.
-  visibility = [ ":cpp" ]
+  visibility = [
+    ":cpp",
+    "//services/ui/demo:mus_demo_library",

[sky, 2016/08/10 15:10:39]

Why do we want to move bitmap_uploader to internal, but expose it to the demo?
It seems like either we should go with bitmap_uploader be public as we had it,
or change mus_demo_library.

[sadrul, 2016/08/10 15:44:01]

I have been thinking about it myself since I sent it out for review. I think
clients should normally use OutputSurface/SoftwareOutputDevice for sending
frames to mus, instead of directly using BitmapUploader. mus_demo is a bit of an
exception since it exists more as a mus test than as a proper mus client. I feel
like having all of OutputSurface, SoftwareOutputDevice, BitmapUploader in the
API may be a bit confusing, and it'd be better to restrict the API the clients
should use. But maybe it does make sense to allow clients to directly use
BitmapUploader too?

rjkroege@ what do you think?

+  ]
 
   sources = [
     "bitmap_uploader.cc",
+    "bitmap_uploader.h",
     "command_buffer_client_impl.cc",
     "command_buffer_client_impl.h",
     "context_provider.cc",
     "context_provider.h",
     "gles2_context.cc",
     "gles2_context.h",
     "in_flight_change.cc",
     "in_flight_change.h",
     "output_surface.cc",
     "property_type_converters.cc",
     "raster_thread_helper.cc",
     "scoped_window_ptr.cc",
+    "software_output_device.cc",
     "window.cc",
     "window_manager_delegate.cc",
     "window_observer.cc",
     "window_private.cc",
     "window_surface.cc",
     "window_tree_client.cc",
     "window_tree_client_delegate.cc",
     "window_tree_host_factory.cc",
   ]
 
@@ skipping 20 matching lines @@
     "//ui/events",
     "//ui/gfx/geometry",
   ]
 
   data_deps = [
     "//services/ui",
   ]
 
   defines = [ "GL_GLEXT_PROTOTYPES" ]
 }