summaryrefslogtreecommitdiffstats
path: root/o3d/samples/multiple-clients.html
diff options
context:
space:
mode:
authorapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-19 23:21:19 +0000
committerapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-19 23:21:19 +0000
commit3723b75614a6af7d941c6db60d8a614dfe914664 (patch)
treebb63a5f652541098f8b7012a165661f9555589cb /o3d/samples/multiple-clients.html
parent7e8d231820546f985729d5c44b7a7da13ab02cd4 (diff)
downloadchromium_src-3723b75614a6af7d941c6db60d8a614dfe914664.zip
chromium_src-3723b75614a6af7d941c6db60d8a614dfe914664.tar.gz
chromium_src-3723b75614a6af7d941c6db60d8a614dfe914664.tar.bz2
Removed workaround for Chrome 1.0 from o3djs library.
Fix big causing Canvas sample to crash. Review URL: http://codereview.chromium.org/303008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples/multiple-clients.html')
-rw-r--r--o3d/samples/multiple-clients.html13
1 files changed, 0 insertions, 13 deletions
diff --git a/o3d/samples/multiple-clients.html b/o3d/samples/multiple-clients.html
index 94a2129..a8993e78 100644
--- a/o3d/samples/multiple-clients.html
+++ b/o3d/samples/multiple-clients.html
@@ -94,23 +94,10 @@ function init() {
}
g_num_clients = ii;
- var chromeWorkaround = o3djs.base.IsChrome10();
// wait for the browser to settle down.
var clearId = window.setInterval(function() {
var element = document.o3d0
if (!element.o3d) {
- if (chromeWorkaround) {
- if (element.style.width != '60px') {
- element.style.width = '60px';
- } else {
- element.style.width = '1px';
- }
- }
- return;
- }
- if (chromeWorkaround && element.style.width != '60px') {
- // The plugin has loaded but it may not be the right size yet.
- element.style.width = '60px';
return;
}
window.clearInterval(clearId);