[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[dumi at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit b13581dab1380d3767f5606695e8ded7261e63a1
Author: dumi at chromium.org <dumi at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 17 05:26:57 2010 +0000

    2010-09-16  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r67693.
            http://trac.webkit.org/changeset/67693
            https://bugs.webkit.org/show_bug.cgi?id=45946
    
            "Need to pick up a chromium change first" (Requested by dumi
            on #webkit).
    
            * public/WebHTTPBody.h:
            * src/WebHTTPBody.cpp:
            (WebKit::WebHTTPBody::elementAt):
            (WebKit::WebHTTPBody::appendFileRange):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67694 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d2a0f34..5f733d9 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-16  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r67693.
+        http://trac.webkit.org/changeset/67693
+        https://bugs.webkit.org/show_bug.cgi?id=45946
+
+        "Need to pick up a chromium change first" (Requested by dumi
+        on #webkit).
+
+        * public/WebHTTPBody.h:
+        * src/WebHTTPBody.cpp:
+        (WebKit::WebHTTPBody::elementAt):
+        (WebKit::WebHTTPBody::appendFileRange):
+
 2010-09-15  Dumitru Daniliuc  <dumi at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebHTTPBody.h b/WebKit/chromium/public/WebHTTPBody.h
index 8c37622..6e45bf6 100644
--- a/WebKit/chromium/public/WebHTTPBody.h
+++ b/WebKit/chromium/public/WebHTTPBody.h
@@ -32,6 +32,7 @@
 #define WebHTTPBody_h
 
 #include "WebData.h"
+#include "WebFileInfo.h"
 #include "WebNonCopyable.h"
 #include "WebString.h"
 #include "WebURL.h"
@@ -53,6 +54,8 @@ public:
         WebString filePath;
         long long fileStart;
         long long fileLength; // -1 means to the end of the file.
+        // FIXME: remove this field once all users of Element have been switched to use 'modificationTime'.
+        WebFileInfo fileInfo;
         double modificationTime;
         WebURL blobURL;
     };
@@ -85,6 +88,8 @@ public:
     WEBKIT_API void appendFile(const WebString&);
     // Passing -1 to fileLength means to the end of the file.
     WEBKIT_API void appendFileRange(const WebString&, long long fileStart, long long fileLength, double modificationTime);
+    // FIXME: Remove this method once all callers have been switched to use the method above.
+    WEBKIT_API void appendFileRange(const WebString&, long long fileStart, long long fileLength, const WebFileInfo&);
     WEBKIT_API void appendBlob(const WebURL&);
 
     // Identifies a particular form submission instance.  A value of 0 is
diff --git a/WebKit/chromium/src/WebHTTPBody.cpp b/WebKit/chromium/src/WebHTTPBody.cpp
index f32b64f..93b94c2 100644
--- a/WebKit/chromium/src/WebHTTPBody.cpp
+++ b/WebKit/chromium/src/WebHTTPBody.cpp
@@ -32,6 +32,7 @@
 #include "WebHTTPBody.h"
 
 #include "FormData.h"
+#include "WebFileInfo.h"
 
 using namespace WebCore;
 
@@ -77,6 +78,8 @@ bool WebHTTPBody::elementAt(size_t index, Element& result) const
     result.filePath.reset();
     result.fileStart = 0;
     result.fileLength = 0;
+    // FIXME: remove this line once all users of Element have been switched to use 'modificationTime'.
+    result.fileInfo.modificationTime = 0.0;
     result.modificationTime = 0.0;
     result.blobURL = KURL();
 
@@ -91,6 +94,8 @@ bool WebHTTPBody::elementAt(size_t index, Element& result) const
 #if ENABLE(BLOB)
         result.fileStart = element.m_fileStart;
         result.fileLength = element.m_fileLength;
+        // FIXME: remove this line once all users of Element have been switched to use 'modificationTime'.
+        result.fileInfo.modificationTime = element.m_expectedFileModificationTime;
         result.modificationTime = element.m_expectedFileModificationTime;
 #endif
         break;
@@ -130,6 +135,12 @@ void WebHTTPBody::appendFileRange(const WebString& filePath, long long fileStart
 #endif
 }
 
+// FIXME: Remove this method once all callers have been switched to use the method above.
+void WebHTTPBody::appendFileRange(const WebString& filePath, long long fileStart, long long fileLength, const WebFileInfo& fileInfo)
+{
+    return appendFileRange(filePath, fileStart, fileLength, fileInfo.modificationTime);
+}
+
 void WebHTTPBody::appendBlob(const WebURL& blobURL)
 {
 #if ENABLE(BLOB)

-- 
WebKit Debian packaging