Mus experiment in content shell on Android.

services/ui/ws/frame_generator.cc

 // Copyright 2016 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 "services/ui/ws/frame_generator.h"
 
 #include "base/containers/adapters.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/render_pass_draw_quad.h"
@@ skipping 26 matching lines @@
 FrameGenerator::~FrameGenerator() {
   ReleaseAllSurfaceReferences();
   // Invalidate WeakPtrs now to avoid callbacks back into the
   // FrameGenerator during destruction of |compositor_frame_sink_|.
   weak_factory_.InvalidateWeakPtrs();
   compositor_frame_sink_.reset();
 }
 
 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_);
   } else {
     gpu_channel_ = std::move(channel);
   }
 }
 
 void FrameGenerator::RequestRedraw(const gfx::Rect& redraw_region) {
   dirty_rect_.Union(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_));
   }
 }
 
 void FrameGenerator::RequestCopyOfOutput(
     std::unique_ptr<cc::CopyOutputRequest> output_request) {
   if (compositor_frame_sink_)
     compositor_frame_sink_->RequestCopyOfOutput(std::move(output_request));
@@ skipping 238 matching lines @@
   if (default_surface)
     ReleaseFrameSinkReference(default_surface->frame_sink_id());
   ServerWindowSurface* underlay_surface = surface_manager->GetUnderlaySurface();
   if (underlay_surface)
     ReleaseFrameSinkReference(underlay_surface->frame_sink_id());
 }
 
 }  // namespace ws
 
 }  // namespace ui