Route selection bounds updates through the compositor

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 "base/android/sys_utils.h"
 #include "base/basictypes.h"
@@ skipping 617 matching lines @@
     return;
   }
 
   std::string utf8_selection = base::UTF16ToUTF8(text.substr(pos, n));
 
   content_view_core_->OnSelectionChanged(utf8_selection);
 }
 
 void RenderWidgetHostViewAndroid::SelectionBoundsChanged(
     const ViewHostMsg_SelectionBounds_Params& params) {
-  if (content_view_core_) {
-    content_view_core_->OnSelectionBoundsChanged(params);
-  }
+  NOTREACHED() << "Selection bounds should be routed through the compositor.";
 }
 
 void RenderWidgetHostViewAndroid::ScrollOffsetChanged() {
 }
 
 void RenderWidgetHostViewAndroid::SetBackgroundOpaque(bool opaque) {
   RenderWidgetHostViewBase::SetBackgroundOpaque(opaque);
   host_->SetBackgroundOpaque(opaque);
 }
 
@@ skipping 236 matching lines @@
 
   DCHECK(!frame->delegated_frame_data->render_pass_list.empty());
 
   cc::RenderPass* root_pass =
       frame->delegated_frame_data->render_pass_list.back();
   texture_size_in_layer_ = root_pass->output_rect.size();
   ComputeContentsSize(frame->metadata);
 
   SwapDelegatedFrame(output_surface_id, frame->delegated_frame_data.Pass());
   frame_evictor_->SwappedFrame(!host_->is_hidden());
+
+  // As the selection bound updates may trigger view invalidation, always call
+  // it after any potential compositor scheduling.
+  UpdateSelectionBounds(frame->metadata);
 }
 
 void RenderWidgetHostViewAndroid::OnSwapCompositorFrame(
     uint32 output_surface_id,
     scoped_ptr<cc::CompositorFrame> frame) {
   InternalSwapCompositorFrame(output_surface_id, frame.Pass());
 }
 
 void RenderWidgetHostViewAndroid::RetainFrame(
     uint32 output_surface_id,
@@ skipping 15 matching lines @@
 
   last_frame_info_.reset(new LastFrameInfo(output_surface_id, frame.Pass()));
 }
 
 void RenderWidgetHostViewAndroid::SynchronousFrameMetadata(
     const cc::CompositorFrameMetadata& frame_metadata) {
   // This is a subset of OnSwapCompositorFrame() used in the synchronous
   // compositor flow.
   OnFrameMetadataUpdated(frame_metadata);
   ComputeContentsSize(frame_metadata);
+  UpdateSelectionBounds(frame_metadata);
 
   // DevTools ScreenCast support for Android WebView.
   if (DevToolsAgentHost::HasFor(RenderViewHost::From(GetRenderWidgetHost()))) {
     scoped_refptr<DevToolsAgentHost> dtah =
         DevToolsAgentHost::GetOrCreateFor(
             RenderViewHost::From(GetRenderWidgetHost()));
     // Unblock the compositor.
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&RenderViewDevToolsAgentHost::SynchronousSwapCompositorFrame,
@@ skipping 51 matching lines @@
   content_view_core_->UpdateFrameInfo(
       frame_metadata.root_scroll_offset,
       frame_metadata.page_scale_factor,
       gfx::Vector2dF(frame_metadata.min_page_scale_factor,
                      frame_metadata.max_page_scale_factor),
       frame_metadata.root_layer_size,
       frame_metadata.viewport_size,
       frame_metadata.location_bar_offset,
       frame_metadata.location_bar_content_translation,
       frame_metadata.overdraw_bottom_height);
+

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

nit: unnecessary newline

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

Done.

 #if defined(VIDEO_HOLE)
   if (host_ && host_->IsRenderView()) {
     RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(
         RenderViewHost::From(host_));
     rvhi->media_web_contents_observer()->OnFrameInfoUpdated();
   }
 #endif  // defined(VIDEO_HOLE)
 }
 
+void RenderWidgetHostViewAndroid::UpdateSelectionBounds(
+    const cc::CompositorFrameMetadata& frame_metadata) {
+  if (!content_view_core_)
+    return;
+
+  const cc::SelectionBound& anchor = frame_metadata.selection_anchor;
+  const cc::SelectionBound& focus = frame_metadata.selection_focus;
+
+  if (cached_selection_anchor_ == anchor && cached_selection_focus_ == focus)
+    return;
+
+  TRACE_EVENT0("input", "RenderWidgetHostViewAndroid::UpdateSelectionBounds");
+
+  cached_selection_anchor_ = anchor;
+  cached_selection_focus_ = focus;
+
+  content_view_core_->OnSelectionBoundsChanged(
+      anchor.viewport_rect.bottom_left(),
+      focus.viewport_rect.bottom_left(),
+      anchor.type == cc::SELECTION_BOUND_RIGHT
+          ? blink::WebTextDirectionRightToLeft
+          : blink::WebTextDirectionDefault,
+      focus.type == cc::SELECTION_BOUND_LEFT
+          ? blink::WebTextDirectionRightToLeft
+          : blink::WebTextDirectionDefault,
+      anchor.visible,
+      focus.visible);
+}
+
 void RenderWidgetHostViewAndroid::AcceleratedSurfaceInitialized(int host_id,
                                                                 int route_id) {
   accelerated_surface_route_id_ = route_id;
 }
 
 void RenderWidgetHostViewAndroid::AcceleratedSurfaceBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
     int gpu_host_id) {
   NOTREACHED() << "Need --composite-to-mailbox or --enable-delegated-renderer";
 }
@@ skipping 427 matching lines @@
   results->availableRect = display.work_area();
   results->deviceScaleFactor = display.device_scale_factor();
   results->orientationAngle = display.RotationAsDegree();
   gfx::DeviceDisplayInfo info;
   results->depth = info.GetBitsPerPixel();
   results->depthPerComponent = info.GetBitsPerComponent();
   results->isMonochrome = (results->depthPerComponent == 0);
 }
 
 } // namespace content