[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 f8389bc5c26a76d651019c55c98e726169601fa2
Author: dumi at chromium.org <dumi at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 17 04:56:00 2010 +0000

    Remove WebHTTPBody::appendFileRange(..., const WebFileInfo&).
    
    Reviewed by Darin Fisher.
    
    * public/WebHTTPBody.h:
    * src/WebHTTPBody.cpp:
    (WebKit::WebHTTPBody::elementAt):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67693 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 1e98df0..d2a0f34 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-15  Dumitru Daniliuc  <dumi at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Remove WebHTTPBody::appendFileRange(..., const WebFileInfo&).
+
+        * public/WebHTTPBody.h:
+        * src/WebHTTPBody.cpp:
+        (WebKit::WebHTTPBody::elementAt):
+
 2010-09-16  Kenneth Russell  <kbr at google.com>
 
         Reviewed by James Robinson.
diff --git a/WebKit/chromium/public/WebHTTPBody.h b/WebKit/chromium/public/WebHTTPBody.h
index 6e45bf6..8c37622 100644
--- a/WebKit/chromium/public/WebHTTPBody.h
+++ b/WebKit/chromium/public/WebHTTPBody.h
@@ -32,7 +32,6 @@
 #define WebHTTPBody_h
 
 #include "WebData.h"
-#include "WebFileInfo.h"
 #include "WebNonCopyable.h"
 #include "WebString.h"
 #include "WebURL.h"
@@ -54,8 +53,6 @@ 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;
     };
@@ -88,8 +85,6 @@ 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 93b94c2..f32b64f 100644
--- a/WebKit/chromium/src/WebHTTPBody.cpp
+++ b/WebKit/chromium/src/WebHTTPBody.cpp
@@ -32,7 +32,6 @@
 #include "WebHTTPBody.h"
 
 #include "FormData.h"
-#include "WebFileInfo.h"
 
 using namespace WebCore;
 
@@ -78,8 +77,6 @@ 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();
 
@@ -94,8 +91,6 @@ 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;
@@ -135,12 +130,6 @@ 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