Revert of Update TextSelection for non-user initiated events

content/renderer/render_frame_impl.cc

 // Copyright 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/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 1359 matching lines @@
 #if defined(OS_MACOSX) || defined(USE_AURA)
   GetRenderWidget()->UpdateCompositionInfo(
       false /* not an immediate request */);
 #endif
 }
 
 void RenderFrameImpl::PepperSelectionChanged(
     PepperPluginInstanceImpl* instance) {
   if (instance != focused_pepper_plugin_)
     return;
-  // Keep the original behavior for pepper plugins and handle all selection
-  // change as user initiated.
-  SyncSelectionIfRequired(true);
+  SyncSelectionIfRequired();
 }
 
 RenderWidgetFullscreenPepper* RenderFrameImpl::CreatePepperFullscreenContainer(
     PepperPluginInstanceImpl* plugin) {
   GURL active_url;
   if (render_view()->webview())
     active_url = render_view()->GetURLForGraphicsContext3D();
 
   // Synchronous IPC to obtain a routing id for the fullscreen widget.
   int32_t fullscreen_widget_routing_id = MSG_ROUTING_NONE;
@@ skipping 563 matching lines @@
   base::AutoReset<bool> handling_select_range(&handling_select_range_, true);
   frame_->MoveRangeSelectionExtent(
       render_view_->ConvertWindowPointToViewport(point));
 }
 
 void RenderFrameImpl::OnReplace(const base::string16& text) {
   if (!frame_->HasSelection())
     frame_->SelectWordAroundCaret();
 
   frame_->ReplaceSelection(WebString::FromUTF16(text));
-  // Handle this selection change as user initiated since typically triggered
-  // from context menu.
-  SyncSelectionIfRequired(true);
+  SyncSelectionIfRequired();
 }
 
 void RenderFrameImpl::OnReplaceMisspelling(const base::string16& text) {
   if (!frame_->HasSelection())
     return;
 
   frame_->ReplaceMisspelledRange(WebString::FromUTF16(text));
 }
 
 void RenderFrameImpl::OnCopyImageAt(int x, int y) {
@@ skipping 658 matching lines @@
 void RenderFrameImpl::AttachGuest(int element_instance_id) {
   BrowserPluginManager::Get()->Attach(element_instance_id);
 }
 
 void RenderFrameImpl::DetachGuest(int element_instance_id) {
   BrowserPluginManager::Get()->Detach(element_instance_id);
 }
 
 void RenderFrameImpl::SetSelectedText(const base::string16& selection_text,
                                       size_t offset,
-                                      const gfx::Range& range,
-                                      bool user_initiated) {
+                                      const gfx::Range& range) {
   Send(new FrameHostMsg_SelectionChanged(routing_id_, selection_text,
-                                         static_cast<uint32_t>(offset), range,
-                                         user_initiated));
+                                         static_cast<uint32_t>(offset), range));
 }
 
 void RenderFrameImpl::EnsureMojoBuiltinsAreAvailable(
     v8::Isolate* isolate,
     v8::Local<v8::Context> context) {
   gin::ModuleRegistry* registry = gin::ModuleRegistry::From(context);
   if (registry->available_modules().count(mojo::edk::js::Core::kModuleName))
     return;
 
   v8::HandleScope handle_scope(isolate);
@@ skipping 1510 matching lines @@
   if (previews_state_ & SERVER_LOFI_ON)
     return request.Url().ProtocolIs("https");
   return true;
 }
 
 void RenderFrameImpl::AbortClientNavigation() {
   Send(new FrameHostMsg_AbortNavigation(routing_id_));
 }
 
 void RenderFrameImpl::DidChangeSelection(bool is_empty_selection) {
-  bool user_initiated =
-      GetRenderWidget()->input_handler().handling_input_event() ||
-      handling_select_range_;
+  if (!GetRenderWidget()->input_handler().handling_input_event() &&
+      !handling_select_range_)
+    return;
 
   if (is_empty_selection)
     selection_text_.clear();
 
   // UpdateTextInputState should be called before SyncSelectionIfRequired.
   // UpdateTextInputState may send TextInputStateChanged to notify the focus
   // was changed, and SyncSelectionIfRequired may send SelectionChanged
   // to notify the selection was changed.  Focus change should be notified
   // before selection change.
   GetRenderWidget()->UpdateTextInputState();
-  SyncSelectionIfRequired(user_initiated);
+  SyncSelectionIfRequired();
 }
 
 bool RenderFrameImpl::HandleCurrentKeyboardEvent() {
   bool did_execute_command = false;
   for (auto command : GetRenderWidget()->edit_commands()) {
     // In gtk and cocoa, it's possible to bind multiple edit commands to one
     // key (but it's the exception). Once one edit command is not executed, it
     // seems safest to not execute the rest.
     if (!frame_->ExecuteCommand(blink::WebString::FromUTF8(command.name),
                                 blink::WebString::FromUTF8(command.value)))
@@ skipping 2070 matching lines @@
   }
 }
 
 void RenderFrameImpl::UpdateEncoding(WebFrame* frame,
                                      const std::string& encoding_name) {
   // Only update main frame's encoding_name.
   if (!frame->Parent())
     Send(new FrameHostMsg_UpdateEncoding(routing_id_, encoding_name));
 }
 
