2009-05-22 Adam Barth <abarth@webkit.org>

        Reviewed by Darin Fisher.

        https://bugs.webkit.org/show_bug.cgi?id=25966

        Remove redudant member from Chromium's ResourceRequest.  We already
        have this data in the cross-platform ResourceRequestBase.  Also, rename
        ChromiumBridge parameter to be consistant with the new name for this
        piece of data.

        * platform/chromium/ChromiumBridge.h:
        * platform/network/chromium/ResourceRequest.h:

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 87714f5588873cb7605b8cea4b048eb7b48c0eed..78034a87c213f82d364a7fe35a6c34449216a61a 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-05-22  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Fisher.
+
+        https://bugs.webkit.org/show_bug.cgi?id=25966
+
+        Remove redudant member from Chromium's ResourceRequest.  We already
+        have this data in the cross-platform ResourceRequestBase.  Also, rename
+        ChromiumBridge parameter to be consistant with the new name for this
+        piece of data.
+
+        * platform/chromium/ChromiumBridge.h:
+        * platform/network/chromium/ResourceRequest.h:
+
 2009-05-22  Kevin Watters  <kevinwatters@gmail.com>
 
         Reviewed by Kevin Ollivier.

diff --git a/WebCore/platform/chromium/ChromiumBridge.h b/WebCore/platform/chromium/ChromiumBridge.h
index 379546d3316d1c7814b03a0b7e634c60ad44b2ff..75e9103978bb5d9976c48a3907564aeb2ec53ba6 100644 (file)
--- a/WebCore/platform/chromium/ChromiumBridge.h
+++ b/WebCore/platform/chromium/ChromiumBridge.h
@@ -76,8 +76,8 @@ namespace WebCore {
         static void clipboardWriteImage(const NativeImageSkia*, const KURL&, const String&);
 
         // Cookies ------------------------------------------------------------
-        static void setCookies(const KURL& url, const KURL& policyURL, const String& value);
-        static String cookies(const KURL& url, const KURL& policyURL);
+        static void setCookies(const KURL& url, const KURL& firstPartyForCookies, const String& value);
+        static String cookies(const KURL& url, const KURL& firstPartyForCookies);
 
         // DNS ----------------------------------------------------------------
         static void prefetchDNS(const String& hostname);

diff --git a/WebCore/platform/network/chromium/ResourceRequest.h b/WebCore/platform/network/chromium/ResourceRequest.h
index e4107f5919dc68f91da0da58108811bc4dc2a172..aa76de4d34126cb1bc16238a81986a51cd928241 100644 (file)
--- a/WebCore/platform/network/chromium/ResourceRequest.h
+++ b/WebCore/platform/network/chromium/ResourceRequest.h
@@ -100,10 +100,6 @@ namespace WebCore {
         TargetType targetType() const { return m_targetType; }
         void setTargetType(TargetType type) { m_targetType = type; }
 
-        // The document's policy base url.
-        KURL policyURL() const { return m_policyURL; }
-        void setPolicyURL(const KURL& policyURL) { m_policyURL = policyURL; }
-
         // 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
@@ -135,7 +131,6 @@ namespace WebCore {
         int m_appCacheContextID;
         TargetType m_targetType;
         CString m_securityInfo;
-        KURL m_policyURL;
     };
 
 } // namespace WebCore