2009-01-09 Darin Fisher <darin@chromium.org>
authordarin@chromium.org <darin@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Jan 2009 22:12:05 +0000 (22:12 +0000)
committerdarin@chromium.org <darin@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Jan 2009 22:12:05 +0000 (22:12 +0000)
        Reviewed by Eric Seidel.

        https://bugs.webkit.org/show_bug.cgi?id=23214
        Upstream platform/network/chromium/

        * platform/network/chromium/AuthenticationChallenge.h: Added.
        (WebCore::AuthenticationChallenge::AuthenticationChallenge):
        (WebCore::AuthenticationChallenge::sourceHandle):
        * platform/network/chromium/AuthenticationChallengeChromium.cpp: Added.
        (WebCore::AuthenticationChallenge::platformCompare):
        * platform/network/chromium/CookieJarChromium.cpp: Added.
        (WebCore::setCookies):
        (WebCore::cookies):
        (WebCore::cookiesEnabled):
        * platform/network/chromium/DNSChromium.cpp: Added.
        (WebCore::prefetchDNS):
        * platform/network/chromium/NetworkStateNotifierChromium.cpp: Added.
        (WebCore::NetworkStateNotifier::updateState):
        (WebCore::NetworkStateNotifier::NetworkStateNotifier):
        * platform/network/chromium/NetworkStateNotifierPrivate.h: Added.
        * platform/network/chromium/ResourceError.h: Added.
        (WebCore::ResourceError::ResourceError):
        * platform/network/chromium/ResourceRequest.h: Added.
        (WebCore::ResourceRequest::):
        (WebCore::ResourceRequest::ResourceRequest):
        (WebCore::ResourceRequest::frame):
        (WebCore::ResourceRequest::setFrame):
        (WebCore::ResourceRequest::setTargetType):
        (WebCore::ResourceRequest::targetType):
        (WebCore::ResourceRequest::originPid):
        (WebCore::ResourceRequest::setOriginPid):
        (WebCore::ResourceRequest::securityInfo):
        (WebCore::ResourceRequest::setSecurityInfo):
        (WebCore::ResourceRequest::doUpdatePlatformRequest):
        (WebCore::ResourceRequest::doUpdateResourceRequest):
        * platform/network/chromium/ResourceResponse.h:
        (WebCore::ResourceResponse::ResourceResponse):
        (WebCore::ResourceResponse::getSecurityInfo):
        (WebCore::ResourceResponse::setSecurityInfo):
        (WebCore::ResourceResponse::isContentFiltered):
        (WebCore::ResourceResponse::setIsContentFiltered):
        (WebCore::ResourceResponse::doUpdateResourceResponse):

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

WebCore/ChangeLog
WebCore/platform/network/chromium/AuthenticationChallenge.h [new file with mode: 0644]
WebCore/platform/network/chromium/AuthenticationChallengeChromium.cpp [new file with mode: 0644]
WebCore/platform/network/chromium/CookieJarChromium.cpp [new file with mode: 0644]
WebCore/platform/network/chromium/DNSChromium.cpp [new file with mode: 0644]
WebCore/platform/network/chromium/NetworkStateNotifierChromium.cpp [new file with mode: 0644]
WebCore/platform/network/chromium/NetworkStateNotifierPrivate.h [new file with mode: 0644]
WebCore/platform/network/chromium/ResourceError.h [new file with mode: 0644]
WebCore/platform/network/chromium/ResourceRequest.h [new file with mode: 0644]
WebCore/platform/network/chromium/ResourceResponse.h

