Chromium plumbing to use the selection root bounds.

content/renderer/render_widget.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/renderer/render_widget.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/debug/trace_event_synthetic_delay.h"
@@ skipping 1481 matching lines @@
 
   // Check for whether we need to track swap buffers. We need to do that after
   // layout() because it may have switched us to accelerated compositing.
   if (is_accelerated_compositing_active_)
     using_asynchronous_swapbuffers_ = SupportsAsynchronousSwapBuffers();
 
   // The following two can result in further layout and possibly
   // enable GPU acceleration so they need to be called before any painting
   // is done.
   UpdateTextInputType();
+#if defined(OS_ANDROID)
+  UpdateSelectionRootBounds();
+#endif
   UpdateSelectionBounds();
 
   // Suppress painting if nothing is dirty.  This has to be done after updating
   // animations running layout as these may generate further invalidations.
   if (!paint_aggregator_.HasPendingUpdate()) {
     TRACE_EVENT0("renderer", "EarlyOut_NoPendingUpdate");
     InstrumentDidCancelFrame();
     return;
   }
 
@@ skipping 365 matching lines @@
   TRACE_EVENT0("gpu", "RenderWidget::willBeginCompositorFrame");
 
   DCHECK(RenderThreadImpl::current()->compositor_message_loop_proxy().get());
 
   // The following two can result in further layout and possibly
   // enable GPU acceleration so they need to be called before any painting
   // is done.
   UpdateTextInputType();
 #if defined(OS_ANDROID)
   UpdateTextInputState(false, true);
+  UpdateSelectionRootBounds();
 #endif
   UpdateSelectionBounds();
 }
 
 void RenderWidget::didBecomeReadyForAdditionalInput() {
   TRACE_EVENT0("renderer", "RenderWidget::didBecomeReadyForAdditionalInput");
   FlushPendingInputEventAck();
 }
 
 void RenderWidget::DidCommitCompositorFrame() {
@@ skipping 483 matching lines @@
   DCHECK(!handling_ime_event_);
   handling_ime_event_ = true;
 }
 
 void RenderWidget::FinishHandlingImeEvent() {
   DCHECK(handling_ime_event_);
   handling_ime_event_ = false;
   // While handling an ime event, text input state and selection bounds updates
   // are ignored. These must explicitly be updated once finished handling the
   // ime event.
+#if defined(OS_ANDROID)
+  UpdateSelectionRootBounds();
+#endif
   UpdateSelectionBounds();
 #if defined(OS_ANDROID)
   UpdateTextInputState(false, false);
 #endif
 }
 
 void RenderWidget::UpdateTextInputType() {
   // On Windows, not only an IME but also an on-screen keyboard relies on the
   // latest TextInputType to optimize its layout and functionality. Thus
   // |input_method_is_active_| is no longer an appropriate condition to suppress
@@ skipping 384 matching lines @@
 
 void RenderWidget::RegisterSwappedOutChildFrame(RenderFrameImpl* frame) {
   swapped_out_frames_.AddObserver(frame);
 }
 
 void RenderWidget::UnregisterSwappedOutChildFrame(RenderFrameImpl* frame) {
   swapped_out_frames_.RemoveObserver(frame);
 }
 
 }  // namespace content