-void RenderFrameImpl::SyncSelectionIfRequired(bool user_initiated) {
+void RenderFrameImpl::SyncSelectionIfRequired() {
   base::string16 text;
-  size_t offset = 0;
-  gfx::Range range = gfx::Range::InvalidRange();
+  size_t offset;
+  gfx::Range range;
 #if BUILDFLAG(ENABLE_PLUGINS)
   if (focused_pepper_plugin_) {
     focused_pepper_plugin_->GetSurroundingText(&text, &range);
     offset = 0;  // Pepper API does not support offset reporting.
     // TODO(kinaba): cut as needed.
   } else
 #endif
   {
     WebRange selection =
         GetRenderWidget()->GetWebWidget()->CaretOrSelectionRange();
+    if (selection.IsNull())
+      return;
 
-    // When clearing text selection from JavaScript the selection range
-    // might be null but the selected text still have to be updated.
-    // Do not cancel sync selection if the clear was not user initiated.
-    if (!selection.IsNull()) {
-      range = gfx::Range(selection.StartOffset(), selection.EndOffset());
+    range = gfx::Range(selection.StartOffset(), selection.EndOffset());
 
-      if (frame_->GetInputMethodController()->TextInputType() !=
-          blink::kWebTextInputTypeNone) {
-        // If current focused element is editable, we will send 100 more chars
-        // before and after selection. It is for input method surrounding text
-        // feature.
-        if (selection.StartOffset() > kExtraCharsBeforeAndAfterSelection)
-          offset = selection.StartOffset() - kExtraCharsBeforeAndAfterSelection;
-        else
-          offset = 0;
-        size_t length =
-            selection.EndOffset() - offset + kExtraCharsBeforeAndAfterSelection;
-        text = frame_->RangeAsText(WebRange(offset, length)).Utf16();
-      } else {
-        offset = selection.StartOffset();
-        text = frame_->SelectionAsText().Utf16();
-        // http://crbug.com/101435
-        // In some case, frame->selectionAsText() returned text's length is not
-        // equal to the length returned from
-        // GetWebWidget()->caretOrSelectionRange().
-        // So we have to set the range according to text.length().
-        range.set_end(range.start() + text.length());
-      }
-    } else if (user_initiated) {
-      return;
+    if (frame_->GetInputMethodController()->TextInputType() !=
+        blink::kWebTextInputTypeNone) {
+      // If current focused element is editable, we will send 100 more chars
+      // before and after selection. It is for input method surrounding text
+      // feature.
+      if (selection.StartOffset() > kExtraCharsBeforeAndAfterSelection)
+        offset = selection.StartOffset() - kExtraCharsBeforeAndAfterSelection;
+      else
+        offset = 0;
+      size_t length =
+          selection.EndOffset() - offset + kExtraCharsBeforeAndAfterSelection;
+      text = frame_->RangeAsText(WebRange(offset, length)).Utf16();
+    } else {
+      offset = selection.StartOffset();
+      text = frame_->SelectionAsText().Utf16();
+      // http://crbug.com/101435
+      // In some case, frame->selectionAsText() returned text's length is not
+      // equal to the length returned from
+      // GetWebWidget()->caretOrSelectionRange().
+      // So we have to set the range according to text.length().
+      range.set_end(range.start() + text.length());
     }
   }
 
   // TODO(dglazkov): Investigate if and why this would be happening,
   // and resolve this. We shouldn't be carrying selection text here.
   // http://crbug.com/632920.
   // Sometimes we get repeated didChangeSelection calls from webkit when
   // the selection hasn't actually changed. We don't want to report these
   // because it will cause us to continually claim the X clipboard.
   if (selection_text_offset_ != offset ||
       selection_range_ != range ||
       selection_text_ != text) {
     selection_text_ = text;
     selection_text_offset_ = offset;
     selection_range_ = range;
-    SetSelectedText(text, offset, range, user_initiated);
+    SetSelectedText(text, offset, range);
   }
   GetRenderWidget()->UpdateSelectionBounds();
 }
 
 void RenderFrameImpl::InitializeUserMediaClient() {
   RenderThreadImpl* render_thread = RenderThreadImpl::current();
   if (!render_thread)  // Will be NULL during unit tests.
     return;
 
 #if BUILDFLAG(ENABLE_WEBRTC)
@@ skipping 709 matching lines @@
       policy(info.default_policy),
       replaces_current_history_item(info.replaces_current_history_item),
       history_navigation_in_new_child_frame(
           info.is_history_navigation_in_new_child_frame),
       client_redirect(info.is_client_redirect),
       cache_disabled(info.is_cache_disabled),
       form(info.form),
       source_location(info.source_location) {}
 
 }  // namespace content