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

plugin/cross/o3d_glue.h

Index: plugin/cross/o3d_glue.h
===================================================================
--- plugin/cross/o3d_glue.h	(revision 47689)
+++ plugin/cross/o3d_glue.h	(working copy)
@@ -70,6 +70,9 @@
 #include "core/cross/texture.h"
 #include "plugin/cross/main_thread_task_poster.h"
 #include "plugin/cross/np_v8_bridge.h"
+#ifdef OS_MACOSX
+#include "plugin/mac/fullscreen_window_mac.h"
+#endif
 #include "client_glue.h"
 #include "third_party/nixysa/static_glue/npapi/common.h"
 
@@ -134,6 +137,9 @@
 using o3d::RenderDepthStencilSurface;
 using o3d::ServiceLocator;
 using o3d::Texture2D;
+#ifdef OS_MACOSX
+using o3d::FullscreenWindowMac;
+#endif
 
 class NPAPIObject: public NPObject {
   NPP npp_;
@@ -233,24 +239,20 @@
                        GdkEvent *configure);
   void SetDisplay(Display *display);
 #elif defined(OS_MACOSX)
-#ifdef O3D_PLUGIN_ENABLE_FULLSCREEN_MSG
-  void SetFullscreenOverlayMacWindow(WindowRef window) {
-    mac_fullscreen_overlay_window_ = window;
+  FullscreenWindowMac* GetFullscreenMacWindow() {
+    return mac_fullscreen_window_.get();
   }
 
-  WindowRef GetFullscreenOverlayMacWindow() {
-    return mac_fullscreen_overlay_window_;
+  // Assumes ownership of the passed pointer. Passing NULL deletes the
+  // last non-NULL value set.
+  void SetFullscreenMacWindow(FullscreenWindowMac* window) {
+    mac_fullscreen_window_.reset(window);
   }
-#endif
 
-  void SetFullscreenMacWindow(WindowRef window) {
-    mac_fullscreen_window_ = window;
+  WindowRef GetMacWindow() {
+    return mac_window_;
   }
 
-  WindowRef GetFullscreenMacWindow() {
-    return mac_fullscreen_window_;
-  }
-
   bool ScrollIsInProgress() { return scroll_is_in_progress_; }
   void SetScrollIsInProgress(bool state) { scroll_is_in_progress_ = state; }
   bool scroll_is_in_progress_;
@@ -259,6 +261,10 @@
   bool SetRendererIsSoftware(bool state);
   bool renderer_is_software_;
 
+  AGLContext GetMacAGLContext() {
+    return mac_agl_context_;
+  }
+
   NPDrawingModel drawing_model_;
   NPEventModel event_model_;
   WindowRef mac_window_;  // may be NULL in the Chrome case
@@ -281,20 +287,9 @@
   CGLPBufferObj mac_cgl_pbuffer_;
 
   // Fullscreen related stuff.
+  // NULL if not in fullscreen mode.
+  scoped_ptr<FullscreenWindowMac> mac_fullscreen_window_;
 
-#ifdef O3D_PLUGIN_ENABLE_FULLSCREEN_MSG
-  // FullscreenIdle gets repeatedly called while we are in fullscreen mode.
-  // Currently its only task is to hide the fullscreen message at the right
-  // time.
-  void FullscreenIdle();
-  double time_to_hide_overlay_;
-#endif
-  WindowRef mac_fullscreen_window_;  // NULL if not in fullscreen modee
-#ifdef O3D_PLUGIN_ENABLE_FULLSCREEN_MSG
-  WindowRef mac_fullscreen_overlay_window_;  // NULL if not in fullscreen mode
-#endif
-  Ptr mac_fullscreen_state_;
-
 #endif  //  OS_MACOSX
 #ifdef OS_LINUX
   Window window_;