aura: Close fullscreen RenderWidgetHostViewAura on blur.

content/browser/renderer_host/render_widget_host_view_aura.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_aura.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 175 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ResizeLock);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewAura, public:
 
 RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host)
     : host_(RenderWidgetHostImpl::From(host)),
       ALLOW_THIS_IN_INITIALIZER_LIST(window_(new aura::Window(this))),
+      in_shutdown_(false),
       is_fullscreen_(false),
       popup_parent_host_view_(NULL),
       popup_child_host_view_(NULL),
       is_loading_(false),
       text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
       can_compose_inline_(true),
       has_composition_text_(false),
       current_surface_(0),
       paint_canvas_(NULL),
       synthetic_move_sent_(false),
@@ skipping 187 matching lines @@
 void RenderWidgetHostViewAura::RenderViewGone(base::TerminationStatus status,
                                               int error_code) {
   UpdateCursorIfOverSelf();
   Destroy();
 }
 
 void RenderWidgetHostViewAura::Destroy() {
   // Beware, this function is not called on all destruction paths. It will
   // implicitly end up calling ~RenderWidgetHostViewAura though, so all
   // destruction/cleanup code should happen there, not here.
+  in_shutdown_ = true;

[Daniel Erat, 2012/05/11 22:56:48]

The destruction process for RWHVA seems very fragile to me.  There are multiple
paths to trigger it (e.g. Escape key or blur make us send call the host's
Shutdown method, but we also get notified about blur if we close our window for
some other reason while we have the focus).

   delete window_;
 }
 
 void RenderWidgetHostViewAura::SetTooltipText(const string16& tooltip_text) {
   tooltip_ = tooltip_text;
   aura::RootWindow* root_window = window_->GetRootWindow();
   if (aura::client::GetTooltipClient(root_window))
     aura::client::GetTooltipClient(root_window)->UpdateTooltip(window_);
 }
 
@@ skipping 499 matching lines @@
   } else {
     host_->SetInputMethodActive(false);
   }
 }
 
 void RenderWidgetHostViewAura::OnBlur() {
   host_->SetActive(false);
   host_->Blur();
 
   ui::InputMethod* input_method = GetInputMethod();
-  if (input_method) {
-    if (input_method->GetTextInputClient() == this)
-      input_method->SetFocusedTextInputClient(NULL);
+  if (input_method && input_method->GetTextInputClient() == this)
+    input_method->SetFocusedTextInputClient(NULL);
+  host_->SetInputMethodActive(false);
+
+  // If we lose the focus while fullscreen, close the window; Pepper Flash won't
+  // do it for us (unlike NPAPI Flash).
+  if (is_fullscreen_ && !in_shutdown_) {
+    in_shutdown_ = true;
+    host_->Shutdown();
   }
-  host_->SetInputMethodActive(false);
 }
 
 bool RenderWidgetHostViewAura::OnKeyEvent(aura::KeyEvent* event) {
   if (popup_child_host_view_ && popup_child_host_view_->NeedsInputGrab() &&
       popup_child_host_view_->OnKeyEvent(event))
     return true;
 
   // We need to handle the Escape key for Pepper Flash.
   if (is_fullscreen_ && event->key_code() == ui::VKEY_ESCAPE) {
-    host_->Shutdown();
+    if (!in_shutdown_) {
+      in_shutdown_ = true;
+      host_->Shutdown();
+    }
   } else {
     // We don't have to communicate with an input method here.
     if (!event->HasNativeEvent()) {
       // Send a fabricated event, which is usually a VKEY_PROCESSKEY IME event.
       NativeWebKeyboardEvent webkit_event(event->type(),
                                           false /* is_char */,
                                           event->GetCharacter(),
                                           event->flags(),
                                           base::Time::Now().ToDoubleT());
       host_->ForwardKeyboardEvent(webkit_event);
@@ skipping 330 matching lines @@
 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(
     RenderWidgetHost* widget) {
   return new RenderWidgetHostViewAura(widget);
 }
 
 // static
 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo(
     WebKit::WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }