Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(991)

Unified Diff: plugin/win/main_win.cc

Issue 6732033: Fixing a random hang when exiting full screen in chome. The same bug doesn't (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: plugin/win/main_win.cc
===================================================================
--- plugin/win/main_win.cc (revision 79322)
+++ plugin/win/main_win.cc (working copy)
@@ -669,7 +669,13 @@
void ReplaceContentWindow(HWND content_hwnd,
HWND containing_hwnd,
int width, int height) {
- ::ShowWindow(content_hwnd, SW_HIDE);
+ // In Chrome browser, IPC might block this call. This doesn't happen with
+ // firefox or internet explorer. For Chome, do not hide the window. Haven't
+ // any artifacts with this change when exiting from full screen.
+ PluginObject *obj = PluginObject::GetPluginProperty(content_hwnd);
+ if (obj && !obj->IsChrome()) {
+ ::ShowWindow(content_hwnd, SW_HIDE);
+ }
LONG_PTR style = ::GetWindowLongPtr(content_hwnd, GWL_STYLE);
style |= WS_CHILD;
::SetWindowLongPtr(content_hwnd, GWL_STYLE, style);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698