Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 13 insertions, 8 deletions

diff --git a/chromium/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObjectItem.h b/chromium/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObjectItem.h
index 82956b3bbb2..ecd328d54ab 100644
--- a/chromium/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObjectItem.h
+++ b/chromium/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObjectItem.h
@@ -32,8 +32,8 @@
 #define ChromiumDataObjectItem_h
 
 #include "core/fileapi/File.h"
-#include "core/platform/SharedBuffer.h"
-#include "weborigin/KURL.h"
+#include "platform/SharedBuffer.h"
+#include "platform/weborigin/KURL.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/text/WTFString.h"
@@ -41,11 +41,16 @@
 namespace WebCore {
 
 class Blob;
-class ScriptExecutionContext;
+class ExecutionContext;
 class StringCallback;
 
 class ChromiumDataObjectItem : public RefCounted<ChromiumDataObjectItem> {
 public:
+    enum Kind {
+        StringKind,
+        FileKind
+    };
+
     static PassRefPtr<ChromiumDataObjectItem> createFromString(const String& type, const String& data);
     static PassRefPtr<ChromiumDataObjectItem> createFromFile(PassRefPtr<File>);
     static PassRefPtr<ChromiumDataObjectItem> createFromURL(const String& url, const String& title);
@@ -53,9 +58,9 @@ public:
     static PassRefPtr<ChromiumDataObjectItem> createFromSharedBuffer(const String& filename, PassRefPtr<SharedBuffer>);
     static PassRefPtr<ChromiumDataObjectItem> createFromPasteboard(const String& type, uint64_t sequenceNumber);
 
-    String kind() const { return m_kind; }
+    Kind kind() const { return m_kind; }
     String type() const { return m_type; }
-    void getAsString(PassRefPtr<StringCallback>, ScriptExecutionContext*) const;
+    void getAsString(PassOwnPtr<StringCallback>, ExecutionContext*) const;
     PassRefPtr<Blob> getAsFile() const;
 
     // Used to support legacy DataTransfer APIs and renderer->browser serialization.
@@ -71,11 +76,11 @@ private:
         InternalSource,
     };
 
-    ChromiumDataObjectItem(const String& kind, const String& type);
-    ChromiumDataObjectItem(const String& kind, const String& type, uint64_t sequenceNumber);
+    ChromiumDataObjectItem(Kind, const String& type);
+    ChromiumDataObjectItem(Kind, const String& type, uint64_t sequenceNumber);
 
     DataSource m_source;
-    String m_kind;
+    Kind m_kind;
     String m_type;
 
     String m_data;