index 9a1f059..d273dad 100644 (file)
@@ -1,3 +1,48 @@
+2009-01-09  Darin Fisher  <darin@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=23214
+        Upstream platform/network/chromium/
+
+        * platform/network/chromium/AuthenticationChallenge.h: Added.
+        (WebCore::AuthenticationChallenge::AuthenticationChallenge):
+        (WebCore::AuthenticationChallenge::sourceHandle):
+        * platform/network/chromium/AuthenticationChallengeChromium.cpp: Added.
+        (WebCore::AuthenticationChallenge::platformCompare):
+        * platform/network/chromium/CookieJarChromium.cpp: Added.
+        (WebCore::setCookies):
+        (WebCore::cookies):
+        (WebCore::cookiesEnabled):
+        * platform/network/chromium/DNSChromium.cpp: Added.
+        (WebCore::prefetchDNS):
+        * platform/network/chromium/NetworkStateNotifierChromium.cpp: Added.
+        (WebCore::NetworkStateNotifier::updateState):
+        (WebCore::NetworkStateNotifier::NetworkStateNotifier):
+        * platform/network/chromium/NetworkStateNotifierPrivate.h: Added.
+        * platform/network/chromium/ResourceError.h: Added.
+        (WebCore::ResourceError::ResourceError):
+        * platform/network/chromium/ResourceRequest.h: Added.
+        (WebCore::ResourceRequest::):
+        (WebCore::ResourceRequest::ResourceRequest):
+        (WebCore::ResourceRequest::frame):
+        (WebCore::ResourceRequest::setFrame):
+        (WebCore::ResourceRequest::setTargetType):
+        (WebCore::ResourceRequest::targetType):
+        (WebCore::ResourceRequest::originPid):
+        (WebCore::ResourceRequest::setOriginPid):
+        (WebCore::ResourceRequest::securityInfo):
+        (WebCore::ResourceRequest::setSecurityInfo):
+        (WebCore::ResourceRequest::doUpdatePlatformRequest):
+        (WebCore::ResourceRequest::doUpdateResourceRequest):
+        * platform/network/chromium/ResourceResponse.h:
+        (WebCore::ResourceResponse::ResourceResponse):
+        (WebCore::ResourceResponse::getSecurityInfo):
+        (WebCore::ResourceResponse::setSecurityInfo):
+        (WebCore::ResourceResponse::isContentFiltered):
+        (WebCore::ResourceResponse::setIsContentFiltered):
+        (WebCore::ResourceResponse::doUpdateResourceResponse):
+
 2009-01-09  Peter Kasting  <pkasting@google.com>
 
         Reviewed by David Hyatt.
