Route selection bounds updates through the compositor

content/renderer/gpu/render_widget_compositor.cc

 // Copyright (c) 2013 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/renderer/gpu/render_widget_compositor.h"
 
 #include <limits>
 #include <string>
 
 #if defined(OS_ANDROID)
 #include "base/android/sys_utils.h"
 #endif
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "cc/base/latency_info_swap_promise.h"
 #include "cc/base/latency_info_swap_promise_monitor.h"
 #include "cc/base/switches.h"
 #include "cc/debug/layer_tree_debug_state.h"
 #include "cc/debug/micro_benchmark.h"
+#include "cc/input/layer_selection_bound.h"
 #include "cc/layers/layer.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/resources/single_release_callback.h"
 #include "cc/trees/layer_tree_host.h"
 #include "content/child/child_shared_bitmap_manager.h"
 #include "content/common/content_switches_internal.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/public/common/content_switches.h"
 #include "content/renderer/input/input_handler_manager.h"
 #include "content/renderer/render_thread_impl.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallback.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
+#include "third_party/WebKit/public/web/WebSelection.h"
 #include "third_party/WebKit/public/web/WebWidget.h"
 #include "ui/gfx/frame_time.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/native_theme/native_theme_switches.h"
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
 
 namespace base {
 class Value;
 }
 
 namespace cc {
 class Layer;
 }
 
 using blink::WebFloatPoint;
+using blink::WebSelection;
 using blink::WebSize;
 using blink::WebRect;
 
 namespace content {
 namespace {
 
 bool GetSwitchValueAsInt(
     const CommandLine& command_line,
     const std::string& switch_string,
     int min_value,
     int max_value,
     int* result) {
   std::string string_value = command_line.GetSwitchValueASCII(switch_string);
   int int_value;
   if (base::StringToInt(string_value, &int_value) &&
       int_value >= min_value && int_value <= max_value) {
     *result = int_value;
     return true;
   } else {
     LOG(WARNING) << "Failed to parse switch " << switch_string  << ": " <<
         string_value;
     return false;
   }
 }
 
+bool ConvertWebSelection(const WebSelection& selection,
+                         cc::LayerSelectionBound* anchor,
+                         cc::LayerSelectionBound* focus) {
+  DCHECK(anchor);
+  DCHECK(focus);
+  if (selection.type == WebSelection::TypeNone)
+    return false;
+
+  if (!selection.anchorLayerId)
+    return false;
+
+  if (selection.type == WebSelection::TypeInsertion) {
+    anchor->type = cc::SELECTION_BOUND_CENTER;
+    anchor->layer_id = selection.anchorLayerId;
+    anchor->layer_rect = gfx::Rect(selection.anchorRectInLayer);
+    return true;
+  }
+
+  if (!selection.focusLayerId)
+    return false;
+
+  anchor->layer_id = selection.anchorLayerId;
+  focus->layer_id = selection.focusLayerId;
+
+  anchor->type = selection.anchorDirection == blink::WebTextDirectionRightToLeft
+                     ? cc::SELECTION_BOUND_RIGHT
+                     : cc::SELECTION_BOUND_LEFT;
+  focus->type = selection.focusDirection == blink::WebTextDirectionRightToLeft
+                    ? cc::SELECTION_BOUND_LEFT
+                    : cc::SELECTION_BOUND_RIGHT;
+
+  anchor->layer_rect = gfx::Rect(selection.anchorRectInLayer);
+  focus->layer_rect = gfx::Rect(selection.focusRectInLayer);
+
+  return true;
+}
+
 }  // namespace
 
 // static
 scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
     RenderWidget* widget,
     bool threaded) {
   scoped_ptr<RenderWidgetCompositor> compositor(
       new RenderWidgetCompositor(widget, threaded));
 
   CommandLine* cmd = CommandLine::ForCurrentProcess();
@@ skipping 228 matching lines @@
 
   compositor->Initialize(settings);
 
   return compositor.Pass();
 }
 
 RenderWidgetCompositor::RenderWidgetCompositor(RenderWidget* widget,
                                                bool threaded)
     : threaded_(threaded),
       suppress_schedule_composite_(false),
