Revert 39670 which breaks suggestion popup...

chrome/renderer/render_widget.cc

 // Copyright (c) 2009 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/renderer/render_widget.h"
 
 #include "base/command_line.h"
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
 #include "base/logging.h"
@@ skipping 49 matching lines @@
       closing_(false),
       ime_is_active_(false),
       ime_control_enable_ime_(true),
       ime_control_x_(-1),
       ime_control_y_(-1),
       ime_control_new_state_(false),
       ime_control_updated_(false),
       ime_control_busy_(false),
       activatable_(activatable),
       pending_window_rect_count_(0),
-      suppress_next_char_events_(false),
-      showing_popup_menu_(false),
-      popup_menu_owner_widget_(NULL) {
+      suppress_next_char_events_(false) {
   RenderProcess::current()->AddRefProcess();
   DCHECK(render_thread_);
 }
 
 RenderWidget::~RenderWidget() {
   DCHECK(!webwidget_) << "Leaking our WebWidget!";
   if (current_paint_buf_) {
     RenderProcess::current()->ReleaseTransportDIB(current_paint_buf_);
     current_paint_buf_ = NULL;
   }
@@ skipping 255 matching lines @@
     DidHandleKeyEvent();
 }
 
 void RenderWidget::OnMouseCaptureLost() {
   if (webwidget_)
     webwidget_->mouseCaptureLost();
 }
 
 void RenderWidget::OnSetFocus(bool enable) {
   has_focus_ = enable;
-  if (webwidget_) {
-    // Suppress focus / blur event if this RenderView creates a popup
-    // menu and the popup menu is showing.
-    // This is because the popup menu is a child of the RenderView and
-    // when user clicks select control to show popup, we should not
-    // consider this as focusing changes, so the focus / blur events
-    // after popup menu is showing should be suppressed. The flag
-    // will be reset once the popup menu is closed (see
-    // RenderWidget::PopupMenuClosed).
-    if (!showing_popup_menu_)
-      webwidget_->setFocus(enable);
-  }
-
+  if (webwidget_)
+    webwidget_->setFocus(enable);
   if (enable) {
     // Force to retrieve the state of the focused widget to determine if we
     // should activate IMEs next time when this process calls the UpdateIME()
     // function.
     ime_control_updated_ = true;
     ime_control_new_state_ = true;
   }
 }
 
 void RenderWidget::ClearFocus() {
@@ skipping 255 matching lines @@
     MessageLoop::current()->PostTask(FROM_HERE,
         NewRunnableMethod(this, &RenderWidget::ClearFocus));
   }
 }
 
 void RenderWidget::didBlur() {
   Send(new ViewHostMsg_Blur(routing_id_));
 }
 
 void RenderWidget::DoDeferredClose() {
-  if (popup_menu_owner_widget_.get()) {
-    popup_menu_owner_widget_->PopupMenuClosed();
-    popup_menu_owner_widget_ = NULL;
-  }
-
   Send(new ViewHostMsg_Close(routing_id_));
 }
 
 void RenderWidget::closeWidgetSoon() {
   // If a page calls window.close() twice, we'll end up here twice, but that's
   // OK.  It is safe to send multiple Close messages.
 
   // Ask the RenderWidgetHost to initiate close.  We could be called from deep
   // in Javascript.  If we ask the RendwerWidgetHost to close now, the window
   // could be closed before the JS finishes executing.  So instead, post a
@@ skipping 227 matching lines @@
 
 void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) {
   for (WebPluginGeometryVector::iterator i = plugin_window_moves_.begin();
        i != plugin_window_moves_.end(); ++i) {
     if (i->window == window) {
       plugin_window_moves_.erase(i);
       break;
     }
   }
 }
-
-void RenderWidget::SetPopupMenuOwnerWidget(RenderWidget* widget) {
-  popup_menu_owner_widget_ = widget;
-}
-
-void RenderWidget::PopupMenuClosed() {
-  showing_popup_menu_ = false;
-}