Merge webkit.org at r58033 : Initial merge by git

Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1

1 files changed, 32 insertions, 1 deletions

diff --git a/WebCore/platform/chromium/ChromiumDataObject.h b/WebCore/platform/chromium/ChromiumDataObject.h
index 5fae3e3..625cb8c 100644
--- a/WebCore/platform/chromium/ChromiumDataObject.h
+++ b/WebCore/platform/chromium/ChromiumDataObject.h
@@ -33,6 +33,7 @@
 
 #include "KURL.h"
 #include "PlatformString.h"
+#include "SharedBuffer.h"
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 
@@ -54,9 +55,33 @@ namespace WebCore {
         }
 
         void clear();
+        void clearAllExceptFiles();
         bool hasData() const;
 
-        KURL url;
+        void clearURL()
+        {
+            url = KURL();
+            uriList.clear();
+            urlTitle = "";
+        }
+
+        bool hasValidURL() const
+        {
+            return url.isValid();
+        }
+
+        KURL getURL() const
+        {
+            return url;
+        }
+
+        void setURL(const KURL& newURL)
+        {
+            url = newURL;
+            uriList.clear();
+            uriList.append(newURL.string());
+        }
+
         String urlTitle;
 
         String downloadMetadata;
@@ -73,8 +98,14 @@ namespace WebCore {
         RefPtr<SharedBuffer> fileContent;
 
     private:
+        // URL and uri-list are linked, so they should not be accessed individually.
+        KURL url;
+        Vector<String> uriList;
+
         ChromiumDataObject() {}
         ChromiumDataObject(const ChromiumDataObject&);
+
+        friend class ClipboardChromium;
     };
 
 } // namespace WebCore