content: Add ContextProviderFactory to create a render ContextProvider.

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include <utility>
 
@@ skipping 58 matching lines @@
 #include "content/public/common/content_switches.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/config/gpu_driver_bug_workaround_type.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_start.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "ui/android/context_provider_factory.h"
 #include "ui/android/window_android.h"
 #include "ui/android/window_android_compositor.h"
 #include "ui/base/layout.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/events/gesture_detection/gesture_provider_config_helper.h"
 #include "ui/events/gesture_detection/motion_event.h"
 #include "ui/gfx/android/device_display_info.h"
 #include "ui/gfx/android/java_bitmap.h"
@@ skipping 194 matching lines @@
 
   rect.Union(controller.GetStartHandleRect());
   rect.Union(controller.GetEndHandleRect());
   return rect;
 }
 
 scoped_refptr<cc::SurfaceLayer> CreateSurfaceLayer(
     const cc::SurfaceId& surface_id,
     const gfx::Size& size) {
   DCHECK(!surface_id.is_null());
-  cc::SurfaceManager* manager = CompositorImpl::GetSurfaceManager();
+  cc::SurfaceManager* manager =
+      ui::ContextProviderFactory::GetInstance()->GetSurfaceManager();
   DCHECK(manager);
   // manager must outlive compositors using it.
   scoped_refptr<cc::SurfaceLayer> surface_layer = cc::SurfaceLayer::Create(
       base::Bind(&SatisfyCallback, base::Unretained(manager)),
       base::Bind(&RequireCallback, base::Unretained(manager)));
   surface_layer->SetSurfaceId(surface_id, 1.f, size);
   surface_layer->SetBounds(size);
   surface_layer->SetIsDrawable(true);
   surface_layer->SetContentsOpaque(true);
 
@@ skipping 34 matching lines @@
       last_output_surface_id_(kUndefinedOutputSurfaceId),
       gesture_provider_(ui::GetGestureProviderConfig(
                             ui::GestureProviderConfigType::CURRENT_PLATFORM),
                         this),
       stylus_text_selector_(this),
       using_browser_compositor_(CompositorImpl::IsInitialized()),
       frame_evictor_(new DelegatedFrameEvictor(this)),
       locks_on_frame_count_(0),
       observing_root_window_(false),
       weak_ptr_factory_(this) {
-  id_allocator_.reset(
-      new cc::SurfaceIdAllocator(CompositorImpl::AllocateSurfaceClientId()));
-  CompositorImpl::GetSurfaceManager()->RegisterSurfaceClientId(
-      id_allocator_->client_id());
+  if (using_browser_compositor_) {
+    id_allocator_.reset(new cc::SurfaceIdAllocator(
+        ui::ContextProviderFactory::GetInstance()->AllocateSurfaceClientId()));
+    ui::ContextProviderFactory::GetInstance()
+        ->GetSurfaceManager()
+        ->RegisterSurfaceClientId(id_allocator_->client_id());
+  }
+
   host_->SetView(this);
   SetContentViewCore(content_view_core);
 }
 
 RenderWidgetHostViewAndroid::~RenderWidgetHostViewAndroid() {
   if (content_view_core_)
     content_view_core_->RemoveObserver(this);
   SetContentViewCore(NULL);
   DCHECK(ack_callbacks_.empty());
   DCHECK(!surface_factory_);
@@ skipping 429 matching lines @@
   host_->ViewDestroyed();
   RemoveLayers();
   SetContentViewCore(NULL);
 
   if (!surface_id_.is_null()) {
     DCHECK(surface_factory_.get());
     surface_factory_->Destroy(surface_id_);
     surface_id_ = cc::SurfaceId();
   }
   surface_factory_.reset();
-  CompositorImpl::GetSurfaceManager()->InvalidateSurfaceClientId(
-      id_allocator_->client_id());
+  ui::ContextProviderFactory::GetInstance()

[no sievers, 2016/08/02 22:47:36]

this needs an if-check whether the id_allocator_ exists now.
(you could also use GetSurfaceClientId() here)

[Khushal, 2016/08/02 23:31:54]

Done. In my next change I'm moving all the surfaces stuff to DelegatedFrameHost.
I shouldn't be building it at all then for webview?

[no sievers, 2016/08/03 23:13:25]

Yes, I think WebView could possibly not instantiate a DFH based on
|using_browser_compositor_|.

+      ->GetSurfaceManager()
+      ->InvalidateSurfaceClientId(id_allocator_->client_id());
 
   // The RenderWidgetHost's destruction led here, so don't call it.
   host_ = NULL;
 
   delete this;
 }
 
 void RenderWidgetHostViewAndroid::SetTooltipText(
     const base::string16& tooltip_text) {
   // Tooltips don't makes sense on Android.
@@ skipping 156 matching lines @@
   surface_factory_.reset();
   if (!surface_returned_resources_.empty())
     SendReclaimCompositorResources(last_output_surface_id_,
                                    false /* is_swap_ack */);
 
   last_output_surface_id_ = output_surface_id;
 }
 
 void RenderWidgetHostViewAndroid::SubmitCompositorFrame(
     cc::CompositorFrame frame) {
-  cc::SurfaceManager* manager = CompositorImpl::GetSurfaceManager();
+  cc::SurfaceManager* manager =
+      ui::ContextProviderFactory::GetInstance()->GetSurfaceManager();
   if (!surface_factory_) {
     surface_factory_ = base::WrapUnique(new cc::SurfaceFactory(manager, this));
   }
   if (surface_id_.is_null() ||
       texture_size_in_layer_ != current_surface_size_ ||
       location_bar_content_translation_ !=
           frame.metadata.location_bar_content_translation ||
       current_viewport_selection_ != frame.metadata.selection) {
     RemoveLayers();
     if (!surface_id_.is_null())
@@ skipping 16 matching lines @@
                  weak_ptr_factory_.GetWeakPtr());
   surface_factory_->SubmitCompositorFrame(surface_id_, std::move(frame),
                                           ack_callback);
 }
 
 void RenderWidgetHostViewAndroid::InternalSwapCompositorFrame(
     uint32_t output_surface_id,
     cc::CompositorFrame frame) {
   last_scroll_offset_ = frame.metadata.root_scroll_offset;
   DCHECK(frame.delegated_frame_data);
-  DCHECK(CompositorImpl::GetSurfaceManager());
 
   if (locks_on_frame_count_ > 0) {
     DCHECK(HasValidFrame());
     RetainFrame(output_surface_id, std::move(frame));
     return;
   }
 
   DCHECK(!frame.delegated_frame_data->render_pass_list.empty());
 
   cc::RenderPass* root_pass =
@@ skipping 957 matching lines @@
     case ui::MotionEvent::ACTION_UP:
     case ui::MotionEvent::ACTION_POINTER_UP:
       UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED",
                                   delta.InMicroseconds(), 1, 1000000, 50);
     default:
       return;
   }
 }
 
 }  // namespace content