summaryrefslogtreecommitdiffstats
path: root/V8Binding/v8
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-06 11:44:56 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-05-06 11:44:56 -0700
commit35bf47a663a895921ac4bcec8318e429bdb77dae (patch)
tree5c9544cc3a90a7a8ac366452c98b773592b5941e /V8Binding/v8
parentded5f064b17d2910e2d9a6eb5219d21a1207b76c (diff)
parente8f342c7034cddf274ba5b9e18c51dd3e29c7db9 (diff)
downloadexternal_webkit-35bf47a663a895921ac4bcec8318e429bdb77dae.zip
external_webkit-35bf47a663a895921ac4bcec8318e429bdb77dae.tar.gz
external_webkit-35bf47a663a895921ac4bcec8318e429bdb77dae.tar.bz2
Merge change 999
* changes: Fix memory leaks in Java binding and some code cleanup.
Diffstat (limited to 'V8Binding/v8')
-rw-r--r--V8Binding/v8/ScriptController.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/V8Binding/v8/ScriptController.h b/V8Binding/v8/ScriptController.h
index d26dbcc..40534fb 100644
--- a/V8Binding/v8/ScriptController.h
+++ b/V8Binding/v8/ScriptController.h
@@ -164,7 +164,7 @@ public:
// JSC has a WindowShell object, but for V8, the ScriptController
// is the WindowShell.
- bool haveWindowShell() const { return true; }
+ bool haveWindowShell() const { return m_proxy->ContextInitialized(); }
// Masquerade 'this' as the windowShell.
// This is a bit of a hack, but provides reasonable compatibility