[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[barraclough at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 3b7d6fd41c51754b3c3745d7905de0f8c9db4e7c
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 7 23:47:45 2009 +0000

    * WebView.cpp:
    (WebView::stringByEvaluatingJavaScriptFromString):
    
    Reviewed by NOBODY (Windows build fix part II).
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51805 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index f457034..ceeb72e 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-07  Gavin Barraclough  <barraclough at apple.com>
+
+        Reviewed by NOBODY (Windows build fix part II).
+
+        * WebView.cpp:
+        (WebView::stringByEvaluatingJavaScriptFromString):
+
 2009-12-03  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 30f2b0a..aaef464 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -2908,7 +2908,8 @@ HRESULT STDMETHODCALLTYPE WebView::stringByEvaluatingJavaScriptFromString(
         return E_FAIL;
     else if (scriptExecutionResult.isString()) {
         JSLock lock(JSC::SilenceAssertionsOnly);
-        *result = BString(String(scriptExecutionResult.getString()));
+        JSC::ExecState* exec = coreFrame->script()->globalObject(mainThreadNormalWorld());
+        *result = BString(String(scriptExecutionResult.getString(exec)));
     }
 
     return S_OK;

-- 
WebKit Debian packaging