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

Unified Diff: core/cross/client.cc

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.h ('k') | plugin/mac/plugin_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/cross/client.cc
===================================================================
--- core/cross/client.cc (revision 48764)
+++ core/cross/client.cc (working copy)
@@ -82,6 +82,7 @@
render_mode_(RENDERMODE_CONTINUOUS),
texture_on_hold_(false),
event_manager_(),
+ is_ticking_(false),
last_tick_time_(0),
root_(NULL),
#ifdef OS_WIN
@@ -175,6 +176,7 @@
}
bool Client::Tick() {
+ is_ticking_ = true;
ElapsedTimeTimer timer;
float seconds_elapsed = tick_elapsed_time_timer_.GetElapsedTimeAndReset();
tick_event_.set_elapsed_time(seconds_elapsed);
@@ -216,6 +218,7 @@
}
}
+ is_ticking_ = false;
return message_check_ok;
}
« no previous file with comments | « core/cross/client.h ('k') | plugin/mac/plugin_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698