diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 19:55:34 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 19:55:34 +0000 |
| commit | e9cf2cac00113e12b14584533594b82dfe5701a6 (patch) | |
| tree | 6eca083e1bcfbb1c1b9f92cfa4986a6f8a289531 /o3d/core | |
| parent | 9eaa021d46dc016c20e43ed2bcae536922fd979d (diff) | |
| download | chromium_src-e9cf2cac00113e12b14584533594b82dfe5701a6.zip chromium_src-e9cf2cac00113e12b14584533594b82dfe5701a6.tar.gz chromium_src-e9cf2cac00113e12b14584533594b82dfe5701a6.tar.bz2 | |
Build fixes for case when fullscreen message is disabled, for IMC code
path, and for effect.js docs.
BUG=none
TEST=none (built O3D on Mac)
Review URL: http://codereview.chromium.org/1512029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/core')
| -rw-r--r-- | o3d/core/cross/message_queue_test.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/o3d/core/cross/message_queue_test.cc b/o3d/core/cross/message_queue_test.cc index 2987779..c94eb52 100644 --- a/o3d/core/cross/message_queue_test.cc +++ b/o3d/core/cross/message_queue_test.cc @@ -744,7 +744,8 @@ void MessageQueueTest::RunTests(int num_threads, } // Wait for completion while (!watchdog->Done()) { - ASSERT_TRUE(message_queue->CheckForNewMessages()); + bool has_new_texture = false; + ASSERT_TRUE(message_queue->CheckForNewMessages(&has_new_texture)); watchdog->WaitBrieflyForSignal(); } ASSERT_FALSE(watchdog->Expired()); |