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

[kevino at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 2e446a7d5cc49bac39a61f8ea4201ccfde3c98cb
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 23 16:42:45 2009 +0000

    wx build fix. Update the globalObject calls after changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49981 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 87106e1..f2cc27f 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-23  Kevin Ollivier  <kevino at theolliviers.com>
+
+        wx build fix. Update the globalObject calls after changes.
+
+        * WebFrame.cpp:
+        (wxWebFrame::RunScript):
+        * WebKitSupport/FrameLoaderClientWx.cpp:
+        (WebCore::FrameLoaderClientWx::windowObjectCleared):
+
 2009-10-21  Pedro Romano  <pmcnr72 at gmail.com>
 
         Reviewed by Kevin Ollivier.
diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp
index 38b3e3f..9018d37 100644
--- a/WebKit/wx/WebFrame.cpp
+++ b/WebKit/wx/WebFrame.cpp
@@ -190,7 +190,7 @@ wxString wxWebFrame::RunScript(const wxString& javascript)
     if (m_impl->frame) {
         JSC::JSValue result = m_impl->frame->script()->executeScript(javascript, true).jsValue();
         if (result)
-            returnValue = wxString(result.toString(m_impl->frame->script()->globalObject()->globalExec()).UTF8String().c_str(), wxConvUTF8);        
+            returnValue = wxString(result.toString(m_impl->frame->script()->globalObject(WebCore::mainThreadNormalWorld())->globalExec()).UTF8String().c_str(), wxConvUTF8);        
     }
     return returnValue;
 }
diff --git a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
index 0a5eeaf..9d12ca7 100644
--- a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
+++ b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
@@ -836,8 +836,8 @@ void FrameLoaderClientWx::windowObjectCleared()
     if (m_webView) {
         wxWebViewWindowObjectClearedEvent wkEvent(m_webView);
         Frame* coreFrame = m_webView->GetMainFrame()->GetFrame();
-        JSGlobalContextRef context = toGlobalRef(coreFrame->script()->globalObject()->globalExec());
-        JSObjectRef windowObject = toRef(coreFrame->script()->globalObject());
+        JSGlobalContextRef context = toGlobalRef(coreFrame->script()->globalObject(mainThreadNormalWorld())->globalExec());
+        JSObjectRef windowObject = toRef(coreFrame->script()->globalObject(mainThreadNormalWorld()));
         wkEvent.SetJSContext(context);
         wkEvent.SetWindowObject(windowObject);
         m_webView->GetEventHandler()->ProcessEvent(wkEvent);

-- 
WebKit Debian packaging