+      suppress_selection_updates_(false),
       widget_(widget) {
 }
 
 RenderWidgetCompositor::~RenderWidgetCompositor() {}
 
 const base::WeakPtr<cc::InputHandler>&
 RenderWidgetCompositor::GetInputHandler() {
   return layer_tree_host_->GetInputHandler();
 }
 
@@ skipping 82 matching lines @@
     const base::Callback<void(scoped_ptr<base::Value>)>& callback) {
   return layer_tree_host_->ScheduleMicroBenchmark(name, value.Pass(), callback);
 }
 
 bool RenderWidgetCompositor::SendMessageToMicroBenchmark(
     int id,
     scoped_ptr<base::Value> value) {
   return layer_tree_host_->SendMessageToMicroBenchmark(id, value.Pass());
 }
 
+void RenderWidgetCompositor::SetIgnoreSelectionUpdates(bool ignore_selection) {

[aelias_OOO_until_Jul13, 2014/06/12 06:22:42]

This feels like the wrong way to solve this.  Also, am I correct that this was
written from code inspection and you haven't tested what happens when there's a
pepper plugin active (as there aren't any on Android), so this would be
unconfirmed-to-work dead code currently?  I'd favor just deleting this logic and
revisiting the issue when switching ChromeOS/Windows to composited handles.

[jdduke (slow), 2014/06/12 18:32:44]

Sounds good to me.  I'll update RenderWidget/RenderViewImpl appropriately.

+  if (suppress_selection_updates_ == ignore_selection)
+    return;
+
+  if (ignore_selection) {
+    cc::LayerSelectionBound ignored_selection;
+    ignored_selection.type = cc::SELECTION_BOUND_IGNORED;
+    layer_tree_host_->RegisterSelection(ignored_selection, ignored_selection);
+  }
+
+  suppress_selection_updates_ = ignore_selection;
+}
+
 void RenderWidgetCompositor::Initialize(cc::LayerTreeSettings settings) {
   scoped_refptr<base::MessageLoopProxy> compositor_message_loop_proxy;
   RenderThreadImpl* render_thread = RenderThreadImpl::current();
   cc::SharedBitmapManager* shared_bitmap_manager = NULL;
   // render_thread may be NULL in tests.
   if (render_thread) {
     compositor_message_loop_proxy =
         render_thread->compositor_message_loop_proxy();
     shared_bitmap_manager = render_thread->shared_bitmap_manager();
   }
@@ skipping 125 matching lines @@
                                      outerViewportScrollLayer)->layer()
                                : NULL);
 }
 
 void RenderWidgetCompositor::clearViewportLayers() {
   layer_tree_host_->RegisterViewportLayers(scoped_refptr<cc::Layer>(),
                                            scoped_refptr<cc::Layer>(),
                                            scoped_refptr<cc::Layer>());
 }
 
+void RenderWidgetCompositor::registerSelection(
+    const blink::WebSelection& selection) {
+  if (suppress_selection_updates_)
+    return;
+
+  cc::LayerSelectionBound anchor;
+  cc::LayerSelectionBound focus;
+  if (!ConvertWebSelection(selection, &anchor, &focus)) {
+    clearSelection();
+    return;
+  }
+
+  layer_tree_host_->RegisterSelection(anchor, focus);
+}
+
+void RenderWidgetCompositor::clearSelection() {
+  if (suppress_selection_updates_)
+    return;
+
+  cc::LayerSelectionBound empty_selection;
+  empty_selection.type = cc::SELECTION_BOUND_EMPTY;
+  layer_tree_host_->RegisterSelection(empty_selection, empty_selection);
+}
+
 void CompositeAndReadbackAsyncCallback(
     blink::WebCompositeAndReadbackAsyncCallback* callback,
     scoped_ptr<cc::CopyOutputResult> result) {
   if (result->HasBitmap()) {
     scoped_ptr<SkBitmap> result_bitmap = result->TakeBitmap();
     callback->didCompositeAndReadback(*result_bitmap);
   } else {
     callback->didCompositeAndReadback(SkBitmap());
   }
 }
@@ skipping 120 matching lines @@
   widget_->OnSwapBuffersAborted();
 }
 
 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() {
   cc::ContextProvider* provider =
       RenderThreadImpl::current()->SharedMainThreadContextProvider().get();
   provider->ContextGL()->RateLimitOffscreenContextCHROMIUM();
 }
 
 }  // namespace content