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

Unified Diff: plugin/mac/plugin_mac.mm

Issue 2451002: Prevent Client::Tick() from causing reentrancy in the plugin on Mac OS X.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/o3d/
Patch Set: '' Created 10 years, 7 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 | « core/cross/client.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: plugin/mac/plugin_mac.mm
===================================================================
--- plugin/mac/plugin_mac.mm (revision 48764)
+++ plugin/mac/plugin_mac.mm (working copy)
@@ -237,9 +237,10 @@
NPP instance = instances_[i];
PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
- // RenderClient() may cause events to be processed, leading to
- // reentrant calling of this code. Detect and avoid this case.
- if (obj->client()->IsRendering()) {
+ // RenderClient() and Tick() may cause events to be processed,
+ // leading to reentrant calling of this code. Detect and avoid
+ // this case.
+ if (obj->client()->IsRendering() || obj->client()->IsTicking()) {
continue;
}
« no previous file with comments | « core/cross/client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698