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

plugin/cross/o3d_glue.h

 /*
  * 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 52 matching lines @@
 #include "core/cross/client_info.h"
 #include "core/cross/cursor.h"
 #include "core/cross/features.h"
 #include "core/cross/object_manager.h"
 #include "core/cross/error.h"
 #include "core/cross/profiler.h"
 #include "core/cross/render_surface.h"
 #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"
 
 namespace o3d {
 class Client;
 class Renderer;
 }
 
 // Hashes the NPClass and ObjectBase types so they can be used in a hash_map.
 #if defined(COMPILER_GCC)
@@ skipping 44 matching lines @@
 using o3d::Features;
 using o3d::EvaluationCounter;
 using o3d::MainThreadTaskPoster;
 using o3d::ObjectManager;
 using o3d::Profiler;
 using o3d::Renderer;
 using o3d::RenderSurface;
 using o3d::RenderDepthStencilSurface;
 using o3d::ServiceLocator;
 using o3d::Texture2D;
+#ifdef OS_MACOSX
+using o3d::FullscreenWindowMac;
+#endif
 
 class NPAPIObject: public NPObject {
   NPP npp_;
   Id id_;
   bool mapped_;
  public:
   explicit NPAPIObject(NPP npp): npp_(npp), id_(0), mapped_(false) {}
   void Initialize(const ObjectBase *object) { id_ = object->id(); }
   NPP npp() const { return npp_; }
   Id id() const { return id_; }
@@ skipping 79 matching lines @@
   bool got_dblclick() const { return got_dblclick_; }
   void set_got_dblclick(bool got_dblclick) { got_dblclick_ = got_dblclick; }
 #elif defined(OS_LINUX)
   void SetGtkEventSource(GtkWidget *widget);
   gboolean OnGtkConfigure(GtkWidget *widget,
                           GdkEventConfigure *configure_event);
   gboolean OnGtkDelete(GtkWidget *widget,
                        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_;
-  }
-#endif
-
-  void SetFullscreenMacWindow(WindowRef window) {
-    mac_fullscreen_window_ = 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);
   }
 
-  WindowRef GetFullscreenMacWindow() {
-    return mac_fullscreen_window_;
+  WindowRef GetMacWindow() {
+    return mac_window_;
   }
 
   bool ScrollIsInProgress() { return scroll_is_in_progress_; }
   void SetScrollIsInProgress(bool state) { scroll_is_in_progress_ = state; }
   bool scroll_is_in_progress_;
 
   bool RendererIsSoftware() {return renderer_is_software_;}
   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
   // these vars needed for the Safari tab switch detection hack
   CFDateRef last_mac_event_time_;
   void * mac_cocoa_window_;
   void* mac_window_selected_tab_;
   bool mac_surface_hidden_;
   // end of Safari tab detection vars
   GLint last_buffer_rect_[4];
   Point last_plugin_loc_;
   // can be a CGrafPtr, a CGContextRef or NULL depending on drawing_model
   void* mac_2d_context_;
   // either can be NULL depending on drawing_model
   AGLContext mac_agl_context_;
   CGLContextObj mac_cgl_context_;
   void *gl_layer_;
   // If in Chrome, we actually do all of our rendering offscreen, and
   // bootstrap off a 1x1 pbuffer
   CGLPBufferObj mac_cgl_pbuffer_;
 
   // Fullscreen related stuff.
-
-#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_;
+  // NULL if not in fullscreen mode.
+  scoped_ptr<FullscreenWindowMac> mac_fullscreen_window_;
 
 #endif  //  OS_MACOSX
 #ifdef OS_LINUX
   Window window_;
   Window fullscreen_window_;
 
   // Xt mode
   Widget xt_widget_;
   XtAppContext xt_app_context_;
   XtIntervalId xt_interval_;
@@ skipping 228 matching lines @@
 
   bool AllocateOffscreenRenderSurfaces(int width, int height);
   void DeallocateOffscreenRenderSurfaces();
 };
 
 }  // namespace o3d
 }  // namespace glue
 
 
 #endif  // O3D_PLUGIN_CROSS_O3D_GLUE_H_