Windows build fix
authoraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 30 Mar 2009 17:37:42 +0000 (17:37 +0000)
committeraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 30 Mar 2009 17:37:42 +0000 (17:37 +0000)
        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
        (LayoutTestController::waitForPolicyDelegate): Added this empty stub.

        * DumpRenderTree/win/WorkQueueItemWin.cpp:
        (LoadItem::invoke):
        (ScriptItem::invoke):
        Changed to use data members instead of removed member functions.

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

WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
WebKitTools/DumpRenderTree/win/WorkQueueItemWin.cpp

index 38cfb8b..82e7da3 100644 (file)
@@ -1,3 +1,15 @@
+2009-03-30  Adam Roben  <aroben@apple.com>
+
+        Windows build fix
+
+        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
+        (LayoutTestController::waitForPolicyDelegate): Added this empty stub.
+
+        * DumpRenderTree/win/WorkQueueItemWin.cpp:
+        (LoadItem::invoke):
+        (ScriptItem::invoke):
+        Changed to use data members instead of removed member functions.
+
 2009-03-30  Jan Michael Alonzo  <jmalonzo@webkit.org>
 
         Gtk DRT build fix per changeset
index 664f464..2b4c6db 100644 (file)
@@ -138,6 +138,11 @@ void LayoutTestController::keepWebHistory()
     history->setOptionalSharedHistory(sharedHistory.get());
 }
 
+void LayoutTestController::waitForPolicyDelegate()
+{
+    // FIXME: Implement this.
+}
+
 size_t LayoutTestController::webHistoryItemCount()
 {
     COMPtr<IWebHistory> history(Create, CLSID_WebHistory);
index 66a9b27..432bf8d 100644 (file)
@@ -52,7 +52,7 @@ static wstring jsStringRefToWString(JSStringRef jsStr)
 
 bool LoadItem::invoke() const
 {
-    wstring targetString = jsStringRefToWString(target());
+    wstring targetString = jsStringRefToWString(m_target.get());
 
     COMPtr<IWebFrame> targetFrame;
     if (targetString.empty())
@@ -69,7 +69,7 @@ bool LoadItem::invoke() const
     if (FAILED(CoCreateInstance(CLSID_WebURLRequest, 0, CLSCTX_ALL, IID_IWebURLRequest, (void**)&request)))
         return false;
 
-    wstring urlString = jsStringRefToWString(url());
+    wstring urlString = jsStringRefToWString(m_url.get());
     BSTR urlBSTR = SysAllocString(urlString.c_str());
     bool failed = FAILED(request->initWithURL(urlBSTR, WebURLRequestUseProtocolCachePolicy, 60));
     SysFreeString(urlBSTR);
@@ -100,7 +100,7 @@ bool ScriptItem::invoke() const
     if (FAILED(frame->webView(&webView)))
         return false;
 
-    wstring scriptString = jsStringRefToWString(script());
+    wstring scriptString = jsStringRefToWString(m_script.get());
 
     BSTR result;
     BSTR scriptBSTR = SysAllocString(scriptString.c_str());