Fix focus notification for Flash fullscreen.

webkit/plugins/ppapi/ppapi_plugin_instance.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 "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 765 matching lines @@
       ScheduleAsyncDidChangeView(previous_view);
 
       // Reset the size attributes that we hacked to fill in the screen and
       // retrigger ViewChanged. Make sure we don't forward duplicates of
       // this view to the plugin.
       ResetSizeAttributesAfterFullscreen();
       return;
     }
   }
 
-  flash_fullscreen_ = (fullscreen_container_ != NULL);
+  UpdateFlashFullscreenState(fullscreen_container_ != NULL);
+
   SendDidChangeView(previous_view);
 }
 
 void PluginInstance::SetWebKitFocus(bool has_focus) {
   if (has_webkit_focus_ == has_focus)
     return;
 
   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) {
   if (has_content_area_focus_ == has_focus)
     return;
 
   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) {
   if (is_visible == view_data_.is_page_visible)
     return;  // Nothing to do.
   ViewData old_data = view_data_;
   view_data_.is_page_visible = is_visible;
   SendDidChangeView(old_data);
 }
 
@@ skipping 226 matching lines @@
   if (!plugin_zoom_interface_) {
     plugin_zoom_interface_ =
         static_cast<const PPP_Zoom_Dev*>(module_->GetPluginInterface(
             PPP_ZOOM_DEV_INTERFACE));
   }
 
   return !!plugin_zoom_interface_;
 }
 
 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 {
   return (filtered_input_event_mask_ & PP_INPUTEVENT_CLASS_TOUCH) ||
       (input_event_mask_ & PP_INPUTEVENT_CLASS_TOUCH);
 }
 
 void PluginInstance::ScheduleAsyncDidChangeView(
     const ::ppapi::ViewData& previous_view) {
   if (view_change_weak_ptr_factory_.HasWeakPtrs())
@@ skipping 257 matching lines @@
   // Unbind current 2D or 3D graphics context.
   BindGraphics(pp_instance(), 0);
   VLOG(1) << "Setting fullscreen to " << (fullscreen ? "on" : "off");
   if (fullscreen) {
     DCHECK(!fullscreen_container_);
     fullscreen_container_ = delegate_->CreateFullscreenContainer(this);
   } else {
     DCHECK(fullscreen_container_);
     fullscreen_container_->Destroy();
     fullscreen_container_ = NULL;
-    flash_fullscreen_ = false;
+    UpdateFlashFullscreenState(false);
     if (!delay_report) {
       ReportGeometry();
     } else {
       MessageLoop::current()->PostTask(
           FROM_HERE, base::Bind(&PluginInstance::ReportGeometry, this));
     }
   }
 }
 
+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) {
   if (!container_)
     return PP_ERROR_FAILED;
 
   WebDocument document = container_->element().document();
   WebFrame* frame = document.frame();
   if (!frame)
     return PP_ERROR_FAILED;
@@ skipping 855 matching lines @@
   screen_size_for_fullscreen_ = gfx::Size();
   WebElement element = container_->element();
   element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
 }
 
 }  // namespace ppapi
 }  // namespace webkit