Rewrote full-screen support on Windows. O3D now always creates its own...

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 140 matching lines @@
 
   // Last known dimensions of plugin
   int prev_width_;
   int prev_height_;
 
   o3d::NPV8Bridge np_v8_bridge_;
   scoped_ptr<StreamManager> stream_manager_;
 
  public:
 #ifdef OS_WIN
-  void SetDefaultPluginWindowProc(WNDPROC proc) {
-    default_plugin_window_proc_ = proc;
-  }
-  WNDPROC GetDefaultPluginWindowProc() {
-    return default_plugin_window_proc_;
-  }
   void SetHWnd(HWND hWnd) {
     hWnd_ = hWnd;
   }
   HWND GetHWnd() {
     return hWnd_;
   }
-  void SetFullscreenHWnd(HWND hWnd) {
-    fullscreen_hWnd_ = hWnd;
-  }
-  HWND GetFullscreenHWnd() {
-    return fullscreen_hWnd_;
-  }
-  void SetParentHWnd(HWND hWnd) {
-    parent_hWnd_ = hWnd;
-  }
-  HWND GetParentHWnd() {
-    return parent_hWnd_;
-  }
   void SetPluginHWnd(HWND hWnd) {
     plugin_hWnd_ = hWnd;
   }
   HWND GetPluginHWnd() {
     return plugin_hWnd_;
   }
+  void SetContentHWnd(HWND hWnd) {
+    content_hWnd_ = hWnd;
+  }
+  HWND GetContentHWnd() {
+    return content_hWnd_;
+  }
   bool RecordPaint() {
     bool painted = painted_once_;
     painted_once_ = true;
     return painted;
   }
   bool got_dblclick() const { return got_dblclick_; }
   void set_got_dblclick(bool got_dblclick) { got_dblclick_ = got_dblclick; }
 #endif
 #ifdef OS_MACOSX
   void SetFullscreenOverlayMacWindow(WindowRef window) {
@@ skipping 223 matching lines @@
 #endif
 
  private:
   bool fullscreen_region_valid_;
   int fullscreen_region_x_;
   int fullscreen_region_y_;
   int fullscreen_region_width_;
   int fullscreen_region_height_;
   int fullscreen_region_mode_id_;
 #ifdef OS_WIN
-  HWND hWnd_;  // The window we are currenlty drawing to (use this)
-  HWND fullscreen_hWnd_;  // The fullscreen window if we are fullscreen
-  HWND parent_hWnd_;
-  HWND plugin_hWnd_;  // The window we were given inside the browser.
+  HWND hWnd_;          // The window we are currently drawing to (use this).
+  HWND plugin_hWnd_;   // The window we were given inside the browser.
+  HWND content_hWnd_;  // The window containing the D3D or OpenGL content.
   HCURSOR cursors_[o3d::Cursor::NUM_CURSORS];  // loaded windows cursors.
   HCURSOR hCursor_;
-  WNDPROC default_plugin_window_proc_;
   bool painted_once_;
 #endif  // OS_WIN
 };
 
 }  // namespace o3d
 }  // namespace glue
 
 
 #endif  // O3D_PLUGIN_CROSS_O3D_GLUE_H_