Changeset 117529 in webkit

Timestamp:

May 17, 2012 7:36:45 PM (12 years ago)

Author:

fischman@chromium.org

Message:

[Chromium] Store HTTP version in WebURLResponse
​https://bugs.webkit.org/show_bug.cgi?id=86522

Reviewed by Adam Barth.

Source/Platform:

• chromium/public/WebURLResponse.h:

(WebURLResponse):

Source/WebCore:

No new tests; this isn't exposed to the web platform.

• platform/chromium/support/WebURLResponse.cpp:

(WebKit::WebURLResponse::httpVersion):
(WebKit):
(WebKit::WebURLResponse::setHTTPVersion):

• platform/network/chromium/ResourceResponse.h:

(ResourceResponse):
(WebCore::ResourceResponse::ResourceResponse):
(WebCore::ResourceResponse::httpVersion):
(WebCore::ResourceResponse::setHTTPVersion):

Location:

trunk/Source

Files:

• Platform/ChangeLog (modified) (1 diff)
• Platform/chromium/public/WebURLResponse.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/chromium/support/WebURLResponse.cpp (modified) (1 diff)
• WebCore/platform/network/chromium/ResourceResponse.h (modified) (5 diffs)
• WebKit/chromium/src/AssertMatchingEnums.cpp (modified) (3 diffs)

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2012-05-17  Ami Fischman  <fischman@chromium.org>
+
+        [Chromium] Store HTTP version in WebURLResponse
+        https://bugs.webkit.org/show_bug.cgi?id=86522
+
+        Reviewed by Adam Barth.
+
+        * chromium/public/WebURLResponse.h:
+        (WebURLResponse):
+
 2012-05-17  Vangelis Kokkevis  <vangelis@chromium.org>
 

trunk/Source/Platform/chromium/public/WebURLResponse.h

@@ -51 +51 @@
 class WebURLResponse {
 public:
+    enum HTTPVersion { Unknown, HTTP_0_9, HTTP_1_0, HTTP_1_1 };
+
     class ExtraData {
     public:
@@ -107 +109 @@
     WEBKIT_EXPORT WebString suggestedFileName() const;
     WEBKIT_EXPORT void setSuggestedFileName(const WebString&);
+
+    WEBKIT_EXPORT HTTPVersion httpVersion() const;
+    WEBKIT_EXPORT void setHTTPVersion(HTTPVersion);
 
     WEBKIT_EXPORT int httpStatusCode() const;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-17  Ami Fischman  <fischman@chromium.org>
+
+        [Chromium] Store HTTP version in WebURLResponse
+        https://bugs.webkit.org/show_bug.cgi?id=86522
+
+        Reviewed by Adam Barth.
+
+        No new tests; this isn't exposed to the web platform.
+
+        * platform/chromium/support/WebURLResponse.cpp:
+        (WebKit::WebURLResponse::httpVersion):
+        (WebKit):
+        (WebKit::WebURLResponse::setHTTPVersion):
+        * platform/network/chromium/ResourceResponse.h:
+        (ResourceResponse):
+        (WebCore::ResourceResponse::ResourceResponse):
+        (WebCore::ResourceResponse::httpVersion):
+        (WebCore::ResourceResponse::setHTTPVersion):
+
 2012-05-17  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/platform/chromium/support/WebURLResponse.cpp

@@ -212 +212 @@
 }
 
+WebURLResponse::HTTPVersion WebURLResponse::httpVersion() const
+{
+    return static_cast<HTTPVersion>(m_private->m_resourceResponse->httpVersion());
+}
+
+void WebURLResponse::setHTTPVersion(HTTPVersion version)
+{
+    m_private->m_resourceResponse->setHTTPVersion(static_cast<ResourceResponse::HTTPVersion>(version));
+}
+
 int WebURLResponse::httpStatusCode() const
 {

trunk/Source/WebCore/platform/network/chromium/ResourceResponse.h

@@ -37 +37 @@
     class ResourceResponse : public ResourceResponseBase {
     public:
+        // FIXME: move this to ResourceResponseBase and implement for all ports (see history in http://webkit.org/b/86522).
+        enum HTTPVersion { Unknown, HTTP_0_9, HTTP_1_0, HTTP_1_1 };
+
         class ExtraData : public RefCounted<ExtraData> {
         public:
@@ -43 +46 @@
 
         ResourceResponse()
-            : m_appCacheID(0)
+            : m_httpVersion(Unknown)
+            , m_appCacheID(0)
             , m_isMultipartPayload(false)
             , m_wasFetchedViaSPDY(false)
@@ -56 +60 @@
         ResourceResponse(const KURL& url, const String& mimeType, long long expectedLength, const String& textEncodingName, const String& filename)
             : ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename)
+            , m_httpVersion(Unknown)
             , m_appCacheID(0)
             , m_isMultipartPayload(false)
@@ -66 +71 @@
         {
         }
+
+        HTTPVersion httpVersion() const { return m_httpVersion; }
+        void setHTTPVersion(HTTPVersion version) { m_httpVersion = version; }
 
         const CString& getSecurityInfo() const { return m_securityInfo; }
@@ -129 +137 @@
         void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>);
 
+        // HTTP version used in the response, if known.
+        HTTPVersion m_httpVersion;
+
         // The id of the appcache this response was retrieved from, or zero if
         // the response was not retrieved from an appcache.

trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp

@@ -63 +63 @@
 #include "PlatformCursor.h"
 #include "ReferrerPolicy.h"
+#include "ResourceResponse.h"
 #include "Settings.h"
 #include "SpeechRecognitionError.h"
@@ -110 +111 @@
 #include <public/WebFilterOperation.h>
 #include <public/WebReferrerPolicy.h>
+#include <public/WebURLResponse.h>
 #include <wtf/Assertions.h>
 #include <wtf/text/StringImpl.h>
@@ -585 +587 @@
 COMPILE_ASSERT_MATCHING_ENUM(WebContentSecurityPolicyTypeReportOnly, ContentSecurityPolicy::ReportOnly);
 COMPILE_ASSERT_MATCHING_ENUM(WebContentSecurityPolicyTypeEnforcePolicy, ContentSecurityPolicy::EnforcePolicy);
+
+COMPILE_ASSERT_MATCHING_ENUM(WebURLResponse::Unknown, ResourceResponse::Unknown);
+COMPILE_ASSERT_MATCHING_ENUM(WebURLResponse::HTTP_0_9, ResourceResponse::HTTP_0_9);
+COMPILE_ASSERT_MATCHING_ENUM(WebURLResponse::HTTP_1_0, ResourceResponse::HTTP_1_0);
+COMPILE_ASSERT_MATCHING_ENUM(WebURLResponse::HTTP_1_1, ResourceResponse::HTTP_1_1);