<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176672] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176672">176672</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-02 11:02:20 -0800 (Tue, 02 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of the WinINet based network implementation
https://bugs.webkit.org/show_bug.cgi?id=139187
Reviewed by Andreas Kling.
This code was only used by the Windows CE port. Now it's unused.
* platform/network/ResourceHandle.h:
* platform/network/ResourceHandleInternal.h:
(WebCore::ResourceHandleInternal::ResourceHandleInternal):
* platform/network/win/AuthenticationChallenge.h: Removed.
* platform/network/win/CookieJarWin.cpp: Removed.
* platform/network/win/CredentialStorageWin.cpp: Removed.
* platform/network/win/ProxyServerWin.cpp: Removed.
* platform/network/win/ResourceError.h: Removed.
* platform/network/win/ResourceHandleWin.cpp: Removed.
* platform/network/win/ResourceRequest.h: Removed.
* platform/network/win/ResourceResponse.h: Removed.
* platform/network/win/SocketStreamError.h: Removed.
* platform/network/win/SocketStreamHandle.h: Removed.
* platform/network/win/SocketStreamHandleWin.cpp: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleh">trunk/Source/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleInternalh">trunk/Source/WebCore/platform/network/ResourceHandleInternal.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformnetworkwinAuthenticationChallengeh">trunk/Source/WebCore/platform/network/win/AuthenticationChallenge.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkwinCookieJarWincpp">trunk/Source/WebCore/platform/network/win/CookieJarWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkwinCredentialStorageWincpp">trunk/Source/WebCore/platform/network/win/CredentialStorageWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkwinProxyServerWincpp">trunk/Source/WebCore/platform/network/win/ProxyServerWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkwinResourceErrorh">trunk/Source/WebCore/platform/network/win/ResourceError.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkwinResourceHandleWincpp">trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkwinResourceRequesth">trunk/Source/WebCore/platform/network/win/ResourceRequest.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkwinResourceResponseh">trunk/Source/WebCore/platform/network/win/ResourceResponse.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkwinSocketStreamErrorh">trunk/Source/WebCore/platform/network/win/SocketStreamError.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkwinSocketStreamHandleh">trunk/Source/WebCore/platform/network/win/SocketStreamHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkwinSocketStreamHandleWincpp">trunk/Source/WebCore/platform/network/win/SocketStreamHandleWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176671 => 176672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-02 18:53:18 UTC (rev 176671)
+++ trunk/Source/WebCore/ChangeLog 2014-12-02 19:02:20 UTC (rev 176672)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-12-02 Anders Carlsson <andersca@apple.com>
+
+ Get rid of the WinINet based network implementation
+ https://bugs.webkit.org/show_bug.cgi?id=139187
+
+ Reviewed by Andreas Kling.
+
+ This code was only used by the Windows CE port. Now it's unused.
+
+ * platform/network/ResourceHandle.h:
+ * platform/network/ResourceHandleInternal.h:
+ (WebCore::ResourceHandleInternal::ResourceHandleInternal):
+ * platform/network/win/AuthenticationChallenge.h: Removed.
+ * platform/network/win/CookieJarWin.cpp: Removed.
+ * platform/network/win/CredentialStorageWin.cpp: Removed.
+ * platform/network/win/ProxyServerWin.cpp: Removed.
+ * platform/network/win/ResourceError.h: Removed.
+ * platform/network/win/ResourceHandleWin.cpp: Removed.
+ * platform/network/win/ResourceRequest.h: Removed.
+ * platform/network/win/ResourceResponse.h: Removed.
+ * platform/network/win/SocketStreamError.h: Removed.
+ * platform/network/win/SocketStreamHandle.h: Removed.
+ * platform/network/win/SocketStreamHandleWin.cpp: Removed.
+
</ins><span class="cx"> 2014-12-02 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when setting 'column-span' CSS property to 'calc(2 * 3)'
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (176671 => 176672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.h 2014-12-02 18:53:18 UTC (rev 176671)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h 2014-12-02 19:02:20 UTC (rev 176672)
</span><span class="lines">@@ -51,13 +51,6 @@
</span><span class="cx"> typedef const struct __CFData * CFDataRef;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(WININET)
-typedef unsigned long DWORD;
-typedef unsigned long DWORD_PTR;
-typedef void* LPVOID;
-typedef LPVOID HINTERNET;
-#endif
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> OBJC_CLASS NSCachedURLResponse;
</span><span class="cx"> OBJC_CLASS NSData;
</span><span class="lines">@@ -180,14 +173,6 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static void forceContentSniffing();
</span><span class="cx">
</span><del>-#if USE(WININET)
- void setSynchronousInternetHandle(HINTERNET);
- void fileLoadTimer(Timer*);
- void onRedirect();
- bool onRequestComplete();
- static void CALLBACK internetStatusCallback(HINTERNET, DWORD_PTR, DWORD, LPVOID, DWORD);
-#endif
-
</del><span class="cx"> #if USE(CURL) || USE(SOUP)
</span><span class="cx"> ResourceHandleInternal* getInternal() { return d.get(); }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (176671 => 176672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2014-12-02 18:53:18 UTC (rev 176671)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2014-12-02 19:02:20 UTC (rev 176672)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include <CFNetwork/CFURLConnectionPriv.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(WININET) || (USE(CURL) && PLATFORM(WIN))
</del><ins>+#if USE(CURL) && PLATFORM(WIN)
</ins><span class="cx"> #include <winsock2.h>
</span><span class="cx"> #include <windows.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -86,16 +86,6 @@
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> , m_currentRequest(request)
</span><span class="cx"> #endif
</span><del>-#if USE(WININET)
- , m_fileLoadTimer(loader, &ResourceHandle::fileLoadTimer)
- , m_internetHandle(0)
- , m_connectHandle(0)
- , m_requestHandle(0)
- , m_sentEndRequest(false)
- , m_bytesRemainingToWrite(0)
- , m_loadSynchronously(false)
- , m_hasReceivedResponse(false)
-#endif
</del><span class="cx"> #if USE(CURL)
</span><span class="cx"> , m_handle(0)
</span><span class="cx"> , m_url(0)
</span><span class="lines">@@ -160,18 +150,6 @@
</span><span class="cx"> #if PLATFORM(COCOA) || USE(CFNETWORK)
</span><span class="cx"> RetainPtr<CFURLStorageSessionRef> m_storageSession;
</span><span class="cx"> #endif
</span><del>-#if USE(WININET)
- Timer m_fileLoadTimer;
- HINTERNET m_internetHandle;
- HINTERNET m_connectHandle;
- HINTERNET m_requestHandle;
- bool m_sentEndRequest;
- Vector<char> m_formData;
- size_t m_bytesRemainingToWrite;
- bool m_loadSynchronously;
- bool m_hasReceivedResponse;
- String m_redirectUrl;
-#endif
</del><span class="cx"> #if USE(CURL)
</span><span class="cx"> CURL* m_handle;
</span><span class="cx"> char* m_url;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkwinAuthenticationChallengeh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/win/AuthenticationChallenge.h (176671 => 176672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/win/AuthenticationChallenge.h 2014-12-02 18:53:18 UTC (rev 176671)
+++ trunk/Source/WebCore/platform/network/win/AuthenticationChallenge.h 2014-12-02 19:02:20 UTC (rev 176672)
</span><span class="lines">@@ -1,46 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007 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 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.
- */
-
-#ifndef AuthenticationChallenge_h
-#define AuthenticationChallenge_h
-
-#include "AuthenticationChallengeBase.h"
-
-namespace WebCore {
-
-class AuthenticationChallenge : public AuthenticationChallengeBase {
-public:
- AuthenticationChallenge()
- {
- }
-
- AuthenticationChallenge(const ProtectionSpace& protectionSpace, const Credential& proposedCredential, unsigned previousFailureCount, const ResourceResponse& response, const ResourceError& error)
- : AuthenticationChallengeBase(protectionSpace, proposedCredential, previousFailureCount, response, error)
- {
- }
-};
-
-} // namespace WebCore
-
-#endif // AuthenticationChallenge_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkwinCookieJarWincpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/win/CookieJarWin.cpp (176671 => 176672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/win/CookieJarWin.cpp 2014-12-02 18:53:18 UTC (rev 176671)
+++ trunk/Source/WebCore/platform/network/win/CookieJarWin.cpp 2014-12-02 19:02:20 UTC (rev 176672)
</span><span class="lines">@@ -1,106 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2007, 2008 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 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 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.
- */
-
-#include "config.h"
-#include "PlatformCookieJar.h"
-
-#include "Cookie.h"
-#include "URL.h"
-#include "NetworkingContext.h"
-#include "ResourceHandle.h"
-#include <windows.h>
-#include <Wininet.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-void setCookiesFromDOM(const NetworkStorageSession&, const URL&, const URL& url, const String& value)
-{
- // FIXME: Deal with firstParty argument.
- String str = url.string();
- String val = value;
- InternetSetCookie(str.charactersWithNullTermination().data(), 0, val.charactersWithNullTermination().data());
-}
-
-String cookiesForDOM(const NetworkStorageSession&, const URL&, const URL& url)
-{
- // FIXME: Deal with firstParty argument.
-
- String str = url.string();
-
- DWORD count = 0;
- if (!InternetGetCookie(str.charactersWithNullTermination().data(), 0, 0, &count))
- return String();
-
- if (count <= 1) // Null terminator counts as 1.
- return String();
-
- Vector<UChar> buffer(count);
- if (!InternetGetCookie(str.charactersWithNullTermination().data(), 0, buffer.data(), &count))
- return String();
-
- buffer.shrink(count - 1); // Ignore the null terminator.
- return String::adopt(buffer);
-}
-
-String cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
-{
- // FIXME: include HttpOnly cookie
- return cookiesForDOM(session.context(), firstParty, url);
-}
-
-bool cookiesEnabled(const NetworkStorageSession& session, const URL& /*firstParty*/, const URL& /*url*/)
-{
- return true;
-}
-
-bool getRawCookies(const NetworkStorageSession& session, const URL& /*firstParty*/, const URL& /*url*/, Vector<Cookie>& rawCookies)
-{
- // FIXME: Not yet implemented
- rawCookies.clear();
- return false; // return true when implemented
-}
-
-void deleteCookie(const NetworkStorageSession&, const URL&, const String&)
-{
- // FIXME: Not yet implemented
-}
-
-void getHostnamesWithCookies(const NetworkStorageSession&, HashSet<String>& hostnames)
-{
- // FIXME: Not yet implemented
-}
-
-void deleteCookiesForHostname(const NetworkStorageSession&, const String& hostname)
-{
- // FIXME: Not yet implemented
-}
-
-void deleteAllCookies(const NetworkStorageSession&)
-{
- // FIXME: Not yet implemented
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkwinCredentialStorageWincpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/win/CredentialStorageWin.cpp (176671 => 176672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/win/CredentialStorageWin.cpp 2014-12-02 18:53:18 UTC (rev 176671)
+++ trunk/Source/WebCore/platform/network/win/CredentialStorageWin.cpp 2014-12-02 19:02:20 UTC (rev 176672)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "CredentialStorage.h"
-
-#include "Credential.h"
-#include "NotImplemented.h"
-
-namespace WebCore {
-
-Credential CredentialStorage::getFromPersistentStorage(const ProtectionSpace&)
-{
- notImplemented();
- return Credential();
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkwinProxyServerWincpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/win/ProxyServerWin.cpp (176671 => 176672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/win/ProxyServerWin.cpp 2014-12-02 18:53:18 UTC (rev 176671)
+++ trunk/Source/WebCore/platform/network/win/ProxyServerWin.cpp 2014-12-02 19:02:20 UTC (rev 176672)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Brent Fulgham <bfulgham@webkit.org>. 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 INC. 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 INC. 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 "ProxyServer.h"
-
-namespace WebCore {
-
-Vector<ProxyServer> proxyServersForURL(const URL&, const NetworkingContext*)
-{
- // FIXME: Implement.
- return Vector<ProxyServer>();
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkwinResourceErrorh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/win/ResourceError.h (176671 => 176672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/win/ResourceError.h 2014-12-02 18:53:18 UTC (rev 176671)
+++ trunk/Source/WebCore/platform/network/win/ResourceError.h 2014-12-02 19:02:20 UTC (rev 176672)
</span><span class="lines">@@ -1,46 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006 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 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.
- */
-
-#ifndef ResourceError_h
-#define ResourceError_h
-
-#include "ResourceErrorBase.h"
-
-namespace WebCore {
-
-class ResourceError : public ResourceErrorBase {
-public:
- ResourceError()
- {
- }
-
- ResourceError(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription)
- : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription)
- {
- }
-};
-
-} // namespace WebCore
-
-#endif // ResourceError_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkwinResourceHandleWincpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp (176671 => 176672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp 2014-12-02 18:53:18 UTC (rev 176671)
+++ trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp 2014-12-02 19:02:20 UTC (rev 176672)
</span><span class="lines">@@ -1,448 +0,0 @@
</span><del>-/*
- * Copyright (C) 2004, 2006 Apple Inc. All rights reserved.
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * 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 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 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.
- */
-
-#include "config.h"
-#include "ResourceHandle.h"
-
-#include "DataURL.h"
-#include "HTTPParsers.h"
-#include "MIMETypeRegistry.h"
-#include "NetworkingContext.h"
-#include "NotImplemented.h"
-#include "ResourceError.h"
-#include "ResourceHandleClient.h"
-#include "ResourceHandleInternal.h"
-#include "SharedBuffer.h"
-#include "Timer.h"
-
-#include <wtf/MainThread.h>
-#include <wtf/text/CString.h>
-
-#include <windows.h>
-#include <wininet.h>
-
-namespace WebCore {
-
-static inline HINTERNET createInternetHandle(const String& userAgent, bool asynchronous)
-{
- String userAgentString = userAgent;
- HINTERNET internetHandle = InternetOpenW(userAgentString.charactersWithNullTermination().data(), INTERNET_OPEN_TYPE_PRECONFIG, 0, 0, asynchronous ? INTERNET_FLAG_ASYNC : 0);
-
- if (asynchronous)
- InternetSetStatusCallback(internetHandle, &ResourceHandle::internetStatusCallback);
-
- return internetHandle;
-}
-
-static HINTERNET asynchronousInternetHandle(const String& userAgent)
-{
- static HINTERNET internetHandle = createInternetHandle(userAgent, true);
- return internetHandle;
-}
-
-static String queryHTTPHeader(HINTERNET requestHandle, DWORD infoLevel)
-{
- DWORD bufferSize = 0;
- HttpQueryInfoW(requestHandle, infoLevel, 0, &bufferSize, 0);
-
- Vector<UChar> characters(bufferSize / sizeof(UChar));
-
- if (!HttpQueryInfoW(requestHandle, infoLevel, characters.data(), &bufferSize, 0))
- return String();
-
- characters.removeLast(); // Remove NullTermination.
- return String::adopt(characters);
-}
-
-
-class WebCoreSynchronousLoader : public ResourceHandleClient {
- WTF_MAKE_NONCOPYABLE(WebCoreSynchronousLoader);
-public:
- WebCoreSynchronousLoader(ResourceError&, ResourceResponse&, Vector<char>&, const String& userAgent);
- ~WebCoreSynchronousLoader();
-
- HINTERNET internetHandle() const { return m_internetHandle; }
-
- virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
- virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int encodedDataLength);
- virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/);
- virtual void didFail(ResourceHandle*, const ResourceError&);
-
-private:
- ResourceError& m_error;
- ResourceResponse& m_response;
- Vector<char>& m_data;
- HINTERNET m_internetHandle;
-};
-
-WebCoreSynchronousLoader::WebCoreSynchronousLoader(ResourceError& error, ResourceResponse& response, Vector<char>& data, const String& userAgent)
- : m_error(error)
- , m_response(response)
- , m_data(data)
- , m_internetHandle(createInternetHandle(userAgent, false))
-{
-}
-
-WebCoreSynchronousLoader::~WebCoreSynchronousLoader()
-{
- InternetCloseHandle(m_internetHandle);
-}
-
-void WebCoreSynchronousLoader::didReceiveResponse(ResourceHandle*, const ResourceResponse& response)
-{
- m_response = response;
-}
-
-void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, unsigned length, int)
-{
- m_data.append(data, length);
-}
-
-void WebCoreSynchronousLoader::didFinishLoading(ResourceHandle*, double)
-{
-}
-
-void WebCoreSynchronousLoader::didFail(ResourceHandle*, const ResourceError& error)
-{
- m_error = error;
-}
-
-
-ResourceHandleInternal::~ResourceHandleInternal()
-{
-}
-
-ResourceHandle::~ResourceHandle()
-{
-}
-
-static void callOnRedirect(void* context)
-{
- ResourceHandle* handle = static_cast<ResourceHandle*>(context);
- handle->onRedirect();
-}
-
-static void callOnRequestComplete(void* context)
-{
- ResourceHandle* handle = static_cast<ResourceHandle*>(context);
- handle->onRequestComplete();
-}
-
-void ResourceHandle::internetStatusCallback(HINTERNET internetHandle, DWORD_PTR context, DWORD internetStatus,
- LPVOID statusInformation, DWORD statusInformationLength)
-{
- ResourceHandle* handle = reinterpret_cast<ResourceHandle*>(context);
-
- switch (internetStatus) {
- case INTERNET_STATUS_REDIRECT:
- handle->d->m_redirectUrl = String(static_cast<UChar*>(statusInformation), statusInformationLength);
- callOnMainThread(callOnRedirect, handle);
- break;
-
- case INTERNET_STATUS_REQUEST_COMPLETE:
- callOnMainThread(callOnRequestComplete, handle);
- break;
-
- default:
- break;
- }
-}
-
-void ResourceHandle::onRedirect()
-{
- ResourceRequest newRequest = firstRequest();
- newRequest.setURL(URL(ParsedURLString, d->m_redirectUrl));
-
- ResourceResponse response(firstRequest().url(), String(), 0, String(), String());
-
- if (ResourceHandleClient* resourceHandleClient = client())
- resourceHandleClient->willSendRequest(this, newRequest, response);
-}
-
-bool ResourceHandle::onRequestComplete()
-{
- if (!d->m_internetHandle) { // 0 if canceled.
- deref(); // balances ref in start
- return false;
- }
-
- if (d->m_bytesRemainingToWrite) {
- DWORD bytesWritten;
- InternetWriteFile(d->m_requestHandle,
- d->m_formData.data() + (d->m_formData.size() - d->m_bytesRemainingToWrite),
- d->m_bytesRemainingToWrite,
- &bytesWritten);
- d->m_bytesRemainingToWrite -= bytesWritten;
- if (d->m_bytesRemainingToWrite)
- return true;
- d->m_formData.clear();
- }
-
- if (!d->m_sentEndRequest) {
- HttpEndRequestW(d->m_requestHandle, 0, 0, reinterpret_cast<DWORD_PTR>(this));
- d->m_sentEndRequest = true;
- return true;
- }
-
- static const int bufferSize = 32768;
- char buffer[bufferSize];
- INTERNET_BUFFERSA buffers;
- buffers.dwStructSize = sizeof(INTERNET_BUFFERSA);
- buffers.lpvBuffer = buffer;
- buffers.dwBufferLength = bufferSize;
-
- BOOL ok = FALSE;
- while ((ok = InternetReadFileExA(d->m_requestHandle, &buffers, d->m_loadSynchronously ? 0 : IRF_NO_WAIT, reinterpret_cast<DWORD_PTR>(this))) && buffers.dwBufferLength) {
- if (!d->m_hasReceivedResponse) {
- d->m_hasReceivedResponse = true;
-
- ResourceResponse response;
- response.setURL(firstRequest().url());
-
- String httpStatusText = queryHTTPHeader(d->m_requestHandle, HTTP_QUERY_STATUS_TEXT);
- if (!httpStatusText.isNull())
- response.setHTTPStatusText(httpStatusText);
-
- String httpStatusCode = queryHTTPHeader(d->m_requestHandle, HTTP_QUERY_STATUS_CODE);
- if (!httpStatusCode.isNull())
- response.setHTTPStatusCode(httpStatusCode.toInt());
-
- String httpContentLength = queryHTTPHeader(d->m_requestHandle, HTTP_QUERY_CONTENT_LENGTH);
- if (!httpContentLength.isNull())
- response.setExpectedContentLength(httpContentLength.toInt());
-
- String httpContentType = queryHTTPHeader(d->m_requestHandle, HTTP_QUERY_CONTENT_TYPE);
- if (!httpContentType.isNull()) {
- response.setMimeType(extractMIMETypeFromMediaType(httpContentType));
- response.setTextEncodingName(extractCharsetFromMediaType(httpContentType));
- }
-
- if (ResourceHandleClient* resourceHandleClient = client())
- resourceHandleClient->didReceiveResponse(this, response);
- }
-
- // FIXME: https://bugs.webkit.org/show_bug.cgi?id=19793
- // -1 means we do not provide any data about transfer size to inspector so it would use
- // Content-Length headers or content size to show transfer size.
- if (ResourceHandleClient* resourceHandleClient = client())
- resourceHandleClient->didReceiveData(this, buffer, buffers.dwBufferLength, -1);
- buffers.dwBufferLength = bufferSize;
- }
-
- if (!ok && GetLastError() == ERROR_IO_PENDING)
- return true;
-
- if (ResourceHandleClient* resourceHandleClient = client())
- resourceHandleClient->didFinishLoading(this, 0);
-
- InternetCloseHandle(d->m_requestHandle);
- InternetCloseHandle(d->m_connectHandle);
- deref(); // balances ref in start
- return false;
-}
-
-bool ResourceHandle::start()
-{
- if (firstRequest().url().isLocalFile() || firstRequest().url().protocolIsData()) {
- ref(); // balanced by deref in fileLoadTimer
- if (d->m_loadSynchronously)
- fileLoadTimer(0);
- else
- d->m_fileLoadTimer.startOneShot(0.0);
- return true;
- }
-
- if (!d->m_internetHandle)
- d->m_internetHandle = asynchronousInternetHandle(d->m_context->userAgent());
-
- if (!d->m_internetHandle)
- return false;
-
- DWORD flags = INTERNET_FLAG_KEEP_CONNECTION
- | INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTPS
- | INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTP
- | INTERNET_FLAG_DONT_CACHE
- | INTERNET_FLAG_RELOAD;
-
- d->m_connectHandle = InternetConnectW(d->m_internetHandle, firstRequest().url().host().charactersWithNullTermination().data(), firstRequest().url().port(),
- 0, 0, INTERNET_SERVICE_HTTP, flags, reinterpret_cast<DWORD_PTR>(this));
-
- if (!d->m_connectHandle)
- return false;
-
- String urlStr = firstRequest().url().path();
- String urlQuery = firstRequest().url().query();
-
- if (!urlQuery.isEmpty()) {
- urlStr.append('?');
- urlStr.append(urlQuery);
- }
-
- String httpMethod = firstRequest().httpMethod();
- String httpReferrer = firstRequest().httpReferrer();
-
- LPCWSTR httpAccept[] = { L"*/*", 0 };
-
- d->m_requestHandle = HttpOpenRequestW(d->m_connectHandle, httpMethod.charactersWithNullTermination().data(), urlStr.charactersWithNullTermination().data(),
- 0, httpReferrer.charactersWithNullTermination().data(), httpAccept, flags, reinterpret_cast<DWORD_PTR>(this));
-
- if (!d->m_requestHandle) {
- InternetCloseHandle(d->m_connectHandle);
- return false;
- }
-
- if (firstRequest().httpBody()) {
- firstRequest().httpBody()->flatten(d->m_formData);
- d->m_bytesRemainingToWrite = d->m_formData.size();
- }
-
- Vector<UChar> httpHeaders;
- const HTTPHeaderMap& httpHeaderFields = firstRequest().httpHeaderFields();
-
- for (HTTPHeaderMap::const_iterator it = httpHeaderFields.begin(); it != httpHeaderFields.end(); ++it) {
- if (equalIgnoringCase(it->key, "Accept") || equalIgnoringCase(it->key, "Referer") || equalIgnoringCase(it->key, "User-Agent"))
- continue;
-
- if (!httpHeaders.isEmpty())
- httpHeaders.append('\n');
-
- httpHeaders.append(it->key.characters(), it->key.length());
- httpHeaders.append(':');
- httpHeaders.append(it->value.characters(), it->value.length());
- }
-
- INTERNET_BUFFERSW internetBuffers;
- ZeroMemory(&internetBuffers, sizeof(internetBuffers));
- internetBuffers.dwStructSize = sizeof(internetBuffers);
- internetBuffers.lpcszHeader = httpHeaders.data();
- internetBuffers.dwHeadersLength = httpHeaders.size();
- internetBuffers.dwBufferTotal = d->m_bytesRemainingToWrite;
-
- HttpSendRequestExW(d->m_requestHandle, &internetBuffers, 0, 0, reinterpret_cast<DWORD_PTR>(this));
-
- ref(); // balanced by deref in onRequestComplete
-
- if (d->m_loadSynchronously)
- while (onRequestComplete()) {
- // Loop until finished.
- }
-
- return true;
-}
-
-void ResourceHandle::fileLoadTimer(Timer*)
-{
- RefPtr<ResourceHandle> protector(this);
- deref(); // balances ref in start
-
- if (firstRequest().url().protocolIsData()) {
- handleDataURL(this);
- return;
- }
-
- String fileName = firstRequest().url().fileSystemPath();
- HANDLE fileHandle = CreateFileW(fileName.charactersWithNullTermination().data(), GENERIC_READ, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
-
- if (fileHandle == INVALID_HANDLE_VALUE) {
- client()->didFail(this, ResourceError());
- return;
- }
-
- ResourceResponse response;
-
- int dotPos = fileName.reverseFind('.');
- int slashPos = fileName.reverseFind('/');
-
- if (slashPos < dotPos && dotPos != -1) {
- String ext = fileName.substring(dotPos + 1);
- response.setMimeType(MIMETypeRegistry::getMIMETypeForExtension(ext));
- }
-
- client()->didReceiveResponse(this, response);
-
- bool result = false;
- DWORD bytesRead = 0;
-
- do {
- const int bufferSize = 8192;
- char buffer[bufferSize];
- result = ReadFile(fileHandle, &buffer, bufferSize, &bytesRead, 0);
- // FIXME: https://bugs.webkit.org/show_bug.cgi?id=19793
- // -1 means we do not provide any data about transfer size to inspector so it would use
- // Content-Length headers or content size to show transfer size.
- if (result && bytesRead)
- client()->didReceiveData(this, buffer, bytesRead, -1);
- // Check for end of file.
- } while (result && bytesRead);
-
- CloseHandle(fileHandle);
-
- client()->didFinishLoading(this, 0);
-}
-
-void ResourceHandle::cancel()
-{
- if (d->m_requestHandle) {
- d->m_internetHandle = 0;
- InternetCloseHandle(d->m_requestHandle);
- InternetCloseHandle(d->m_connectHandle);
- } else
- d->m_fileLoadTimer.stop();
-}
-
-void ResourceHandle::platformLoadResourceSynchronously(NetworkingContext* context, const ResourceRequest& request, StoredCredentials storedCredentials, ResourceError& error, ResourceResponse& response, Vector<char>& data)
-{
- UNUSED_PARAM(storedCredentials);
-
- WebCoreSynchronousLoader syncLoader(error, response, data, request.httpUserAgent());
- ResourceHandle handle(context, request, &syncLoader, true, false);
-
- handle.setSynchronousInternetHandle(syncLoader.internetHandle());
- handle.start();
-}
-
-void ResourceHandle::setSynchronousInternetHandle(HINTERNET internetHandle)
-{
- d->m_internetHandle = internetHandle;
- d->m_loadSynchronously = true;
-}
-
-void prefetchDNS(const String&)
-{
- notImplemented();
-}
-
-bool ResourceHandle::loadsBlocked()
-{
- return false;
-}
-
-void ResourceHandle::platformSetDefersLoading(bool)
-{
- notImplemented();
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkwinResourceRequesth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/win/ResourceRequest.h (176671 => 176672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/win/ResourceRequest.h 2014-12-02 18:53:18 UTC (rev 176671)
+++ trunk/Source/WebCore/platform/network/win/ResourceRequest.h 2014-12-02 19:02:20 UTC (rev 176672)
</span><span class="lines">@@ -1,73 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006 Apple Inc. All rights reserved.
- * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
- *
- * 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 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.
- */
-
-#ifndef ResourceRequest_h
-#define ResourceRequest_h
-
-#include "ResourceRequestBase.h"
-
-namespace WebCore {
-
-class ResourceRequest : public ResourceRequestBase {
-public:
- ResourceRequest(const String& url)
- : ResourceRequestBase(URL(ParsedURLString, url), UseProtocolCachePolicy)
- {
- }
-
- ResourceRequest(const URL& url)
- : ResourceRequestBase(url, UseProtocolCachePolicy)
- {
- }
-
- ResourceRequest(const URL& url, const String& referrer, ResourceRequestCachePolicy policy = UseProtocolCachePolicy)
- : ResourceRequestBase(url, policy)
- {
- setHTTPReferrer(referrer);
- }
-
- ResourceRequest()
- : ResourceRequestBase(URL(), UseProtocolCachePolicy)
- {
- }
-
-private:
- friend struct ResourceRequestBase;
-
- void doUpdatePlatformRequest() { }
- void doUpdateResourceRequest() { }
- void doUpdatePlatformHTTPBody() { }
- void doUpdateResourceHTTPBody() { }
-
- PassOwnPtr<CrossThreadResourceRequestData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceRequestData> data) const { return data; }
- void doPlatformAdopt(PassOwnPtr<CrossThreadResourceRequestData>) { }
-};
-
-struct CrossThreadResourceRequestData : public CrossThreadResourceRequestDataBase {
-};
-
-} // namespace WebCore
-
-#endif // ResourceRequest_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkwinResourceResponseh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/win/ResourceResponse.h (176671 => 176672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/win/ResourceResponse.h 2014-12-02 18:53:18 UTC (rev 176671)
+++ trunk/Source/WebCore/platform/network/win/ResourceResponse.h 2014-12-02 19:02:20 UTC (rev 176672)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006 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 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.
- */
-
-#ifndef ResourceResponse_h
-#define ResourceResponse_h
-
-#include "ResourceResponseBase.h"
-
-namespace WebCore {
-
-class ResourceResponse : public ResourceResponseBase {
-public:
- ResourceResponse()
- {
- }
-
- ResourceResponse(const URL& url, const String& mimeType, long long expectedLength, const String& textEncodingName)
- : ResourceResponseBase(url, mimeType, expectedLength, textEncodingName)
- {
- }
-
- bool platformResponseIsUpToDate() const { return false; }
-
-private:
- friend class ResourceResponseBase;
-
- PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData> data) const { return data; }
- void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>) { }
- String platformSuggestedFilename() const { return String(); }
-};
-
-struct CrossThreadResourceResponseData : public CrossThreadResourceResponseDataBase {
-};
-
-} // namespace WebCore
-
-#endif // ResourceResponse_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkwinSocketStreamErrorh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/win/SocketStreamError.h (176671 => 176672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/win/SocketStreamError.h 2014-12-02 18:53:18 UTC (rev 176671)
+++ trunk/Source/WebCore/platform/network/win/SocketStreamError.h 2014-12-02 19:02:20 UTC (rev 176672)
</span><span class="lines">@@ -1,50 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Google 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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 SocketStreamError_h
-#define SocketStreamError_h
-
-#include "SocketStreamErrorBase.h"
-
-namespace WebCore {
-
-class SocketStreamError : public SocketStreamErrorBase {
-public:
- SocketStreamError() { }
- explicit SocketStreamError(int errorCode)
- : SocketStreamErrorBase(errorCode)
- {
- }
-
-};
-
-} // namespace WebCore
-
-#endif // SocketStreamError_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkwinSocketStreamHandleh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/win/SocketStreamHandle.h (176671 => 176672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/win/SocketStreamHandle.h 2014-12-02 18:53:18 UTC (rev 176671)
+++ trunk/Source/WebCore/platform/network/win/SocketStreamHandle.h 2014-12-02 19:02:20 UTC (rev 176672)
</span><span class="lines">@@ -1,70 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- * Copyright (C) 2009 Google 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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 SocketStreamHandle_h
-#define SocketStreamHandle_h
-
-#include "SocketStreamHandleBase.h"
-
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class AuthenticationChallenge;
-class Credential;
-class SocketStreamHandleClient;
-
-class SocketStreamHandle : public RefCounted<SocketStreamHandle>, public SocketStreamHandleBase {
-public:
- static PassRefPtr<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient* client) { return adoptRef(new SocketStreamHandle(url, client)); }
-
- virtual ~SocketStreamHandle();
-
-protected:
- virtual int platformSend(const char* data, int length);
- virtual void platformClose();
-
-private:
- SocketStreamHandle(const URL&, SocketStreamHandleClient*);
-
- // No authentication for streams per se, but proxy may ask for credentials.
- void didReceiveAuthenticationChallenge(const AuthenticationChallenge&);
- void receivedCredential(const AuthenticationChallenge&, const Credential&);
- void receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&);
- void receivedCancellation(const AuthenticationChallenge&);
- void receivedRequestToPerformDefaultHandling(const AuthenticationChallenge&);
- void receivedChallengeRejection(const AuthenticationChallenge&);
-};
-
-} // namespace WebCore
-
-#endif // SocketStreamHandle_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkwinSocketStreamHandleWincpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/win/SocketStreamHandleWin.cpp (176671 => 176672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/win/SocketStreamHandleWin.cpp 2014-12-02 18:53:18 UTC (rev 176671)
+++ trunk/Source/WebCore/platform/network/win/SocketStreamHandleWin.cpp 2014-12-02 19:02:20 UTC (rev 176672)
</span><span class="lines">@@ -1,99 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Brent Fulgham. All rights reserved.
- * Copyright (C) 2009 Google 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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.
- */
-
-#include "config.h"
-#include "SocketStreamHandle.h"
-
-#include "URL.h"
-#include "Logging.h"
-#include "NotImplemented.h"
-#include "SocketStreamHandleClient.h"
-
-namespace WebCore {
-
-SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient* client)
- : SocketStreamHandleBase(url, client)
-{
- LOG(Network, "SocketStreamHandle %p new client %p", this, m_client);
- notImplemented();
-}
-
-SocketStreamHandle::~SocketStreamHandle()
-{
- LOG(Network, "SocketStreamHandle %p delete", this);
- setClient(0);
- notImplemented();
-}
-
-int SocketStreamHandle::platformSend(const char*, int)
-{
- LOG(Network, "SocketStreamHandle %p platformSend", this);
- notImplemented();
- return 0;
-}
-
-void SocketStreamHandle::platformClose()
-{
- LOG(Network, "SocketStreamHandle %p platformClose", this);
- notImplemented();
-}
-
-void SocketStreamHandle::didReceiveAuthenticationChallenge(const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
-void SocketStreamHandle::receivedCredential(const AuthenticationChallenge&, const Credential&)
-{
- notImplemented();
-}
-
-void SocketStreamHandle::receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
-void SocketStreamHandle::receivedCancellation(const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
-void SocketStreamHandle::receivedRequestToPerformDefaultHandling(const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
-void SocketStreamHandle::receivedChallengeRejection(const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
-} // namespace WebCore
</del></span></pre>
</div>
</div>
</body>
</html>