Mus experiment in content shell on Android.

services/ui/ws/frame_generator.cc

Index: services/ui/ws/frame_generator.cc
diff --git a/services/ui/ws/frame_generator.cc b/services/ui/ws/frame_generator.cc
index cbed7bdf88139623ba7c64fe257d8e8d2ac2c2fd..7b3417ad11f490727aba382280fe3c5b3156963b 100644
--- a/services/ui/ws/frame_generator.cc
+++ b/services/ui/ws/frame_generator.cc
@@ -44,7 +44,7 @@ FrameGenerator::~FrameGenerator() {
 
 void FrameGenerator::OnGpuChannelEstablished(
     scoped_refptr<gpu::GpuChannelHost> channel) {
-  if (widget_ != gfx::kNullAcceleratedWidget) {
+  if (widget_ != gpu::kNullSurfaceHandle) {
     compositor_frame_sink_ = base::MakeUnique<surfaces::CompositorFrameSink>(
         frame_sink_id_, base::ThreadTaskRunnerHandle::Get(), widget_,
         std::move(channel), display_compositor_);
@@ -58,10 +58,9 @@ void FrameGenerator::RequestRedraw(const gfx::Rect& redraw_region) {
   WantToDraw();
 }
 
-void FrameGenerator::OnAcceleratedWidgetAvailable(
-    gfx::AcceleratedWidget widget) {
+void FrameGenerator::OnAcceleratedWidgetAvailable(gpu::SurfaceHandle widget) {

[Fady Samuel, 2016/10/19 10:49:52]

I'm wondering if we should replace references to "AcceleratedWidget" to
"SurfaceHandle" and |widget_| to |surface_handle_| just to keep terminology
consistent in Mus?

[Jay Civelli, 2016/11/02 22:02:17]

Based on @sadrul comment I kept the AcceleratedWidget.

   widget_ = widget;
-  if (gpu_channel_ && widget != gfx::kNullAcceleratedWidget) {
+  if (gpu_channel_ && widget != gpu::kNullSurfaceHandle) {
     compositor_frame_sink_.reset(new surfaces::CompositorFrameSink(
         frame_sink_id_, base::ThreadTaskRunnerHandle::Get(), widget_,
         std::move(gpu_channel_), display_compositor_));