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

Unified Diff: core/cross/client.h

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 | « no previous file | core/cross/client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/cross/client.h
===================================================================
--- core/cross/client.h (revision 48764)
+++ core/cross/client.h (working copy)
@@ -298,6 +298,12 @@
// true if message check was ok.
bool Tick();
+ // Indicates whether a call to Tick() is in progress. This is needed
+ // to avoid reentrancy problems on some platforms.
+ bool IsTicking() const {
+ return is_ticking_;
+ }
+
// Searches in the Client for an object by its id. This function is for
// Javascript.
// Parameters:
@@ -497,6 +503,9 @@
// Timer for getting the elapsed time between tick updates.
ElapsedTimeTimer tick_elapsed_time_timer_;
+ // Whether a call to Tick() is currently active.
+ bool is_ticking_;
+
// Used to gather render time from mulitple RenderTree calls.
float total_time_to_render_;
« no previous file with comments | « no previous file | core/cross/client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698