Revert of Browser Side Text Input State Tracking for OOPIF (Manual).

content/browser/frame_host/interstitial_page_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/browser/frame_host/interstitial_page_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 16 matching lines @@
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/web_contents/web_contents_view.h"
 #include "content/common/frame_messages.h"
 #include "content/common/input_messages.h"
-#include "content/common/text_input_state.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/user_metrics.h"
@@ skipping 118 matching lines @@
                   this,
                   static_cast<WebContentsImpl*>(web_contents)),
       original_child_id_(web_contents->GetRenderProcessHost()->GetID()),
       original_rvh_id_(web_contents->GetRenderViewHost()->GetRoutingID()),
       should_revert_web_contents_title_(false),
       resource_dispatcher_host_notified_(false),
       rvh_delegate_view_(new InterstitialPageRVHDelegateView(this)),
       create_view_(true),
       pause_throbber_(false),
       delegate_(delegate),
-      text_input_state_(new TextInputState()),
       weak_ptr_factory_(this) {
   InitInterstitialPageMap();
 }
 
 InterstitialPageImpl::~InterstitialPageImpl() {
 }
 
 void InterstitialPageImpl::Show() {
   if (!enabled())
     return;
@@ skipping 346 matching lines @@
   delegate_->OverrideRendererPrefs(&renderer_preferences_);
   return renderer_preferences_;
 }
 
 void InterstitialPageImpl::RenderWidgetDeleted(
     RenderWidgetHostImpl* render_widget_host) {
   // TODO(creis): Remove this method once we verify the shutdown path is sane.
   CHECK(!web_contents_);
 }
 
-const TextInputState* InterstitialPageImpl::GetTextInputState() {
-  return text_input_state_.get();
-}
-
-void InterstitialPageImpl::UpdateTextInputState(RenderWidgetHostViewBase* rwhv,
-                                                bool text_input_state_changed) {
-  if (web_contents_) {
-    WebContentsImpl* contents = static_cast<WebContentsImpl*>(web_contents_);
-    contents->UpdateTextInputState(rwhv, text_input_state_changed);
-    *text_input_state_ = *contents->GetTextInputState();
-  }
-}
-
 bool InterstitialPageImpl::PreHandleKeyboardEvent(
     const NativeWebKeyboardEvent& event,
     bool* is_keyboard_shortcut) {
   if (!enabled())
     return false;
   return render_widget_host_delegate_->PreHandleKeyboardEvent(
       event, is_keyboard_shortcut);
 }
 
 void InterstitialPageImpl::HandleKeyboardEvent(
@@ skipping 374 matching lines @@
 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted(
     const LoadCommittedDetails& load_details) {
   interstitial_->OnNavigatingAwayOrTabClosing();
 }
 
 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() {
   interstitial_->OnNavigatingAwayOrTabClosing();
 }
 
 }  // namespace content