commit 4679798949ff93e9c1a849450ff7fe60f22cdbba
author Andrei Popescu <andreip@google.com> Wed Sep 09 13:35:07 2009 +0100
committer Andrei Popescu <andreip@google.com> Wed Sep 09 13:36:34 2009 +0100
tree 26629d22580d82417499edd57a23eb5900457fec
parent 9c3710c76ea425248782469af80633fd63cb6f8d

Fix for 2106269

WebKit/android/jni/WebCoreFrameBridge.cpp

diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 1160eed..9cc5e90 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1071,8 +1071,8 @@
     // Copied from qwebframe.cpp
     JSC::JSLock lock(false);
     WebCore::JSDOMWindow *window = WebCore::toJSDOMWindow(pFrame);
-    JSC::Bindings::RootObject *root = pFrame->script()->bindingRootObject();
     if (window) {
+        JSC::Bindings::RootObject *root = pFrame->script()->bindingRootObject();
         JSC::Bindings::setJavaVM(vm);
         // Add the binding to JS environment
         JSC::ExecState* exec = window->globalExec();