[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[barraclough at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 36bb6f29604ad598799bbc0298be0585579b4459
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 23 05:06:27 2009 +0000

    Build fix following bug #30696.
    
    Patch by Gavin Barraclough <barraclough at apple.com> on 2009-10-22
    Reviewed by NOBODY (speculative build fix - qt is currently already broken!)
    
    * Api/qwebelement.cpp:
    (setupScriptContext):
    * Api/qwebframe.cpp:
    (QWebFrame::evaluateJavaScript):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49966 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebelement.cpp b/WebKit/qt/Api/qwebelement.cpp
index 5b83870..43ebbb1 100644
--- a/WebKit/qt/Api/qwebelement.cpp
+++ b/WebKit/qt/Api/qwebelement.cpp
@@ -682,7 +682,7 @@ static bool setupScriptContext(WebCore::Element* element, JSC::JSValue& thisValu
     if (!scriptController)
         return false;
 
-    state = scriptController->globalObject()->globalExec();
+    state = scriptController->globalObject(mainThreadNormalWorld())->globalExec();
     if (!state)
         return false;
 
diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 45dbfba..e4146cd 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -1291,7 +1291,7 @@ QVariant QWebFrame::evaluateJavaScript(const QString& scriptSource)
     if (proxy) {
         JSC::JSValue v = d->frame->script()->executeScript(ScriptSourceCode(scriptSource)).jsValue();
         int distance = 0;
-        rc = JSC::Bindings::convertValueToQVariant(proxy->globalObject()->globalExec(), v, QMetaType::Void, &distance);
+        rc = JSC::Bindings::convertValueToQVariant(proxy->globalObject(mainThreadNormalWorld())->globalExec(), v, QMetaType::Void, &distance);
     }
     return rc;
 }
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 4805443..1e27f75 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-22  Gavin Barraclough  <barraclough at apple.com>
+
+        Reviewed by NOBODY (speculative build fix - qt is currently already broken!)
+        Build fix following bug #30696.
+
+        * Api/qwebelement.cpp:
+        (setupScriptContext):
+        * Api/qwebframe.cpp:
+        (QWebFrame::evaluateJavaScript):
+
 2009-10-22  Shu Chang  <Chang.Shu at nokia.com>
 
         Reviewed by Eric Seidel.

-- 
WebKit Debian packaging