summaryrefslogtreecommitdiffstats
path: root/o3d/tests
diff options
context:
space:
mode:
authormaf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-23 23:33:21 +0000
committermaf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-23 23:33:21 +0000
commitf44ea0d6f8a6da9b98ecfe3fc30235ef65e28635 (patch)
tree438d764fb3ab89a93ee91d3764c053abf701ade0 /o3d/tests
parent26cd5c815ddc94fe643cb7acf23731d2a2d80915 (diff)
downloadchromium_src-f44ea0d6f8a6da9b98ecfe3fc30235ef65e28635.zip
chromium_src-f44ea0d6f8a6da9b98ecfe3fc30235ef65e28635.tar.gz
chromium_src-f44ea0d6f8a6da9b98ecfe3fc30235ef65e28635.tar.bz2
Add a boolean parameter to Client::RenderClient() to choose whether to
make the javascript render callback or not. Generally you want to pass true, but if the render is happening in non-windowed mode (eg on a Mac) and is in response to an update event rather than a timer, it can be useful to pass false to prevent the javascript code triggering another update and causing an infinite calback loop. Case in point is the custom camera example, which modifies some HTML form text fields on render callback, which on Firefox causes a plugin invalidation and round and round we would go. Review URL: http://codereview.chromium.org/159181 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/tests')
-rw-r--r--o3d/tests/basic_system_test/basic_system_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/o3d/tests/basic_system_test/basic_system_test.cc b/o3d/tests/basic_system_test/basic_system_test.cc
index b37ac8e8..598eb9f8 100644
--- a/o3d/tests/basic_system_test/basic_system_test.cc
+++ b/o3d/tests/basic_system_test/basic_system_test.cc
@@ -198,7 +198,7 @@ void BasicSystemTest::SetUp() {
void BasicSystemTest::TearDown() {
// Force another render to make the stream capture end.
- client()->RenderClient();
+ client()->RenderClient(true);
pack_->Destroy();
delete client_;
@@ -328,7 +328,7 @@ TEST_F(BasicSystemTest, BasicSystemTestCase) {
// and framebuffer contents.
BEGIN_ASSERT_STREAM_CAPTURE();
for (int frame_count = 0; frame_count < 5; ++frame_count) {
- client()->RenderClient();
+ client()->RenderClient(true);
ASSERT_FRAMEBUFFER();
Matrix4 mat(Matrix4::rotationY(static_cast<float>(frame_count) * 2 *
static_cast<float>(M_PI) / 5.0f));