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

[tony at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 55f35a76478a8930b3019bbd93fe332e75399bc8
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 3 07:22:24 2010 +0000

    2010-03-02  Tony Chang  <tony at chromium.org>
    
            Reviewed by Darin Fisher.
    
            add a flag to WebURLResponse so we can identify multipart content
            https://bugs.webkit.org/show_bug.cgi?id=35628
    
            * platform/network/chromium/ResourceResponse.h:
            (WebCore::ResourceResponse::ResourceResponse):
            (WebCore::ResourceResponse::isMultipartPayload):
            (WebCore::ResourceResponse::setIsMultipartPayload):
    2010-03-02  Tony Chang  <tony at chromium.org>
    
            Reviewed by Darin Fisher.
    
            add a flag to WebURLResponse so we can identify multipart content
            https://bugs.webkit.org/show_bug.cgi?id=35628
    
            * public/WebURLResponse.h:
            * src/WebURLResponse.cpp:
            (WebKit::WebURLResponse::isMultipartPayload):
            (WebKit::WebURLResponse::setIsMultipartPayload):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55451 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a58b9c1..dbcf871 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,17 @@
 2010-03-02  Tony Chang  <tony at chromium.org>
 
+        Reviewed by Darin Fisher.
+
+        add a flag to WebURLResponse so we can identify multipart content
+        https://bugs.webkit.org/show_bug.cgi?id=35628
+
+        * platform/network/chromium/ResourceResponse.h:
+        (WebCore::ResourceResponse::ResourceResponse):
+        (WebCore::ResourceResponse::isMultipartPayload):
+        (WebCore::ResourceResponse::setIsMultipartPayload):
+
+2010-03-02  Tony Chang  <tony at chromium.org>
+
         Not reviewed, test fix.
 
         Revert r55447 because the new layout test is crashing consistently
diff --git a/WebCore/platform/network/chromium/ResourceResponse.h b/WebCore/platform/network/chromium/ResourceResponse.h
index 1b9de04..f7a2c6c 100644
--- a/WebCore/platform/network/chromium/ResourceResponse.h
+++ b/WebCore/platform/network/chromium/ResourceResponse.h
@@ -47,6 +47,7 @@ namespace WebCore {
             , m_isContentFiltered(false)
             , m_appCacheID(0)
             , m_wasFetchedViaSPDY(false)
+            , m_isMultipartPayload(false)
         {
         }
 
@@ -80,6 +81,12 @@ namespace WebCore {
             m_wasFetchedViaSPDY = value;
         }
 
+        bool isMultipartPayload() const { return m_isMultipartPayload; }
+        void setIsMultipartPayload(bool value)
+        {
+            m_isMultipartPayload = value;
+        }
+
     private:
         friend class ResourceResponseBase;
 
@@ -106,6 +113,9 @@ namespace WebCore {
         KURL m_appCacheManifestURL;
 
         bool m_wasFetchedViaSPDY;
+
+        // Set to true if this is part of a multipart response.
+        bool m_isMultipartPayload;
     };
 
 } // namespace WebCore
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 168e066..8efff86 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-02  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        add a flag to WebURLResponse so we can identify multipart content
+        https://bugs.webkit.org/show_bug.cgi?id=35628
+
+        * public/WebURLResponse.h:
+        * src/WebURLResponse.cpp:
+        (WebKit::WebURLResponse::isMultipartPayload):
+        (WebKit::WebURLResponse::setIsMultipartPayload):
+
 2010-03-02  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebURLResponse.h b/WebKit/chromium/public/WebURLResponse.h
index 1dac069..3acacf8 100644
--- a/WebKit/chromium/public/WebURLResponse.h
+++ b/WebKit/chromium/public/WebURLResponse.h
@@ -123,6 +123,10 @@ public:
     WEBKIT_API bool wasFetchedViaSPDY() const;
     WEBKIT_API void setWasFetchedViaSPDY(bool);
 
+    // Flag whether this request is part of a multipart response.
+    WEBKIT_API bool isMultipartPayload() const;
+    WEBKIT_API void setIsMultipartPayload(bool);
+
 protected:
     void assign(WebURLResponsePrivate*);
 
diff --git a/WebKit/chromium/src/WebURLResponse.cpp b/WebKit/chromium/src/WebURLResponse.cpp
index 95e0be2..77fc655 100644
--- a/WebKit/chromium/src/WebURLResponse.cpp
+++ b/WebKit/chromium/src/WebURLResponse.cpp
@@ -265,6 +265,16 @@ void WebURLResponse::setWasFetchedViaSPDY(bool value)
     m_private->m_resourceResponse->setWasFetchedViaSPDY(value);
 }
 
+bool WebURLResponse::isMultipartPayload() const
+{
+    return m_private->m_resourceResponse->isMultipartPayload();
+}
+
+void WebURLResponse::setIsMultipartPayload(bool value)
+{
+    m_private->m_resourceResponse->setIsMultipartPayload(value);
+}
+
 void WebURLResponse::assign(WebURLResponsePrivate* p)
 {
     // Subclasses may call this directly so a self-assignment check is needed

-- 
WebKit Debian packaging