Refactored full-screen code under FullscreenWindowMac base class and...

plugin/mac/main_mac.mm

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 38 matching lines @@
 #include "core/cross/event.h"
 #include "statsreport/metrics.h"
 #include "plugin/cross/config.h"
 #include "plugin/cross/plugin_logging.h"
 #include "plugin/cross/plugin_metrics.h"
 #include "plugin/cross/o3d_glue.h"
 #include "plugin/cross/out_of_memory.h"
 #include "plugin/cross/whitelist.h"
 #include "plugin/mac/plugin_mac.h"
 #include "plugin/mac/graphics_utils_mac.h"
+#include "plugin/mac/fullscreen_window_mac.h"
 #import "plugin/mac/o3d_layer.h"
 
 
 #if !defined(O3D_INTERNAL_PLUGIN)
 o3d::PluginLogging* g_logger = NULL;
 bool g_logging_initialized = false;
 #endif
 
 using glue::_o3d::PluginObject;
 using glue::StreamManager;
 using o3d::Bitmap;
 using o3d::DisplayWindowMac;
 using o3d::Event;
+using o3d::FullscreenWindowMac;
 using o3d::Renderer;
 
 namespace {
 // We would normally make this a stack variable in main(), but in a
 // plugin, that's not possible, so we make it a global. When the DLL is loaded
 // this it gets constructed and when it is unlooaded it is destructed. Note
 // that this cannot be done in NP_Initialize and NP_Shutdown because those
 // calls do not necessarily signify the DLL being loaded and unloaded. If the
 // DLL is not unloaded then the values of global variables are preserved.
 base::AtExitManager g_at_exit_manager;
@@ skipping 216 matching lines @@
       LOG(FATAL) << "Unknown mouse event: " << the_event->what;
       return;
   }
 
   last_mouse_loc = the_event->where;
   bool in_plugin = false;  // Did the event happen within our drawing region?
 
   int x, y;
   // now make x and y plugin relative coords
   if (obj->GetFullscreenMacWindow()) {
-    Rect  wBounds;
-    GetWindowBounds(obj->GetFullscreenMacWindow(), kWindowGlobalPortRgn,
-                    &wBounds);
+    Rect wBounds = o3d::CGRect2Rect(
+        obj->GetFullscreenMacWindow()->GetWindowBounds());
     x = screen_x - wBounds.left;
     y = screen_y - wBounds.top;
     in_plugin = true;
   } else {
     Rect  wBounds;
     GetWindowBounds(obj->mac_window_, kWindowGlobalPortRgn, &wBounds);
     x = screen_x - wBounds.left - obj->last_plugin_loc_.h;
     y = screen_y - wBounds.top - obj->last_plugin_loc_.v;
     in_plugin = x >=0 && y >= 0 && x < obj->width() && y < obj->height();
   }
@@ skipping 142 matching lines @@
 }
 
 // Handle an NPCocoaEvent style event. The Cocoa event interface is
 // a recent addition to the NAPI spec.
 // See https://wiki.mozilla.org/Mac:NPAPI_Event_Models for further details.
 // The principle advantages are that we can get scrollwheel messages,
 // mouse-moved messages, and can tell which mouse button was pressed.
 // This API will also be required for a carbon-free 64 bit version for 10.6.
 bool HandleCocoaEvent(NPP instance, NPCocoaEvent* the_event) {
   PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
-  WindowRef fullscreen_window = obj->GetFullscreenMacWindow();
+  FullscreenWindowMac* fullscreen_window = obj->GetFullscreenMacWindow();
   bool handled = false;
 
   if (g_logger) g_logger->UpdateLogging();
 
   obj->MacEventReceived();
   switch (the_event->type) {
     case NPCocoaEventDrawRect:
       // We need to call the render callback from here if we are rendering
       // off-screen because it doesn't get called anywhere else.
       if (obj->drawing_model_ == NPDrawingModelCoreAnimation) {
@@ skipping 61 matching lines @@
         obj->mac_surface_hidden_ = false;
         NPN_ForceRedraw(instance);  // invalidate to cause a redraw
       }
 
       // Auto-recovery for any situation where another window comes in front
       // of the fullscreen window and we need to exit fullscreen mode.
       // This can happen because another browser window has come forward, or
       // because another app has been called to the front.
       // TODO: We'll have problems with this when dealing with e.g.
       // Japanese text input IME windows.
-      if (fullscreen_window && fullscreen_window != ActiveNonFloatingWindow()) {
+      if (fullscreen_window && !fullscreen_window->IsActive()) {
         obj->CancelFullscreenDisplay();
       }
 
       break;
     case NPCocoaEventTextInput:
       break;
   }
 
   return handled;
 }
@@ skipping 273 matching lines @@
     default:
       return NPERR_INVALID_PARAM;
   }
 
   return NPERR_INVALID_PARAM;
 }
 
 bool HandleMacEvent(EventRecord* the_event, NPP instance) {
   PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
   bool handled = false;
-  WindowRef fullscreen_window = obj->GetFullscreenMacWindow();
+  FullscreenWindowMac* fullscreen_window = obj->GetFullscreenMacWindow();
 
   if (g_logger) g_logger->UpdateLogging();
 
   // Help the plugin keep track of when we last saw an event so the CFTimer can
   // notice if we get cut off, eg by our tab being hidden by Safari, which there
   // is no other way for us to detect.
   obj->MacEventReceived();
 
   switch (the_event->what) {
     case nullEvent:
@@ skipping 10 matching lines @@
       // Safari tab switching recovery code.
       if (obj->mac_surface_hidden_) {
         obj->mac_surface_hidden_ = false;
         NPN_ForceRedraw(instance);  // invalidate to cause a redraw
       }
 
       // Auto-recovery for any situation where another window comes in front
       // of the fullscreen window and we need to exit fullscreen mode.
       // This can happen because another browser window has come forward, or
       // because another app has been called to the front.
-      if (fullscreen_window && fullscreen_window != ActiveNonFloatingWindow()) {
+      if (fullscreen_window && !fullscreen_window->IsActive()) {
         obj->CancelFullscreenDisplay();
       }
 
       // Send nullEvents to HandleMouseEvent so they can be used to simulate
       // mouse moved events. Not needed in fullscreen mode, where we really do
       // get mouse moved events. See the osEvt case below.
       if (!fullscreen_window)
         HandleMouseEvent(obj, the_event);
 
       handled = true;
@@ skipping 473 matching lines @@
   if (obj->event_model_ == NPEventModelCarbon) {
     EventRecord* theEvent = static_cast<EventRecord*>(event);
     return HandleMacEvent(theEvent, instance) ? 1 : 0;
   } else if (obj->event_model_ == NPEventModelCocoa){
     return HandleCocoaEvent(instance, (NPCocoaEvent*)event) ? 1 : 0;
   }
   return 0;
 }
 
 }  //  namespace o3d