Merge 32270 - Only request fullscreen once per plugin window

BUG=28019
TEST=Make Silverlight full screen on the Mac, then shrink it back to inpage mode; the dock should reappear.

Review URL: http://codereview.chromium.org/402028

TBR=stuartmorgan@chromium.org
Review URL: http://codereview.chromium.org/399059

git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@32276 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 1 deletions

diff --git a/chrome/browser/plugin_process_host_mac.cc b/chrome/browser/plugin_process_host_mac.cc
index f003a4c..bea1cbc 100644
--- a/chrome/browser/plugin_process_host_mac.cc
+++ b/chrome/browser/plugin_process_host_mac.cc
@@ -32,10 +32,14 @@ void PluginProcessHost::OnPluginShowWindow(uint32 window_id,
     { window_rect.width(), window_rect.height() }
   };
   CGRect main_display_bounds = CGDisplayBounds(CGMainDisplayID());
-  if (CGRectEqualToRect(window_bounds, main_display_bounds)) {
+  if (CGRectEqualToRect(window_bounds, main_display_bounds) &&
+      (plugin_fullscreen_windows_set_.find(window_id) ==
+       plugin_fullscreen_windows_set_.end())) {
     plugin_fullscreen_windows_set_.insert(window_id);
     // If the plugin has just shown a window that's the same dimensions as
     // the main display, hide the menubar so that it has the whole screen.
+    // (but only if we haven't already seen this fullscreen window, since
+    // otherwise our refcounting can get skewed).
     ChromeThread::PostTask(
         ChromeThread::UI, FROM_HERE,
         NewRunnableFunction(mac_util::RequestFullScreen));