[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 32183f8f558d03d400bce361455afb458f6cee24
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 16 05:19:42 2009 +0000

    2009-10-15  Roland Steiner  <rolandsteiner at google.com>
    
            Reviewed by Darin Fisher.
    
            Bug 30427 -  Remove unneeded methods in ChromiumDataObject
            (https://bugs.webkit.org/show_bug.cgi?id=30427)
    
            Remove no longer needed methods from ChromiumDataObject.
    
            No new tests (no functional change)
    
            * platform/chromium/ChromiumDataObject.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49670 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4681399..21cf9ef 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-15  Roland Steiner  <rolandsteiner at google.com>
+
+        Reviewed by Darin Fisher.
+
+        Bug 30427 -  Remove unneeded methods in ChromiumDataObject
+        (https://bugs.webkit.org/show_bug.cgi?id=30427)
+        
+        Remove no longer needed methods from ChromiumDataObject.
+
+        No new tests (no functional change)
+
+        * platform/chromium/ChromiumDataObject.h:
+
 2009-10-15  Daniel Bates  <dbates at webkit.org>
 
         No review, rolling out r49644.
diff --git a/WebCore/platform/chromium/ChromiumDataObject.h b/WebCore/platform/chromium/ChromiumDataObject.h
index fe6d073..3e8675e 100644
--- a/WebCore/platform/chromium/ChromiumDataObject.h
+++ b/WebCore/platform/chromium/ChromiumDataObject.h
@@ -56,63 +56,6 @@ 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; }
-
-        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).
         KURL url;
         String urlTitle;
 

-- 
WebKit Debian packaging