Merge WebKit at r75993: Initial merge by git.

Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3

1 files changed, 0 insertions, 77 deletions

diff --git a/WebKit/win/WebNavigationData.h b/WebKit/win/WebNavigationData.h
deleted file mode 100644
index f4793dc..0000000
--- a/WebKit/win/WebNavigationData.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 COMPUTER, INC. OR
- * 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. 
- */
-
-#ifndef WebNavigationData_h
-#define WebNavigationData_h
-
-#include "WebKit.h"
-
-#include "COMPtr.h"
-#include <WebCore/BString.h>
-
-class WebNavigationData : public IWebNavigationData {
-public:
-    static WebNavigationData* createInstance(const WTF::String& url, const WTF::String& title, IWebURLRequest*, IWebURLResponse*, bool hasSubstituteData, const WTF::String& clientRedirectSource);
-private:
-    WebNavigationData(const WTF::String& url, const WTF::String& title, IWebURLRequest*, IWebURLResponse*, bool hasSubstituteData, const WTF::String& clientRedirectSource);
-    ~WebNavigationData();
-
-public:
-    // IUnknown
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
-    virtual ULONG STDMETHODCALLTYPE AddRef(void);
-    virtual ULONG STDMETHODCALLTYPE Release(void);
-
-    // IWebNavigationData
-    virtual HRESULT STDMETHODCALLTYPE url(
-        /* [retval][out] */ BSTR*);
-
-    virtual HRESULT STDMETHODCALLTYPE title(
-        /* [retval][out] */ BSTR*);
-
-    virtual HRESULT STDMETHODCALLTYPE originalRequest(
-        /* [retval][out] */ IWebURLRequest**);
-
-    virtual HRESULT STDMETHODCALLTYPE response(
-        /* [retval][out] */ IWebURLResponse**);
-
-    virtual HRESULT STDMETHODCALLTYPE hasSubstituteData(
-        /* [retval][out] */ BOOL*);
-
-    virtual HRESULT STDMETHODCALLTYPE clientRedirectSource(
-        /* [retval][out] */ BSTR*);
-
-private:
-    ULONG m_refCount;
-    WebCore::BString m_url;
-    WebCore::BString m_title;
-    COMPtr<IWebURLRequest> m_request;
-    COMPtr<IWebURLResponse> m_response;
-    bool m_hasSubstituteData;
-    WebCore::BString m_clientRedirectSource;
-
-};
-
-#endif // WebNavigationData_h