Mus+Ash: Towards Unifying CompositorFrameSink terminology

services/ui/demo/bitmap_uploader.cc

 // Copyright 2015 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/demo/bitmap_uploader.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/ipc/compositor_frame.mojom.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
+#include "services/ui/public/cpp/context_provider.h"
 #include "services/ui/public/cpp/gles2_context.h"
 #include "services/ui/public/cpp/gpu_service.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_surface.h"
 
 namespace ui {
 namespace {
 
 const uint32_t g_transparent_color = 0x00000000;
 
 }  // namespace
 
 const char kBitmapUploaderForAcceleratedWidget[] =
     "__BITMAP_UPLOADER_ACCELERATED_WIDGET__";
 
 BitmapUploader::BitmapUploader(Window* window)
     : window_(window),
       color_(g_transparent_color),
       width_(0),
       height_(0),
       format_(BGRA),
       next_resource_id_(1u) {
 }
 
 void BitmapUploader::Init(ui::GpuService* gpu_service) {
-  surface_ = window_->RequestSurface(mojom::SurfaceType::DEFAULT);
-  surface_->BindToThread();
-  surface_->set_client(this);
-
-  gles2_context_ = GLES2Context::CreateOffscreenContext(
-      gpu_service->EstablishGpuChannelSync(),
-      base::ThreadTaskRunnerHandle::Get());
+  compositor_frame_sink_ = window_->RequestCompositorFrameSink(
+      mojom::SurfaceType::DEFAULT,
+      new ContextProvider(gpu_service->EstablishGpuChannelSync()));
+  compositor_frame_sink_->BindToClient(this);
 }
 
-BitmapUploader::~BitmapUploader() {}
+BitmapUploader::~BitmapUploader() {
+  compositor_frame_sink_->DetachFromClient();
+}
 
 // Sets the color which is RGBA.
 void BitmapUploader::SetColor(uint32_t color) {
   if (color_ == color)
     return;
   color_ = color;
-  if (surface_)
+  if (compositor_frame_sink_)
     Upload();
 }
 
 // Sets a bitmap.
 void BitmapUploader::SetBitmap(int width,
                                int height,
                                std::unique_ptr<std::vector<unsigned char>> data,
                                Format format) {
   width_ = width;
   height_ = height;
   bitmap_ = std::move(data);
   format_ = format;
-  if (surface_)
+  if (compositor_frame_sink_)
     Upload();
 }
 
 void BitmapUploader::Upload() {
-  if (!gles2_context_)
+  if (!compositor_frame_sink_ || !compositor_frame_sink_->context_provider())
     return;
 
   const gfx::Rect bounds(window_->bounds().size());
 
   cc::CompositorFrame frame;
   // TODO(rjkroege): Support device scale factors other than 1.
   frame.metadata.device_scale_factor = 1.0f;
   frame.delegated_frame_data.reset(new cc::DelegatedFrameData());
   frame.delegated_frame_data->resource_list.resize(0u);
 
   const cc::RenderPassId render_pass_id(1, 1);
   std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create();
   pass->SetAll(render_pass_id, bounds, bounds, gfx::Transform(),
                true /* has_transparent_background */);
 
   // The SharedQuadState is owned by the SharedQuadStateList
   // shared_quad_state_list.
   cc::SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
   sqs->SetAll(gfx::Transform(), bounds.size(), bounds, bounds,
               false /* is_clipped */, 1.f /* opacity */, SkXfermode::kSrc_Mode,
               0 /* sorting_context_id */);
 
   if (bitmap_.get()) {
-    gpu::gles2::GLES2Interface* gl = gles2_context_->interface();
+    gpu::gles2::GLES2Interface* gl =
+        compositor_frame_sink_->context_provider()->ContextGL();
     gfx::Size bitmap_size(width_, height_);
     GLuint texture_id = BindTextureForSize(bitmap_size);
     gl->TexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, bitmap_size.width(),
                       bitmap_size.height(), TextureFormat(), GL_UNSIGNED_BYTE,
                       &((*bitmap_)[0]));
 
     gpu::Mailbox mailbox;
     gl->GenMailboxCHROMIUM(mailbox.name);
     gl->ProduceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
 
@@ skipping 53 matching lines @@
     const bool force_antialiasing_off = false;
     const gfx::Rect opaque_rect(0, 0, 0, 0);
     const bool needs_blending = true;
     quad->SetAll(sqs, bounds, opaque_rect, bounds, needs_blending, color_,
                  force_antialiasing_off);
   }
 
   frame.delegated_frame_data->render_pass_list.push_back(std::move(pass));
 
   // TODO(rjkroege, fsamuel): We should throttle frames.
-  surface_->SubmitCompositorFrame(std::move(frame), base::Closure());
+  compositor_frame_sink_->SubmitCompositorFrame(std::move(frame));
 }
 
 uint32_t BitmapUploader::BindTextureForSize(const gfx::Size& size) {
-  gpu::gles2::GLES2Interface* gl = gles2_context_->interface();
+  gpu::gles2::GLES2Interface* gl =
+      compositor_frame_sink_->context_provider()->ContextGL();
   // TODO(jamesr): Recycle textures.
   GLuint texture = 0u;
   gl->GenTextures(1, &texture);
   gl->BindTexture(GL_TEXTURE_2D, texture);
   gl->TexImage2D(GL_TEXTURE_2D, 0, TextureFormat(), size.width(), size.height(),
                  0, TextureFormat(), GL_UNSIGNED_BYTE, 0);
   gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   return texture;
 }
 
-void BitmapUploader::OnResourcesReturned(
-    WindowSurface* surface,
+void BitmapUploader::SetBeginFrameSource(cc::BeginFrameSource* source) {}
+
+void BitmapUploader::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
-  gpu::gles2::GLES2Interface* gl = gles2_context_->interface();
+  gpu::gles2::GLES2Interface* gl =
+      compositor_frame_sink_->context_provider()->ContextGL();
   // TODO(jamesr): Recycle.
   for (size_t i = 0; i < resources.size(); ++i) {
     cc::ReturnedResource resource = std::move(resources[i]);
     DCHECK_EQ(1, resource.count);
     gl->WaitSyncTokenCHROMIUM(resource.sync_token.GetConstData());
     uint32_t texture_id = resource_to_texture_id_map_[resource.id];
     DCHECK_NE(0u, texture_id);
     resource_to_texture_id_map_.erase(resource.id);
     gl->DeleteTextures(1, &texture_id);
   }
 }
 
+void BitmapUploader::SetTreeActivationCallback(const base::Closure& callback) {}

[rjkroege, 2016/10/20 21:33:18]

these probably need TODOs. :-)

[Fady Samuel, 2016/10/20 23:04:10]

Done.

+
+void BitmapUploader::DidReceiveCompositorFrameAck() {}
+
+void BitmapUploader::DidLoseCompositorFrameSink() {}
+
+void BitmapUploader::OnDraw(const gfx::Transform& transform,
+                            const gfx::Rect& viewport,
+                            bool resourceless_software_draw) {}
+
+void BitmapUploader::SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) {}
+
+void BitmapUploader::SetExternalTilePriorityConstraints(
+    const gfx::Rect& viewport_rect,
+    const gfx::Transform& transform) {}
+
 }  // namespace ui