diff -r 4f2f89ce4247 -r 303757a437d3 WebKitTools/DumpRenderTree/win/WorkQueueItemWin.cpp
--- a/WebKitTools/DumpRenderTree/win/WorkQueueItemWin.cpp	Fri Sep 17 09:02:29 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-/*
- * Copyright (C) 2007, 2009 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer. 
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WorkQueueItem.h"
-
-#include "DumpRenderTree.h"
-#include <WebCore/COMPtr.h>
-#include <WebKit/WebKit.h>
-#include <WebKit/WebKitCOMAPI.h>
-#include <JavaScriptCore/JSStringRef.h>
-#include <JavaScriptCore/JSStringRefCF.h>
-#include <JavaScriptCore/RetainPtr.h>
-#include <wtf/Vector.h>
-#include <string>
-
-using std::wstring;
-
-static wstring jsStringRefToWString(JSStringRef jsStr)
-{
-    size_t length = JSStringGetLength(jsStr);
-    Vector<WCHAR> buffer(length + 1);
-    memcpy(buffer.data(), JSStringGetCharactersPtr(jsStr), length * sizeof(WCHAR));
-    buffer[length] = '\0';
-
-    return buffer.data();
-}
-
-bool LoadItem::invoke() const
-{
-    wstring targetString = jsStringRefToWString(m_target.get());
-
-    COMPtr<IWebFrame> targetFrame;
-    if (targetString.empty())
-        targetFrame = frame;
-    else {
-        BSTR targetBSTR = SysAllocString(targetString.c_str());
-        bool failed = FAILED(frame->findFrameNamed(targetBSTR, &targetFrame));
-        SysFreeString(targetBSTR);
-        if (failed)
-            return false;
-    }
-
-    COMPtr<IWebURLRequest> request;
-    if (FAILED(WebKitCreateInstance(CLSID_WebURLRequest, 0, IID_IWebURLRequest, (void**)&request)))
-        return false;
-
-    wstring urlString = jsStringRefToWString(m_url.get());
-    BSTR urlBSTR = SysAllocString(urlString.c_str());
-    bool failed = FAILED(request->initWithURL(urlBSTR, WebURLRequestUseProtocolCachePolicy, 60));
-    SysFreeString(urlBSTR);
-    if (failed)
-        return false;
-
-    targetFrame->loadRequest(request.get());
-    return true;
-}
-
-bool LoadHTMLStringItem::invoke() const
-{
-    wstring content = jsStringRefToWString(m_content.get());
-    wstring baseURL = jsStringRefToWString(m_baseURL.get());
-
-    BSTR contentBSTR = SysAllocString(content.c_str());
-    BSTR baseURLBSTR = SysAllocString(baseURL.c_str());
-
-    frame->loadHTMLString(contentBSTR, baseURLBSTR);
-
-    SysFreeString(contentBSTR);
-    SysFreeString(baseURLBSTR);
-
-    return true;
-}
-
-bool ReloadItem::invoke() const
-{
-    COMPtr<IWebView> webView;
-    if (FAILED(frame->webView(&webView)))
-        return false;
-
-    COMPtr<IWebIBActions> webActions;
-    if (FAILED(webView->QueryInterface(&webActions)))
-        return false;
-
-    webActions->reload(0);
-    return true;
-}
-
-bool ScriptItem::invoke() const
-{
-    COMPtr<IWebView> webView;
-    if (FAILED(frame->webView(&webView)))
-        return false;
-
-    wstring scriptString = jsStringRefToWString(m_script.get());
-
-    BSTR result;
-    BSTR scriptBSTR = SysAllocString(scriptString.c_str());
-    webView->stringByEvaluatingJavaScriptFromString(scriptBSTR, &result);
-    SysFreeString(result);
-    SysFreeString(scriptBSTR);
-
-    return true;
-}
-
-bool BackForwardItem::invoke() const
-{
-    COMPtr<IWebView> webView;
-    if (FAILED(frame->webView(&webView)))
-        return false;
-
-    BOOL result;
-    if (m_howFar == 1) {
-        webView->goForward(&result);
-        return true;
-    }
-
-    if (m_howFar == -1) {
-        webView->goBack(&result);
-        return true;
-    }
-    
-    COMPtr<IWebBackForwardList> bfList;
-    if (FAILED(webView->backForwardList(&bfList)))
-        return false;
-
-    COMPtr<IWebHistoryItem> item;
-    if (FAILED(bfList->itemAtIndex(m_howFar, &item)))
-        return false;
-
-    webView->goToBackForwardItem(item.get(), &result);
-    return true;
-}