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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 5baf2d316c619a2b7a2c07d49c0598464a24d228
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 1 19:40:35 2010 +0000

    2010-10-01  Daniel Cheng  <dcheng at chromium.org>
    
            Reviewed by Tony Chang.
    
            [chromium] Minor naming cleanup in WebDragData
            https://bugs.webkit.org/show_bug.cgi?id=46937
    
            This is a two-part patch--one to add the new methods with normalized
            names that follow general WebKit convention, and a followup patch to
            remove the original methods once Chromium is updated.
    
            * public/WebDragData.h:
            * src/WebDragData.cpp:
            (WebKit::WebDragData::hasFileNames): renamed to containsFilenames
            (WebKit::WebDragData::fileNames): renamed to filenames
            (WebKit::WebDragData::setFileNames): renamed to setFilenames
            (WebKit::WebDragData::appendToFileNames): renamed to appendToFilenames
            (WebKit::WebDragData::containsFilenames):
            (WebKit::WebDragData::filenames):
            (WebKit::WebDragData::setFilenames):
            (WebKit::WebDragData::appendToFilenames):
            (WebKit::WebDragData::fileContentFileName): renamed to fileContentFilename
            (WebKit::WebDragData::setFileContentFileName): renamed to setFileContentFilename
            (WebKit::WebDragData::fileContentFilename):
            (WebKit::WebDragData::setFileContentFilename):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68915 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index b01aabe..e1d049b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,29 @@
+2010-10-01  Daniel Cheng  <dcheng at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [chromium] Minor naming cleanup in WebDragData
+        https://bugs.webkit.org/show_bug.cgi?id=46937
+
+        This is a two-part patch--one to add the new methods with normalized
+        names that follow general WebKit convention, and a followup patch to
+        remove the original methods once Chromium is updated.
+
+        * public/WebDragData.h:
+        * src/WebDragData.cpp:
+        (WebKit::WebDragData::hasFileNames): renamed to containsFilenames
+        (WebKit::WebDragData::fileNames): renamed to filenames
+        (WebKit::WebDragData::setFileNames): renamed to setFilenames
+        (WebKit::WebDragData::appendToFileNames): renamed to appendToFilenames
+        (WebKit::WebDragData::containsFilenames):
+        (WebKit::WebDragData::filenames):
+        (WebKit::WebDragData::setFilenames):
+        (WebKit::WebDragData::appendToFilenames):
+        (WebKit::WebDragData::fileContentFileName): renamed to fileContentFilename
+        (WebKit::WebDragData::setFileContentFileName): renamed to setFileContentFilename
+        (WebKit::WebDragData::fileContentFilename):
+        (WebKit::WebDragData::setFileContentFilename):
+
 2010-10-01  Jochen Eisinger  <jochen at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebDragData.h b/WebKit/chromium/public/WebDragData.h
index 6748fe0..b1985c1 100644
--- a/WebKit/chromium/public/WebDragData.h
+++ b/WebKit/chromium/public/WebDragData.h
@@ -78,11 +78,17 @@ public:
     WEBKIT_API WebString fileExtension() const;
     WEBKIT_API void setFileExtension(const WebString&);
 
+    // These methods are deprecated in favor of the ones in the next block.
     WEBKIT_API bool hasFileNames() const;
     WEBKIT_API void fileNames(WebVector<WebString>&) const;
     WEBKIT_API void setFileNames(const WebVector<WebString>&);
     WEBKIT_API void appendToFileNames(const WebString&);
 
+    WEBKIT_API bool containsFilenames() const;
+    WEBKIT_API void filenames(WebVector<WebString>&) const;
+    WEBKIT_API void setFilenames(const WebVector<WebString>&);
+    WEBKIT_API void appendToFilenames(const WebString&);
+
     WEBKIT_API WebString plainText() const;
     WEBKIT_API void setPlainText(const WebString&);
 
@@ -92,9 +98,13 @@ public:
     WEBKIT_API WebURL htmlBaseURL() const;
     WEBKIT_API void setHTMLBaseURL(const WebURL&);
 
+    // These methods are deprecated in favor of the ones in the next block.
     WEBKIT_API WebString fileContentFileName() const;
     WEBKIT_API void setFileContentFileName(const WebString&);
 
+    WEBKIT_API WebString fileContentFilename() const;
+    WEBKIT_API void setFileContentFilename(const WebString&);
+
     WEBKIT_API WebData fileContent() const;
     WEBKIT_API void setFileContent(const WebData&);
 
diff --git a/WebKit/chromium/src/WebDragData.cpp b/WebKit/chromium/src/WebDragData.cpp
index bc6bdcc..1b19940 100644
--- a/WebKit/chromium/src/WebDragData.cpp
+++ b/WebKit/chromium/src/WebDragData.cpp
@@ -117,30 +117,50 @@ void WebDragData::setFileExtension(const WebString& fileExtension)
 
 bool WebDragData::hasFileNames() const
 {
+    return containsFilenames();
+}
+
+void WebDragData::fileNames(WebVector<WebString>& fileNames) const
+{
+    filenames(fileNames);
+}
+
+void WebDragData::setFileNames(const WebVector<WebString>& fileNames)
+{
+    return setFilenames(fileNames);
+}
+
+void WebDragData::appendToFileNames(const WebString& fileName)
+{
+    return appendToFilenames(fileName);
+}
+
+bool WebDragData::containsFilenames() const
+{
     ASSERT(!isNull());
     return m_private->containsFilenames();
 }
 
-void WebDragData::fileNames(WebVector<WebString>& fileNames) const
+void WebDragData::filenames(WebVector<WebString>& filenames) const
 {
     ASSERT(!isNull());
-    fileNames = m_private->filenames();
+    filenames = m_private->filenames();
 }
 
-void WebDragData::setFileNames(const WebVector<WebString>& fileNames)
+void WebDragData::setFilenames(const WebVector<WebString>& filenames)
 {
     ensureMutable();
-    Vector<String> fileNamesCopy;
-    fileNamesCopy.append(fileNames.data(), fileNames.size());
-    m_private->setFilenames(fileNamesCopy);
+    Vector<String> filenamesCopy;
+    filenamesCopy.append(filenames.data(), filenames.size());
+    m_private->setFilenames(filenamesCopy);
 }
 
-void WebDragData::appendToFileNames(const WebString& fileName)
+void WebDragData::appendToFilenames(const WebString& filename)
 {
     ensureMutable();
-    Vector<String> fileNames = m_private->filenames();
-    fileNames.append(fileName);
-    m_private->setFilenames(fileNames);
+    Vector<String> filenames = m_private->filenames();
+    filenames.append(filename);
+    m_private->setFilenames(filenames);
 }
 
 WebString WebDragData::plainText() const
@@ -183,14 +203,24 @@ void WebDragData::setHTMLBaseURL(const WebURL& htmlBaseURL)
 
 WebString WebDragData::fileContentFileName() const
 {
+    return fileContentFilename();
+}
+
+void WebDragData::setFileContentFileName(const WebString& fileName)
+{
+    return setFileContentFilename(fileName);
+}
+
+WebString WebDragData::fileContentFilename() const
+{
     ASSERT(!isNull());
     return m_private->fileContentFilename();
 }
 
-void WebDragData::setFileContentFileName(const WebString& fileName)
+void WebDragData::setFileContentFilename(const WebString& filename)
 {
     ensureMutable();
-    m_private->setFileContentFilename(fileName);
+    m_private->setFileContentFilename(filename);
 }
 
 WebData WebDragData::fileContent() const

-- 
WebKit Debian packaging