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

Unified Diff: webkit/plugins/npapi/webplugin_delegate_impl_win.cc

Issue 7988009: Fix a flash plugin process crash on Windows which occurs on the field in the context of the SetCu... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 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: webkit/plugins/npapi/webplugin_delegate_impl_win.cc
===================================================================
--- webkit/plugins/npapi/webplugin_delegate_impl_win.cc (revision 102308)
+++ webkit/plugins/npapi/webplugin_delegate_impl_win.cc (working copy)
@@ -1359,6 +1359,7 @@
ret = true;
if (np_event.event == WM_MOUSEMOVE) {
+ current_windowless_cursor_.InitFromExternalCursor(GetCursor());
// Snag a reference to the current cursor ASAP in case the plugin modified
// it. There is a nasty race condition here with the multiprocess browser
// as someone might be setting the cursor in the main process as well.
@@ -1460,19 +1461,7 @@
}
return current_cursor;
}
-
- if (!g_current_plugin_instance->IsWindowless()) {
- return ::SetCursor(cursor);
- }
-
- // It is ok to pass NULL here to GetCursor as we are not looking for cursor
- // types defined by Webkit.
- HCURSOR previous_cursor =
- g_current_plugin_instance->current_windowless_cursor_.GetCursor(NULL);
-
- g_current_plugin_instance->current_windowless_cursor_.InitFromExternalCursor(
- cursor);
- return previous_cursor;
+ return ::SetCursor(cursor);
}
LONG WINAPI WebPluginDelegateImpl::RegEnumKeyExWPatch(
« 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