[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit f7534a251dfb8cffd12e42ea6ffa34e8e06dd68b
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 04:06:25 2010 +0000

    2010-01-06  Mike Belshe  <mike at belshe.com>
    
            Add a flag to the ResourceResponse for tracking if a request was
            fetched via SPDY.  This is plumbed through so that we can inform
            a webpage via JavaScript if it was fecthed via the experimental
            SPDY protocol.
    
            https://bugs.webkit.org/show_bug.cgi?id=33186
    
            * platform/network/chromium/ResourceResponse.h:
            (WebCore::ResourceResponse::wasFetchedViaSpdy):
            (WebCore::ResourceResponse::setWasFetchedViaSpdy):
    2010-01-06  Mike Belshe  <mike at belshe.com>
    
            Add a flag to the ResourceResponse for tracking if a request was
            fetched via SPDY.  This is plumbed through so that we can inform
            a webpage via JavaScript if it was fecthed via the experimental
            SPDY protocol.
    
            https://bugs.webkit.org/show_bug.cgi?id=33186
    
            * public/WebURLResponse.h:
            * src/WebURLResponse.cpp:
            (WebKit::WebURLResponse::wasFetchedViaSpdy):
            (WebKit::WebURLResponse::setWasFetchedViaSpdy):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52898 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fc3d3b6..4900c95 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-06  Mike Belshe  <mike at belshe.com>
+
+        Add a flag to the ResourceResponse for tracking if a request was
+        fetched via SPDY.  This is plumbed through so that we can inform
+        a webpage via JavaScript if it was fecthed via the experimental
+        SPDY protocol.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33186
+
+        * platform/network/chromium/ResourceResponse.h:
+        (WebCore::ResourceResponse::wasFetchedViaSpdy):
+        (WebCore::ResourceResponse::setWasFetchedViaSpdy):
+
 2010-01-06  Jakub Wieczorek  <faw217 at gmail.com>
 
         Reviewed by Adam Treat.
diff --git a/WebCore/platform/network/chromium/ResourceResponse.h b/WebCore/platform/network/chromium/ResourceResponse.h
index 0c2b5d9..3797181 100644
--- a/WebCore/platform/network/chromium/ResourceResponse.h
+++ b/WebCore/platform/network/chromium/ResourceResponse.h
@@ -38,6 +38,7 @@ namespace WebCore {
         ResourceResponse()
             : m_isContentFiltered(false)
             , m_appCacheID(0)
+            , m_wasFetchedViaSpdy(false)
         {
         }
 
@@ -45,6 +46,7 @@ namespace WebCore {
             : ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename)
             , m_isContentFiltered(false)
             , m_appCacheID(0)
+            , m_wasFetchedViaSpdy(false)
         {
         }
 
@@ -72,6 +74,12 @@ namespace WebCore {
             m_appCacheManifestURL = url;
         }
 
+        bool wasFetchedViaSpdy() const { return m_wasFetchedViaSpdy; }
+        void setWasFetchedViaSpdy(bool value)
+        {
+            m_wasFetchedViaSpdy = value;
+        }
+
     private:
         friend class ResourceResponseBase;
 
@@ -96,6 +104,8 @@ namespace WebCore {
         // The manifest url of the appcache this response was retrieved from, if any.
         // Note: only valid for main resource responses.
         KURL m_appCacheManifestURL;
+
+        bool m_wasFetchedViaSpdy;
     };
 
 } // namespace WebCore
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index e4eb137..e2ec0d8 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-06  Mike Belshe  <mike at belshe.com>
+
+        Add a flag to the ResourceResponse for tracking if a request was
+        fetched via SPDY.  This is plumbed through so that we can inform
+        a webpage via JavaScript if it was fecthed via the experimental
+        SPDY protocol.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33186
+
+        * public/WebURLResponse.h:
+        * src/WebURLResponse.cpp:
+        (WebKit::WebURLResponse::wasFetchedViaSpdy):
+        (WebKit::WebURLResponse::setWasFetchedViaSpdy):
+
 2010-01-06  Darin Fisher  <darin at chromium.org>
 
         Fix release build bustage.
diff --git a/WebKit/chromium/public/WebURLResponse.h b/WebKit/chromium/public/WebURLResponse.h
index cdac83c..4d4a4e9 100644
--- a/WebKit/chromium/public/WebURLResponse.h
+++ b/WebKit/chromium/public/WebURLResponse.h
@@ -118,6 +118,11 @@ public:
     const WebCore::ResourceResponse& toResourceResponse() const;
 #endif
 
+    // Flag whether this request was loaded via the SPDY protocol or not.
+    // SPDY is an experimental web protocol, see http://dev.chromium.org/spdy
+    WEBKIT_API bool wasFetchedViaSpdy() const;
+    WEBKIT_API void setWasFetchedViaSpdy(bool);
+
 protected:
     void assign(WebURLResponsePrivate*);
 
diff --git a/WebKit/chromium/src/WebURLResponse.cpp b/WebKit/chromium/src/WebURLResponse.cpp
index 49f07f9..fa44f8d 100644
--- a/WebKit/chromium/src/WebURLResponse.cpp
+++ b/WebKit/chromium/src/WebURLResponse.cpp
@@ -255,6 +255,16 @@ const ResourceResponse& WebURLResponse::toResourceResponse() const
     return *m_private->m_resourceResponse;
 }
 
+bool WebURLResponse::wasFetchedViaSpdy() const
+{
+    return m_private->m_resourceResponse->wasFetchedViaSpdy();
+}
+
+void WebURLResponse::setWasFetchedViaSpdy(bool value)
+{
+    m_private->m_resourceResponse->setWasFetchedViaSpdy(value);
+}
+
 void WebURLResponse::assign(WebURLResponsePrivate* p)
 {
     // Subclasses may call this directly so a self-assignment check is needed

-- 
WebKit Debian packaging