summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
authorvangelis@google.com <vangelis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-18 00:05:33 +0000
committervangelis@google.com <vangelis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-18 00:05:33 +0000
commitcf07e5608a8712bea53666d2ee3adbf3d182899c (patch)
tree2e755b1762a12e16f6724e6aabb9966de390fc8f /o3d
parentd517b7081d417c0ec79df0e236cb6bd9b58c22a3 (diff)
downloadchromium_src-cf07e5608a8712bea53666d2ee3adbf3d182899c.zip
chromium_src-cf07e5608a8712bea53666d2ee3adbf3d182899c.tar.gz
chromium_src-cf07e5608a8712bea53666d2ee3adbf3d182899c.tar.bz2
Added code to exit fullscreen mode if the underlying plugin window is being messed with. This fixes the following GTV bug:
http://b/issue?id=1980996 Review URL: http://codereview.chromium.org/155614 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r--o3d/plugin/win/main_win.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/o3d/plugin/win/main_win.cc b/o3d/plugin/win/main_win.cc
index 84347a02..69cd647 100644
--- a/o3d/plugin/win/main_win.cc
+++ b/o3d/plugin/win/main_win.cc
@@ -891,6 +891,10 @@ NPError NPP_SetWindow(NPP instance, NPWindow *window) {
DCHECK(obj->GetPluginHWnd());
DCHECK(obj->GetFullscreenHWnd());
DCHECK(obj->GetPluginHWnd() == hWnd);
+
+ // Exit full screen if the plugin window is being modified.
+ obj->CancelFullscreenDisplay();
+
return NPERR_NO_ERROR;
}
DCHECK(!obj->GetPluginHWnd());