[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 cbad701539ab39b230b00a3a720fa7fa8fdc602c
Author: dumi at chromium.org <dumi at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 05:47:19 2010 +0000

    Overload WebHTTPBody::appendFileRange() to take a double modification time argument.
    https://bugs.webkit.org/show_bug.cgi?id=45829
    
    Reviewed by Darin Fisher.
    
    The plan is to change all callers of
    WebHTTPBody::appendFileRange(..., const WebFileInfo&) to use the
    new method, and then remove it.
    
    * public/WebHTTPBody.h:
    * src/WebHTTPBody.cpp:
    (WebKit::WebHTTPBody::elementAt):
    (WebKit::WebHTTPBody::appendFileRange):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67598 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 600ea39..73ee03b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-15  Dumitru Daniliuc  <dumi at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Overload WebHTTPBody::appendFileRange() to take a double modification time argument.
+        https://bugs.webkit.org/show_bug.cgi?id=45829
+
+        The plan is to change all callers of
+        WebHTTPBody::appendFileRange(..., const WebFileInfo&) to use the
+        new method, and then remove it.
+
+        * public/WebHTTPBody.h:
+        * src/WebHTTPBody.cpp:
+        (WebKit::WebHTTPBody::elementAt):
+        (WebKit::WebHTTPBody::appendFileRange):
+
 2010-09-14  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebKit/chromium/public/WebHTTPBody.h b/WebKit/chromium/public/WebHTTPBody.h
index a2bb5cd..6e45bf6 100644
--- a/WebKit/chromium/public/WebHTTPBody.h
+++ b/WebKit/chromium/public/WebHTTPBody.h
@@ -54,7 +54,9 @@ 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 +87,8 @@ public:
     WEBKIT_API void appendData(const WebData&);
     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&);
 
diff --git a/WebKit/chromium/src/WebHTTPBody.cpp b/WebKit/chromium/src/WebHTTPBody.cpp
index e54b4e5..93b94c2 100644
--- a/WebKit/chromium/src/WebHTTPBody.cpp
+++ b/WebKit/chromium/src/WebHTTPBody.cpp
@@ -78,7 +78,9 @@ 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();
 
     switch (element.m_type) {
@@ -92,7 +94,9 @@ 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;
 #if ENABLE(BLOB)
@@ -123,14 +127,20 @@ void WebHTTPBody::appendFile(const WebString& filePath)
     m_private->appendFile(filePath);
 }
 
-void WebHTTPBody::appendFileRange(const WebString& filePath, long long fileStart, long long fileLength, const WebFileInfo& fileInfo)
+void WebHTTPBody::appendFileRange(const WebString& filePath, long long fileStart, long long fileLength, double modificationTime)
 {
 #if ENABLE(BLOB)
     ensureMutable();
-    m_private->appendFileRange(filePath, fileStart, fileLength, fileInfo.modificationTime);
+    m_private->appendFileRange(filePath, fileStart, fileLength, modificationTime);
 #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