diff --git a/WebCore/platform/network/chromium/AuthenticationChallenge.h b/WebCore/platform/network/chromium/AuthenticationChallenge.h
new file mode 100644 (file)
index 0000000..cd1b430
--- /dev/null
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2008 Google, Inc.
+ *
+ * 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 AuthenticationChallenge_h
+#define AuthenticationChallenge_h
+
+#include "AuthenticationChallengeBase.h"
+#include "ResourceHandle.h"
+#include <wtf/RefPtr.h>
+
+namespace WebCore {
+
+    class ResourceHandle;
+
+    class AuthenticationChallenge : public AuthenticationChallengeBase {
+    public:
+        AuthenticationChallenge() {}
+        AuthenticationChallenge(const ProtectionSpace&, const Credential& proposedCredential, unsigned previousFailureCount, const ResourceResponse&, const ResourceError&);
+
+        ResourceHandle* sourceHandle() const { return m_sourceHandle.get(); }
+
+    private:
+        friend class AuthenticationChallengeBase;
+        static bool platformCompare(const AuthenticationChallenge&, const AuthenticationChallenge&);
+
+        RefPtr<ResourceHandle> m_sourceHandle;
+    };
+
+} // namespace WebCore
+
+#endif
diff --git a/WebCore/platform/network/chromium/AuthenticationChallengeChromium.cpp b/WebCore/platform/network/chromium/AuthenticationChallengeChromium.cpp
new file mode 100644 (file)
index 0000000..3c13b39
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2008, 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 "AuthenticationChallenge.h"
+
+namespace WebCore {
+
+bool AuthenticationChallenge::platformCompare(const AuthenticationChallenge&, const AuthenticationChallenge&)
+{
+    return true;
+}
+
+} // namespace WebCore
diff --git a/WebCore/platform/network/chromium/CookieJarChromium.cpp b/WebCore/platform/network/chromium/CookieJarChromium.cpp
new file mode 100644 (file)
index 0000000..50cab3b
--- /dev/null
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2008, 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 "CookieJar.h"
+
+#include "ChromiumBridge.h"
+#include "Document.h"
+
+namespace WebCore {
+
+void setCookies(Document* document, const KURL& url, const KURL& policyURL, const String& value)
+{
+    // We ignore the policyURL and compute it directly ourselves to ensure
+    // consistency with the cookies() method below.
+    ChromiumBridge::setCookies(url, document->policyBaseURL(), value);
+}
+
+String cookies(const Document* document, const KURL& url)
+{
+    return ChromiumBridge::cookies(url, document->policyBaseURL());
+}
+
+bool cookiesEnabled(const Document*)
+{
+    // FIXME: For now just assume cookies are always on.
+    return true;
+}
+
+} // namespace WebCore
diff --git a/WebCore/platform/network/chromium/DNSChromium.cpp b/WebCore/platform/network/chromium/DNSChromium.cpp
new file mode 100644 (file)
index 0000000..4da29e1
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2008 Collin Jackson  <collinj@webkit.org>
+ *
+ * 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 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. 
+ */
+
+#include "config.h"
+#include "DNS.h"
+
+#include "ChromiumBridge.h"
+
+namespace WebCore {
+
+void prefetchDNS(const String& hostname)
+{
+    ChromiumBridge::prefetchDNS(hostname);
+}
+
+} // namespace WebCore
diff --git a/WebCore/platform/network/chromium/NetworkStateNotifierChromium.cpp b/WebCore/platform/network/chromium/NetworkStateNotifierChromium.cpp
new file mode 100644 (file)
index 0000000..3b28fbd
--- /dev/null
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2008, 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 "NetworkStateNotifier.h"
+
+namespace WebCore {
+
+// Chromium doesn't currently support network state notifications. This causes
+// an extra DLL to get loaded into the renderer which can slow things down a
+// bit. We may want an alternate design.
+
+void NetworkStateNotifier::updateState()
+{
+}
+
+NetworkStateNotifier::NetworkStateNotifier()
+    : m_isOnLine(true)
+    , m_networkStateChangedFunction(0)
+{
+}
+
+} // namespace WebCore
diff --git a/WebCore/platform/network/chromium/NetworkStateNotifierPrivate.h b/WebCore/platform/network/chromium/NetworkStateNotifierPrivate.h
new file mode 100644 (file)
index 0000000..7628d59
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2008, 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 NetworkStateNotifierPrivate_h
+#define NetworkStateNotifierPrivate_h
+
+namespace WebCore {
+
+    struct NetworkStateNotifierPrivate {};
+
+} // namespace WebCore
+
+#endif
diff --git a/WebCore/platform/network/chromium/ResourceError.h b/WebCore/platform/network/chromium/ResourceError.h
new file mode 100644 (file)
index 0000000..a1fbe11
--- /dev/null
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2008 Google, Inc.
+ *
+ * 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 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)
+        {
+        }
+
+    private:
+        friend class ResourceErrorBase;
+    };
+
+} // namespace WebCore
+
+#endif
diff --git a/WebCore/platform/network/chromium/ResourceRequest.h b/WebCore/platform/network/chromium/ResourceRequest.h
new file mode 100644 (file)
index 0000000..76b8b99
--- /dev/null
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
+ * Copyright (C) 2008 Google, Inc.
+ *
+ * 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 ResourceRequest_h
+#define ResourceRequest_h
+
+#include "CString.h"
+#include "ResourceRequestBase.h"
+
+namespace WebCore {
+
+    class Frame;
+
+    class ResourceRequest : public ResourceRequestBase {
+    public:
+        enum TargetType {
+            TargetIsMainFrame,
+            TargetIsSubFrame,
+            TargetIsSubResource,
+            TargetIsObject,
+            TargetIsMedia
+        };
+
+        ResourceRequest(const String& url) 
+            : ResourceRequestBase(KURL(url), UseProtocolCachePolicy)
+            , m_frame(0)
+            , m_originPid(0)
+            , m_targetType(TargetIsSubResource)
+        {
+        }
+
+        ResourceRequest(const KURL& url, const CString& securityInfo) 
+            : ResourceRequestBase(url, UseProtocolCachePolicy)
+            , m_frame(0)
+            , m_originPid(0)
+            , m_targetType(TargetIsSubResource)
+            , m_securityInfo(securityInfo)
+        {
+        }
+
+        ResourceRequest(const KURL& url) 
+            : ResourceRequestBase(url, UseProtocolCachePolicy)
+            , m_frame(0)
+            , m_originPid(0)
+            , m_targetType(TargetIsSubResource)
+        {
+        }
+
+        ResourceRequest(const KURL& url, const String& referrer, ResourceRequestCachePolicy policy = UseProtocolCachePolicy) 
+            : ResourceRequestBase(url, policy)
+            , m_frame(0)
+            , m_originPid(0)
+            , m_targetType(TargetIsSubResource)
+        {
+            setHTTPReferrer(referrer);
+        }
+        
+        ResourceRequest()
+            : ResourceRequestBase(KURL(), UseProtocolCachePolicy)
+            , m_frame(0)
+            , m_originPid(0)
+            , m_targetType(TargetIsSubResource)
+        {
+        }
+
+        // Provides context for the resource request.
+        Frame* frame() const { return m_frame; }
+        void setFrame(Frame* frame) { m_frame = frame; }
+
+        // What this request is for.
+        void setTargetType(TargetType type) { m_targetType = type; }
+        TargetType targetType() const { return m_targetType; }
+        
+        // The origin pid is the process id of the process from which this
+        // request originated. In the case of out-of-process plugins, this
+        // allows to link back the request to the plugin process (as it is
+        // processed through a render view process).
+        int originPid() const { return m_originPid; }
+        void setOriginPid(int originPid) { m_originPid = originPid; }
+
+        // Opaque buffer that describes the security state (including SSL
+        // connection state) for the resource that should be reported when the
+        // resource has been loaded.  This is used to simulate secure
+        // connection for request (typically when showing error page, so the
+        // error page has the errors of the page that actually failed).  Empty
+        // string if not a secure connection.
+        CString securityInfo() const { return m_securityInfo; }
+        void setSecurityInfo(const CString& value) { m_securityInfo = value; }
+
+    private:
+        friend class ResourceRequestBase;
+
+        void doUpdatePlatformRequest() {}
+        void doUpdateResourceRequest() {}
+
+        Frame* m_frame;
+        int m_originPid;
+        TargetType m_targetType;
+        CString m_securityInfo;
+    };
+
+} // namespace WebCore
+
+#endif
index d018402..256df74 100644 (file)
@@ -1,83 +1,81 @@
- /*
 * Copyright (C) 2008 Google Inc.  All rights reserved.
 * Copyright (C) 2006 Apple Computer, 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. 
 */
