[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 894ed54dd9e2786bac36aaf7457572abfc9249d0
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 13 23:19:28 2009 +0000

    2009-10-13  Roland Steiner  <rolandsteiner at google.com>
    
            Reviewed by Adam Barth.
    
            Bug 28964 -  [Chromium] ChromiumDataObject should have getter/setter interface
    
            Reworked and added to the getter/setter interface in ChromiumDataObject:
            - added contains...() methods to just query the state
            - added containsValid...URL() methods for URL data members
            - removed takeFileNames() as this was too type-dependent
            - changed return type of fileNames() to Vector<String>
            - added interface methods to allow appending to and iteration over file names
    
            No new tests (no functional behavior changed).
    
            * platform/chromium/ChromiumDataObject.h:
            (WebCore::ChromiumDataObject::containsMainURL):
            (WebCore::ChromiumDataObject::containsValidMainURL):
            (WebCore::ChromiumDataObject::containsMainURLTitle):
            (WebCore::ChromiumDataObject::containsTextPlain):
            (WebCore::ChromiumDataObject::containsTextHTML):
            (WebCore::ChromiumDataObject::containsHTMLBaseURL):
            (WebCore::ChromiumDataObject::containsValidHTMLBaseURL):
            (WebCore::ChromiumDataObject::containsContent):
            (WebCore::ChromiumDataObject::containsContentFileExtension):
            (WebCore::ChromiumDataObject::containsContentFileName):
            (WebCore::ChromiumDataObject::setContentFileName):
            (WebCore::ChromiumDataObject::containsFileNames):
            (WebCore::ChromiumDataObject::fileNames):
            (WebCore::ChromiumDataObject::clearFileNames):
            (WebCore::ChromiumDataObject::countFileNames):
            (WebCore::ChromiumDataObject::fileNameAt):
            (WebCore::ChromiumDataObject::setFileNames):
            (WebCore::ChromiumDataObject::appendToFileNames):
            (WebCore::ChromiumDataObject::popFileName):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49524 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 22ac5c9..f87badb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,39 @@
+2009-10-13  Roland Steiner  <rolandsteiner at google.com>
+
+        Reviewed by Adam Barth.
+
+        Bug 28964 -  [Chromium] ChromiumDataObject should have getter/setter interface
+
+        Reworked and added to the getter/setter interface in ChromiumDataObject:
+        - added contains...() methods to just query the state
+        - added containsValid...URL() methods for URL data members
+        - removed takeFileNames() as this was too type-dependent
+        - changed return type of fileNames() to Vector<String>
+        - added interface methods to allow appending to and iteration over file names
+
+        No new tests (no functional behavior changed).
+
+        * platform/chromium/ChromiumDataObject.h:
+        (WebCore::ChromiumDataObject::containsMainURL):
+        (WebCore::ChromiumDataObject::containsValidMainURL):
+        (WebCore::ChromiumDataObject::containsMainURLTitle):
+        (WebCore::ChromiumDataObject::containsTextPlain):
+        (WebCore::ChromiumDataObject::containsTextHTML):
+        (WebCore::ChromiumDataObject::containsHTMLBaseURL):
+        (WebCore::ChromiumDataObject::containsValidHTMLBaseURL):
+        (WebCore::ChromiumDataObject::containsContent):
+        (WebCore::ChromiumDataObject::containsContentFileExtension):
+        (WebCore::ChromiumDataObject::containsContentFileName):
+        (WebCore::ChromiumDataObject::setContentFileName):
+        (WebCore::ChromiumDataObject::containsFileNames):
+        (WebCore::ChromiumDataObject::fileNames):
+        (WebCore::ChromiumDataObject::clearFileNames):
+        (WebCore::ChromiumDataObject::countFileNames):
+        (WebCore::ChromiumDataObject::fileNameAt):
+        (WebCore::ChromiumDataObject::setFileNames):
+        (WebCore::ChromiumDataObject::appendToFileNames):
+        (WebCore::ChromiumDataObject::popFileName):
+
 2009-10-13  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/platform/chromium/ChromiumDataObject.h b/WebCore/platform/chromium/ChromiumDataObject.h
index a227001..fe6d073 100644
--- a/WebCore/platform/chromium/ChromiumDataObject.h
+++ b/WebCore/platform/chromium/ChromiumDataObject.h
@@ -55,35 +55,61 @@ namespace WebCore {
 
         void clear();
         bool hasData() const;
-        
+
+        bool containsMainURL() const { return !url.isEmpty(); }
+        bool containsValidMainURL() const { return url.isValid(); }
         KURL mainURL() const { return url; }
         void setMainURL(const KURL& newURL) { url = newURL; }
 
+        bool containsMainURLTitle() const { return !urlTitle.isEmpty(); }
         String mainURLTitle() const { return urlTitle; }
         void setMainURLTitle(const String& newURLTitle) { urlTitle = newURLTitle; }
 
+        bool containsTextPlain() const { return !plainText.isEmpty(); }
         String textPlain() const { return plainText; }
         void setTextPlain(const String& newText) { plainText = newText; }
 
+        bool containsTextHTML() const { return !textHtml.isEmpty(); }
         String textHTML() const { return textHtml; }
         void setTextHTML(const String& newText) { textHtml = newText; }
 
+        bool containsHTMLBaseURL() const { return !htmlBaseUrl.isEmpty(); }
+        bool containsValidHTMLBaseURL() const { return htmlBaseUrl.isValid(); }
         KURL htmlBaseURL() const { return htmlBaseUrl; }
         void setHTMLBaseURL(const KURL& newURL) { htmlBaseUrl = newURL; }
 
+        bool containsContent() const { return fileContent; }
         SharedBuffer* content() const { return fileContent.get(); }
         PassRefPtr<SharedBuffer> releaseContent() { return fileContent.release(); }
         void setContent(PassRefPtr<SharedBuffer> newContent) { fileContent = newContent; }
 
+        bool containsContentFileExtension() const { return !fileExtension.isEmpty(); }
         String contentFileExtension() const { return fileExtension; }
         void setContentFileExtension(const String& newFileExtension) { fileExtension = newFileExtension; }
 
+        bool containsContentFileName() const { return !fileContentFilename.isEmpty(); }
         String contentFileName() const { return fileContentFilename; }
-        void setContentFileName(const String& newFilename) { fileContentFilename = newFilename; }
-
-        const Vector<String>& fileNames() const { return filenames; }
-        void setFileNames(const Vector<String>& newFilenames) { filenames = newFilenames; }
-        void takeFileNames(Vector<String>& newFilenames) { filenames.swap(newFilenames); }
+        void setContentFileName(const String& newFileName) { fileContentFilename = newFileName; }
+
+        bool containsFileNames() const { return !filenames.isEmpty(); }
+        Vector<String> fileNames() const { return filenames; }
+        void clearFileNames() { filenames.clear(); }
+        size_t countFileNames() const { return filenames.size(); }
+        String fileNameAt(size_t index) { return filenames.at(index); }
+        void setFileNames(const Vector<String>& newFileNames) { filenames = newFileNames; }
+        void appendToFileNames(const String& newFileName)
+        {
+            ASSERT(!newFileName.isEmpty());
+            filenames.append(newFileName);
+        }
+        String popFileName() {
+            if (filenames.isEmpty())
+                return String();
+            String fileName;
+            fileName = filenames.at(0);
+            filenames.remove(0);
+            return fileName;
+        }
 
         // Interim state: All members will become private, do NOT access them directly! 
         // Rather use the above accessor methods (or devise new ones if necessary).

-- 
WebKit Debian packaging