[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 33b188e9f063ec43c1c6d90754c2af9feddd152e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 8 07:08:52 2010 +0000

    2010-01-07  Mike Belshe  <mbelshe at chromium.org>
    
            Reviewed by Darin Adler.
    
            Fix Spdy casing to match style guide.
    
            https://bugs.webkit.org/show_bug.cgi?id=33326
    
            * platform/network/chromium/ResourceResponse.h:
            (WebCore::ResourceResponse::ResourceResponse):
            (WebCore::ResourceResponse::wasFetchedViaSPDY):
            (WebCore::ResourceResponse::setWasFetchedViaSPDY):
    2010-01-07  Mike Belshe  <mbelshe at chromium.org>
    
            Reviewed by Darin Adler.
    
            Fix Spdy casing to match style guide.
    
            https://bugs.webkit.org/show_bug.cgi?id=33326
    
            * public/WebURLResponse.h:
            * src/WebURLResponse.cpp:
            (WebKit::WebURLResponse::wasFetchedViaSPDY):
            (WebKit::WebURLResponse::setWasFetchedViaSPDY):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52974 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 046fa2c..6827408 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-07  Mike Belshe  <mbelshe at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Fix Spdy casing to match style guide.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33326
+
+        * platform/network/chromium/ResourceResponse.h:
+        (WebCore::ResourceResponse::ResourceResponse):
+        (WebCore::ResourceResponse::wasFetchedViaSPDY):
+        (WebCore::ResourceResponse::setWasFetchedViaSPDY):
+
 2010-01-07  Daniel Bates  <dbates at rim.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/network/chromium/ResourceResponse.h b/WebCore/platform/network/chromium/ResourceResponse.h
index 3797181..1b9de04 100644
--- a/WebCore/platform/network/chromium/ResourceResponse.h
+++ b/WebCore/platform/network/chromium/ResourceResponse.h
@@ -38,7 +38,7 @@ namespace WebCore {
         ResourceResponse()
             : m_isContentFiltered(false)
             , m_appCacheID(0)
-            , m_wasFetchedViaSpdy(false)
+            , m_wasFetchedViaSPDY(false)
         {
         }
 
@@ -46,7 +46,7 @@ namespace WebCore {
             : ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename)
             , m_isContentFiltered(false)
             , m_appCacheID(0)
-            , m_wasFetchedViaSpdy(false)
+            , m_wasFetchedViaSPDY(false)
         {
         }
 
@@ -74,10 +74,10 @@ namespace WebCore {
             m_appCacheManifestURL = url;
         }
 
-        bool wasFetchedViaSpdy() const { return m_wasFetchedViaSpdy; }
-        void setWasFetchedViaSpdy(bool value)
+        bool wasFetchedViaSPDY() const { return m_wasFetchedViaSPDY; }
+        void setWasFetchedViaSPDY(bool value)
         {
-            m_wasFetchedViaSpdy = value;
+            m_wasFetchedViaSPDY = value;
         }
 
     private:
@@ -105,7 +105,7 @@ namespace WebCore {
         // Note: only valid for main resource responses.
         KURL m_appCacheManifestURL;
 
-        bool m_wasFetchedViaSpdy;
+        bool m_wasFetchedViaSPDY;
     };
 
 } // namespace WebCore
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6e4f5bc..dcdbbab 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-07  Mike Belshe  <mbelshe at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Fix Spdy casing to match style guide.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33326
+
+        * public/WebURLResponse.h:
+        * src/WebURLResponse.cpp:
+        (WebKit::WebURLResponse::wasFetchedViaSPDY):
+        (WebKit::WebURLResponse::setWasFetchedViaSPDY):
+
 2010-01-07  Daniel Bates  <dbates at rim.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit/chromium/public/WebURLResponse.h b/WebKit/chromium/public/WebURLResponse.h
index 4d4a4e9..1dac069 100644
--- a/WebKit/chromium/public/WebURLResponse.h
+++ b/WebKit/chromium/public/WebURLResponse.h
@@ -120,8 +120,8 @@ public:
 
     // 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);
+    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 fa44f8d..95e0be2 100644
--- a/WebKit/chromium/src/WebURLResponse.cpp
+++ b/WebKit/chromium/src/WebURLResponse.cpp
@@ -255,14 +255,14 @@ const ResourceResponse& WebURLResponse::toResourceResponse() const
     return *m_private->m_resourceResponse;
 }
 
-bool WebURLResponse::wasFetchedViaSpdy() const
+bool WebURLResponse::wasFetchedViaSPDY() const
 {
-    return m_private->m_resourceResponse->wasFetchedViaSpdy();
+    return m_private->m_resourceResponse->wasFetchedViaSPDY();
 }
 
-void WebURLResponse::setWasFetchedViaSpdy(bool value)
+void WebURLResponse::setWasFetchedViaSPDY(bool value)
 {
-    m_private->m_resourceResponse->setWasFetchedViaSpdy(value);
+    m_private->m_resourceResponse->setWasFetchedViaSPDY(value);
 }
 
 void WebURLResponse::assign(WebURLResponsePrivate* p)

-- 
WebKit Debian packaging