summaryrefslogtreecommitdiffstats
path: root/o3d/core/cross/client.cc
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-28 19:34:15 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-28 19:34:15 +0000
commit090e45fd4f5f4f56157dd140bba65a20bf5c777a (patch)
tree4dc313ff82bc765a930ab864e41174a3c1e8f378 /o3d/core/cross/client.cc
parentbd63475e7bbf9927b645a4645d27d6987b4d4d78 (diff)
downloadchromium_src-090e45fd4f5f4f56157dd140bba65a20bf5c777a.zip
chromium_src-090e45fd4f5f4f56157dd140bba65a20bf5c777a.tar.gz
chromium_src-090e45fd4f5f4f56157dd140bba65a20bf5c777a.tar.bz2
Fixed bug in Core Graphics backend where it was falling through to the
AGL initialization code path in some situations, causing full-screen mode (at least) to break. Also fixed bug causing plugin to become reentrant during event dispatching. BUG=none TEST=none TBR=maf Review URL: http://codereview.chromium.org/2339002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/core/cross/client.cc')
-rw-r--r--o3d/core/cross/client.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/o3d/core/cross/client.cc b/o3d/core/cross/client.cc
index f66816c..0097d67 100644
--- a/o3d/core/cross/client.cc
+++ b/o3d/core/cross/client.cc
@@ -339,6 +339,10 @@ void Client::RenderClient(bool send_callback) {
}
}
+bool Client::IsRendering() {
+ return (renderer_.IsAvailable() && renderer_->rendering());
+}
+
// Executes draw calls for all visible shapes in a subtree
void Client::RenderTree(RenderNode *tree_root) {
if (!renderer_.IsAvailable())