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 706 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) {
+    in_shutdown_ = true;

[piman, 2012/05/09 20:19:22]

drive-by: should we test !in_shutdown_ before this? Or are we guaranteed that
once we lose the focus we'll never get it back (e.g. rapid alt-tab), and that
we'll never add another case that would also cause a shutdown?

[Daniel Erat, 2012/05/09 20:25:21]

I don't think we return to the event loop before we get killed, so I don't think
that that particular issue is a concern here.  But I was thinking about this
too, and it's safe to do and makes the code safer, so added. :-P

     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());
@@ skipping 331 matching lines @@
 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(
     RenderWidgetHost* widget) {
   return new RenderWidgetHostViewAura(widget);
 }
 
 // static
 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo(
     WebKit::WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }