diff options
| author | zhurunz@google.com <zhurunz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 22:05:31 +0000 |
|---|---|---|
| committer | zhurunz@google.com <zhurunz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 22:05:31 +0000 |
| commit | f03d68f40e35ec351618a6ba722a74463ac77067 (patch) | |
| tree | 046b2e03d18b5b06fec77f1cc91cef17cb8549c5 /o3d/core | |
| parent | 38a39617a7600eb1fc8696db722245774b933d9a (diff) | |
| download | chromium_src-f03d68f40e35ec351618a6ba722a74463ac77067.zip chromium_src-f03d68f40e35ec351618a6ba722a74463ac77067.tar.gz chromium_src-f03d68f40e35ec351618a6ba722a74463ac77067.tar.bz2 | |
Send bool response on message SET_MAX_FPS
Enable build flag O3D_PLUGIN_SUPPORT_SET_MAX_FPS
Review URL: http://codereview.chromium.org/1527030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44550 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/core')
| -rw-r--r-- | o3d/core/cross/client.cc | 4 | ||||
| -rw-r--r-- | o3d/core/cross/client.h | 4 | ||||
| -rw-r--r-- | o3d/core/cross/message_queue.cc | 1 |
3 files changed, 1 insertions, 8 deletions
diff --git a/o3d/core/cross/client.cc b/o3d/core/cross/client.cc index 1785d7e1..6a9ebbc 100644 --- a/o3d/core/cross/client.cc +++ b/o3d/core/cross/client.cc @@ -80,9 +80,7 @@ Client::Client(ServiceLocator* service_locator) evaluation_counter_(service_locator), render_tree_called_(false), render_mode_(RENDERMODE_CONTINUOUS), -#ifdef O3D_PLUGIN_SUPPORT_SET_MAX_FPS texture_on_hold_(false), -#endif // O3D_PLUGIN_SUPPORT_SET_MAX_FPS event_manager_(), last_tick_time_(0), root_(NULL), @@ -206,7 +204,6 @@ bool Client::Tick() { last_tick_time_ = timer.GetElapsedTimeAndReset(); -#ifdef O3D_PLUGIN_SUPPORT_SET_MAX_FPS texture_on_hold_ |= has_new_texture; int max_fps = renderer_->max_fps(); if (max_fps > 0 && @@ -217,7 +214,6 @@ bool Client::Tick() { renderer_->set_need_to_render(true); texture_on_hold_ = false; } -#endif // O3D_PLUGIN_SUPPORT_SET_MAX_FPS return message_check_ok; } diff --git a/o3d/core/cross/client.h b/o3d/core/cross/client.h index 3c4ad76..18c15a8 100644 --- a/o3d/core/cross/client.h +++ b/o3d/core/cross/client.h @@ -66,8 +66,6 @@ #include "core/cross/transform.h" namespace o3d { -//#define O3D_PLUGIN_SUPPORT_SET_MAX_FPS - class MessageQueue; class Profiler; class State; @@ -467,10 +465,8 @@ class Client { // Render mode. RenderMode render_mode_; -#ifdef O3D_PLUGIN_SUPPORT_SET_MAX_FPS // Used for rendering control bool texture_on_hold_; -#endif // O3D_PLUGIN_SUPPORT_SET_MAX_FPS // Render Callbacks. RenderCallbackManager render_callback_manager_; diff --git a/o3d/core/cross/message_queue.cc b/o3d/core/cross/message_queue.cc index 9d46c8b..06e39c8 100644 --- a/o3d/core/cross/message_queue.cc +++ b/o3d/core/cross/message_queue.cc @@ -841,6 +841,7 @@ bool MessageQueue::ProcessMessageSetMaxFPS( renderer->set_max_fps(message.max_fps); } + SendBooleanResponse(client->client_handle(), true); return true; } |