+/*
* Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
* Copyright (C) 2008 Google, Inc.
+ *
+ * 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 ResourceResponse_h
 #define ResourceResponse_h
 
 #include "CString.h"
-#include "ResourceResponseBase.h"
-
 #include "NotImplemented.h"
+#include "ResourceResponseBase.h"
 
 namespace WebCore {
 
-class ResourceResponse : public ResourceResponseBase {
-public:
-    ResourceResponse()
-        : ResourceResponseBase(),
-          m_isContentFiltered(false)
-    {
-    }
+    class ResourceResponse : public ResourceResponseBase {
+    public:
+        ResourceResponse()
+            : m_isContentFiltered(false)
+        {
+        }
 
-    ResourceResponse(const KURL& url, const String& mimeType, long long expectedLength, const String& textEncodingName, const String& filename)
-        : ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename),
-          m_isContentFiltered(false)
-    {
-    }
+        ResourceResponse(const KURL& url, const String& mimeType, long long expectedLength, const String& textEncodingName, const String& filename)
+            : ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename),
+              m_isContentFiltered(false)
+        {
+        }
 
-    const CString& getSecurityInfo() const { return m_securityInfo; }
-    void setSecurityInfo(const CString& securityInfo)
-    {
-        m_securityInfo = securityInfo;
-    }
+        const CString& getSecurityInfo() const { return m_securityInfo; }
+        void setSecurityInfo(const CString& securityInfo)
+        {
+            m_securityInfo = securityInfo;
+        }
 
-    bool isContentFiltered() const { return m_isContentFiltered; }
-    void setIsContentFiltered(bool isContentFiltered)
-    {
-        m_isContentFiltered = isContentFiltered;
-    }
+        bool isContentFiltered() const { return m_isContentFiltered; }
+        void setIsContentFiltered(bool isContentFiltered)
+        {
+            m_isContentFiltered = isContentFiltered;
+        }
 
-private:
-    friend class ResourceResponseBase;
+    private:
+        friend class ResourceResponseBase;
 
-    // An opaque value that contains some information regarding the security of
-    // the connection for this request, such as SSL connection info (empty
-    // string if not over HTTPS).
-    CString m_securityInfo;
+        // An opaque value that contains some information regarding the security of
+        // the connection for this request, such as SSL connection info (empty
+        // string if not over HTTPS).
+        CString m_securityInfo;
 
-    void doUpdateResourceResponse()
-    {
-        notImplemented();
-    }
+        void doUpdateResourceResponse()
+        {
+            notImplemented();
+        }
 
-    // Whether the contents for this response has been altered/blocked (usually
-    // for security reasons.
-    bool m_isContentFiltered;
-};
+        // Whether the contents for this response has been altered/blocked (usually
+        // for security reasons.
+        bool m_isContentFiltered;
+    };
 
 } // namespace WebCore
 
-#endif // ResourceResponse_h
+#endif