Speculative Windows build fix
authoraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Dec 2007 08:43:56 +0000 (08:43 +0000)
committeraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Dec 2007 08:43:56 +0000 (08:43 +0000)
        * WebFrame.cpp:
        (WebFrame::globalContext):
        (WebFrame::windowObjectCleared):
        * WebScriptDebugger.cpp:
        (WebScriptDebugger::WebScriptDebugger):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28334 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/win/ChangeLog
WebKit/win/WebFrame.cpp
WebKit/win/WebScriptDebugger.cpp

index 5246b88..b9b44e9 100644 (file)
@@ -1,3 +1,13 @@
+2007-12-03  Adam Roben  <aroben@apple.com>
+
+        Speculative Windows build fix
+
+        * WebFrame.cpp:
+        (WebFrame::globalContext):
+        (WebFrame::windowObjectCleared):
+        * WebScriptDebugger.cpp:
+        (WebScriptDebugger::WebScriptDebugger):
+
 2007-12-01  Sam Weinig  <sam@webkit.org>
 
         Rename IWebViewPrivate::selectionImageRect to IWebViewPrivate::selectionRect.
index ed46c60..bd881e0 100644 (file)
@@ -609,7 +609,7 @@ JSGlobalContextRef STDMETHODCALLTYPE WebFrame::globalContext()
     if (!coreFrame)
         return 0;
 
-    return toGlobalRef(coreFrame->scriptProxy()->interpreter()->globalExec());
+    return toGlobalRef(coreFrame->scriptProxy()->globalObject()->globalExec());
 }
 
 HRESULT STDMETHODCALLTYPE WebFrame::loadRequest( 
@@ -2459,7 +2459,7 @@ void WebFrame::windowObjectCleared()
     if (SUCCEEDED(d->webView->frameLoadDelegate(&frameLoadDelegate))) {
         COMPtr<IWebFrameLoadDelegate2> frameLoadDelegate2(Query, frameLoadDelegate);
 
-        JSContextRef context = toRef(coreFrame->scriptProxy()->interpreter()->globalExec());
+        JSContextRef context = toRef(coreFrame->scriptProxy()->globalObject()->globalExec());
         JSObjectRef windowObject = toRef(KJS::Window::retrieve(coreFrame)->getObject());
         ASSERT(windowObject);
 
index fe49050..c4a9422 100644 (file)
@@ -60,7 +60,7 @@ WebScriptDebugger::WebScriptDebugger(WebFrame* frame)
     m_frame->webView(&m_webView);
     ASSERT(m_webView);
 
-    callEvent(interp->globalExec(), -1, -1, 0, List());
+    callEvent(proxy->globalObject()->globalExec(), -1, -1, 0, List());
 }
 
 bool WebScriptDebugger::sourceParsed(ExecState*, int sourceId, const UString& sourceURL,