Fix focus notification for Flash fullscreen.

webkit/plugins/ppapi/ppapi_plugin_instance.cc

Index: webkit/plugins/ppapi/ppapi_plugin_instance.cc
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index f8055b95c0b3aabba8546fd428632f6f674565cf..6fca59fb307f8cb779ec34396f5c5323f8311b24 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -783,7 +783,8 @@ void PluginInstance::ViewChanged(const gfx::Rect& position,
     }
   }
 
-  flash_fullscreen_ = (fullscreen_container_ != NULL);
+  UpdateFlashFullscreenState(fullscreen_container_ != NULL);
+
   SendDidChangeView(previous_view);
 }
 
@@ -793,11 +794,8 @@ void PluginInstance::SetWebKitFocus(bool has_focus) {
 
   bool old_plugin_focus = PluginHasFocus();
   has_webkit_focus_ = has_focus;
-  if (PluginHasFocus() != old_plugin_focus) {
-    delegate()->PluginFocusChanged(this, PluginHasFocus());
-    instance_interface_->DidChangeFocus(pp_instance(),
-                                        PP_FromBool(PluginHasFocus()));
-  }
+  if (PluginHasFocus() != old_plugin_focus)
+    SendFocusChangeNotification();
 }
 
 void PluginInstance::SetContentAreaFocus(bool has_focus) {
@@ -806,10 +804,8 @@ void PluginInstance::SetContentAreaFocus(bool has_focus) {
 
   bool old_plugin_focus = PluginHasFocus();
   has_content_area_focus_ = has_focus;
-  if (PluginHasFocus() != old_plugin_focus) {
-    instance_interface_->DidChangeFocus(pp_instance(),
-                                        PP_FromBool(PluginHasFocus()));
-  }
+  if (PluginHasFocus() != old_plugin_focus)
+    SendFocusChangeNotification();
 }
 
 void PluginInstance::PageVisibilityChanged(bool is_visible) {
@@ -1056,7 +1052,13 @@ bool PluginInstance::LoadZoomInterface() {
 }
 
 bool PluginInstance::PluginHasFocus() const {
-  return has_webkit_focus_ && has_content_area_focus_;
+  return flash_fullscreen_ || (has_webkit_focus_ && has_content_area_focus_);
+}
+
+void PluginInstance::SendFocusChangeNotification() {
+  bool has_focus = PluginHasFocus();
+  delegate()->PluginFocusChanged(this, has_focus);
+  instance_interface_->DidChangeFocus(pp_instance(), PP_FromBool(has_focus));
 }
 
 bool PluginInstance::IsAcceptingTouchEvents() const {
@@ -1334,7 +1336,7 @@ void PluginInstance::FlashSetFullscreen(bool fullscreen, bool delay_report) {
     DCHECK(fullscreen_container_);
     fullscreen_container_->Destroy();
     fullscreen_container_ = NULL;
-    flash_fullscreen_ = false;
+    UpdateFlashFullscreenState(false);
     if (!delay_report) {
       ReportGeometry();
     } else {
@@ -1344,6 +1346,16 @@ void PluginInstance::FlashSetFullscreen(bool fullscreen, bool delay_report) {
   }
 }
 
+void PluginInstance::UpdateFlashFullscreenState(bool flash_fullscreen) {
+  if (flash_fullscreen == flash_fullscreen_)
+    return;
+
+  bool old_plugin_focus = PluginHasFocus();
+  flash_fullscreen_ = flash_fullscreen;
+  if (PluginHasFocus() != old_plugin_focus)

[brettw, 2012/07/17 20:06:14]

This seems wrong. The old_plugin_focus value was just set from PluginHasFocus
above and I don't think it could have changed in the meantime.

[yzshen1, 2012/07/18 01:17:58]

PluginHasFocus() was changed and it is now determined by flash_fullscreen_ and
has_*_focus_, so it is possible that PluginHasFocus() is different from
old_plugin_focus after line 1354.

On 2012/07/17 20:06:14, brettw wrote:

+    SendFocusChangeNotification();
+}
+
 int32_t PluginInstance::Navigate(PPB_URLRequestInfo_Impl* request,
                                  const char* target,
                                  bool from_user_action) {