Revert of Browser Side Text Input State Tracking for OOPIF.

content/browser/renderer_host/render_widget_host_view_base.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_base.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_target_base.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
-#include "content/browser/renderer_host/render_view_host_delegate.h"
-#include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base_observer.h"
 #include "content/common/content_switches_internal.h"
-#include "content/common/input_messages.h"
-#include "content/common/site_isolation_policy.h"
-#include "content/common/text_input_state.h"
-#include "content/common/view_messages.h"
 #include "content/public/browser/render_widget_host_view_frame_subscriber.h"
-#include "content/public/common/browser_plugin_guest_mode.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/geometry/size_f.h"
 #include "ui/gfx/screen.h"
 
 namespace content {
 
 namespace {
 
 // How many microseconds apart input events should be flushed.
 const int kFlushInputRateInUs = 16666;
 
 }
 
 RenderWidgetHostViewBase::RenderWidgetHostViewBase()
     : popup_type_(blink::WebPopupTypeNone),
       background_color_(SK_ColorWHITE),
       mouse_locked_(false),
       showing_context_menu_(false),
       selection_text_offset_(0),
       selection_range_(gfx::Range::InvalidRange()),
       current_device_scale_factor_(0),
       current_display_rotation_(gfx::Display::ROTATE_0),
       pinch_zoom_enabled_(content::IsPinchToZoomEnabled()),
       renderer_frame_number_(0),
-      text_input_state_(new TextInputState()),
       weak_factory_(this) {}
 
 RenderWidgetHostViewBase::~RenderWidgetHostViewBase() {
   DCHECK(!mouse_locked_);
   // We call this here to guarantee that observers are notified before we go
   // away. However, some subclasses may wish to call this earlier in their
   // shutdown process, e.g. to force removal from
   // RenderWidgetHostInputEventRouter's surface map before relinquishing a
   // host pointer, as in RenderWidgetHostViewGuest. There is no harm in calling
   // NotifyObserversAboutShutdown() twice, as the observers are required to
   // de-register on the first call, and so the second call does nothing.
   NotifyObserversAboutShutdown();
 }
 
 void RenderWidgetHostViewBase::NotifyObserversAboutShutdown() {
   // Note: RenderWidgetHostInputEventRouter is an observer, and uses the
   // following notification to remove this view from its surface owners map.
   FOR_EACH_OBSERVER(RenderWidgetHostViewBaseObserver,
                     observers_,
                     OnRenderWidgetHostViewBaseDestroyed(this));
   // All observers are required to disconnect after they are notified.
   DCHECK(!observers_.might_have_observers());
 }
 
-void RenderWidgetHostViewBase::NotifyHostDelegateAboutShutdown() {
-  RenderWidgetHostImpl* host =
-      RenderWidgetHostImpl::From(GetRenderWidgetHost());
-
-  if (!host || !host->delegate())
-    return;
-
-  bool has_active_text = text_input_state()->type != ui::TEXT_INPUT_TYPE_NONE;
-  text_input_state_.reset(new TextInputState());
-
-  host->delegate()->UpdateTextInputState(this, has_active_text);
-}
-
 bool RenderWidgetHostViewBase::OnMessageReceived(const IPC::Message& msg){
   return false;
 }
 
 void RenderWidgetHostViewBase::SetBackgroundColor(SkColor color) {
   background_color_ = color;
 }
 
 void RenderWidgetHostViewBase::SetBackgroundColorToDefault() {
   SetBackgroundColor(SK_ColorWHITE);
@@ skipping 143 matching lines @@
       current_display_rotation_ == display.rotation()) {
     return false;
   }
 
   current_display_area_ = display.work_area();
   current_device_scale_factor_ = display.device_scale_factor();
   current_display_rotation_ = display.rotation();
   return true;
 }
 
-void RenderWidgetHostViewBase::TextInputStateChanged(
-    const TextInputState& params) {
-  bool text_input_state_changed = true;
-#if !defined(OS_ANDROID)
-  if (params.type == text_input_state_->type &&
-      params.can_compose_inline == text_input_state_->can_compose_inline
-#if !defined(OS_MACOSX)
-      && params.mode == text_input_state_->mode &&
-      params.flags == text_input_state_->flags
-#endif
-      )
-    text_input_state_changed = false;
-#else
-  if (params.is_non_ime_change) {
-    // Sends an acknowledgement to the renderer of a processed IME event.
-    GetRenderWidgetHost()->Send(
-        new InputMsg_ImeEventAck(GetRenderWidgetHost()->GetRoutingID()));
-  }
-#endif
-
-  if (text_input_state_changed) {
-    *text_input_state_ = params;
-    RenderWidgetHostImpl* host =
-        RenderWidgetHostImpl::From(GetRenderWidgetHost());
-    if (host && host->delegate())
-      host->delegate()->UpdateTextInputState(this, text_input_state_changed);
-  }
-}
-
 base::WeakPtr<RenderWidgetHostViewBase> RenderWidgetHostViewBase::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
 scoped_ptr<SyntheticGestureTarget>
 RenderWidgetHostViewBase::CreateSyntheticGestureTarget() {
   RenderWidgetHostImpl* host =
       RenderWidgetHostImpl::From(GetRenderWidgetHost());
   return scoped_ptr<SyntheticGestureTarget>(
       new SyntheticGestureTargetBase(host));
@@ skipping 153 matching lines @@
 
 bool RenderWidgetHostViewBase::IsChildFrameForTesting() const {
   return false;
 }
 
 cc::SurfaceId RenderWidgetHostViewBase::SurfaceIdForTesting() const {
   return cc::SurfaceId();
 }
 
 }  // namespace content