diff options
| author | Andrei Popescu <andreip@google.com> | 2009-09-09 13:35:07 +0100 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-09-09 13:36:34 +0100 |
| commit | 4679798949ff93e9c1a849450ff7fe60f22cdbba (patch) | |
| tree | 26629d22580d82417499edd57a23eb5900457fec | |
| parent | 9c3710c76ea425248782469af80633fd63cb6f8d (diff) | |
| download | external_webkit-4679798949ff93e9c1a849450ff7fe60f22cdbba.zip external_webkit-4679798949ff93e9c1a849450ff7fe60f22cdbba.tar.gz external_webkit-4679798949ff93e9c1a849450ff7fe60f22cdbba.tar.bz2 | |
Fix for 2106269
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ static void AddJavascriptInterface(JNIEnv *env, jobject obj, jint nativeFramePoi // 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(); |