touchui: Fine-tune selection-controller visibility.

chrome/browser/renderer_host/render_widget_host_view_views.cc

 // Copyright (c) 2011 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 "chrome/browser/renderer_host/render_widget_host_view_views.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 25 matching lines @@
 #include <gtk/gtkwindow.h>
 #include <gdk/gdkx.h>
 #endif
 
 #if defined(TOUCH_UI)
 #include "chrome/browser/renderer_host/accelerated_surface_container_touch.h"
 #endif
 
 static const int kMaxWindowWidth = 4000;
 static const int kMaxWindowHeight = 4000;
+static const int kTouchControllerUpdateDelay = 150;
 
 // static
 const char RenderWidgetHostViewViews::kViewClassName[] =
     "browser/renderer_host/RenderWidgetHostViewViews";
 
 using WebKit::WebInputEventFactory;
 using WebKit::WebMouseWheelEvent;
 using WebKit::WebTouchEvent;
 
 namespace {
@@ skipping 32 matching lines @@
       about_to_validate_and_paint_(false),
       is_hidden_(false),
       is_loading_(false),
       native_cursor_(NULL),
       is_showing_context_menu_(false),
       visually_deemphasized_(false),
       touch_event_(),
       text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
       has_composition_text_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(touch_selection_controller_(
-          views::TouchSelectionController::create(this))) {
+          views::TouchSelectionController::create(this))),
+      ALLOW_THIS_IN_INITIALIZER_LIST(update_touch_selection_(this)) {
   set_focusable(true);
   host_->SetView(this);
 
 #if defined(TOUCH_UI)
   SetPaintToLayer(true);
   SetFillsBoundsOpaquely(true);
 #endif
 }
 
 RenderWidgetHostViewViews::~RenderWidgetHostViewViews() {
@@ skipping 40 matching lines @@
 void RenderWidgetHostViewViews::DidBecomeSelected() {
   if (!is_hidden_)
     return;
 
   if (tab_switch_paint_time_.is_null())
     tab_switch_paint_time_ = base::TimeTicks::Now();
   is_hidden_ = false;
   if (host_)
     host_->WasRestored();
 
-  if (touch_selection_controller_.get()) {
-    touch_selection_controller_->SelectionChanged(selection_start_,
-                                                  selection_end_);
-  }
+  UpdateTouchSelectionController();
 }
 
 void RenderWidgetHostViewViews::WasHidden() {
   if (is_hidden_)
     return;
 
   // If we receive any more paint messages while we are hidden, we want to
   // ignore them so we don't re-allocate the backing store.  We will paint
   // everything again when we become selected again.
   is_hidden_ = true;
@@ skipping 166 matching lines @@
 }
 
 void RenderWidgetHostViewViews::SelectionChanged(const std::string& text,
                                                  const ui::Range& range,
                                                  const gfx::Point& start,
                                                  const gfx::Point& end) {
   // TODO(anicolao): deal with the clipboard without GTK
   NOTIMPLEMENTED();
   selection_start_ = start;
   selection_end_ = end;
-  if (touch_selection_controller_.get())
-    touch_selection_controller_->SelectionChanged(start, end);
+
+  // TODO(sad): This is a workaround for a webkit bug:
+  // https://bugs.webkit.org/show_bug.cgi?id=67464
+  // Remove this when the bug gets fixed.
+  //
+  // Webkit can send spurious selection-change on text-input (e.g. when
+  // inserting text at the beginning of a non-empty text control). But in those
+  // cases, it does send the correct selection information quickly afterwards.
+  // So delay the notification to the touch-selection controller.
+  if (update_touch_selection_.empty()) {
+    MessageLoop::current()->PostDelayedTask(FROM_HERE,
+        update_touch_selection_.NewRunnableMethod(

[sky, 2011/09/06 17:43:27]

Make sure we don't send this if we've lost focus between when the selection
changes and UpdateTouchSelectionController fires.

[sadrul, 2011/09/06 20:23:31]

Good point. Done.

+          &RenderWidgetHostViewViews::UpdateTouchSelectionController),
+        kTouchControllerUpdateDelay);
+  }
 }
 
 void RenderWidgetHostViewViews::ShowingContextMenu(bool showing) {
   is_showing_context_menu_ = showing;
 }
 
 BackingStore* RenderWidgetHostViewViews::AllocBackingStore(
     const gfx::Size& size) {
   return new BackingStoreSkia(host_, size);
 }
@@ skipping 448 matching lines @@
 
 void RenderWidgetHostViewViews::FinishImeCompositionSession() {
   if (!has_composition_text_)
     return;
   if (host_)
     host_->ImeConfirmComposition();
   DCHECK(GetInputMethod());
   GetInputMethod()->CancelComposition(this);
   has_composition_text_ = false;
 }
+
+void RenderWidgetHostViewViews::UpdateTouchSelectionController() {
+  if (touch_selection_controller_.get())
+    touch_selection_controller_->SelectionChanged(selection_start_,
+                                                  selection_end_);
+}