Prevent Client::Tick() from causing reentrancy in the plugin on Mac OS X....

core/cross/client.h

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 280 matching lines @@
   // TickCallback you pass in to SetTickCallback. It will be deleted if you call
   // SetTickCallback a second time or if you call ClearTickCallback.
   void ClearTickCallback();
 
   // Tick the client. This method is called by the plugin to give the client
   // a chance to process NaCl messages and update animation.
   // Returns:
   //   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:
   //   id: id of object to look for.
   // Returns:
   //   Pointer to the object or NULL if not found.
   ObjectBase* GetObjectById(Id id) const {
     return object_manager_->GetObjectById(id);
   }
 
@@ skipping 179 matching lines @@
 
   // Tick Callback.
   TickCallbackManager tick_callback_manager_;
 
   // Tick Event to pass to the tick callback.
   TickEvent tick_event_;
 
   // 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_;
 
   // Time used for tick and message processing.
   float last_tick_time_;
 
   // Reference to global transform graph root for Client.
   Transform::Ref root_;
 
   // Global Render Graph root for Client.
   RenderNode::Ref rendergraph_root_;
 
   ParamObject::Ref sas_param_object_;
 
   // The id of the client.
   Id id_;
 
   int calls_;  // Used to check reentrancy along with ScopedIncrement.
 
   RenderSurface::Ref offscreen_render_surface_;
   RenderDepthStencilSurface::Ref offscreen_depth_render_surface_;
 
   DISALLOW_COPY_AND_ASSIGN(Client);
 };  // Client
 
 }  // namespace o3d
 
 #endif  // O3D_CORE_CROSS_CLIENT_H_