Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 2 insertions, 5 deletions

diff --git a/Source/WebCore/platform/chromium/ReadableDataObject.h b/Source/WebCore/platform/chromium/ReadableDataObject.h
index c6cc310..027e0ed 100644
--- a/Source/WebCore/platform/chromium/ReadableDataObject.h
+++ b/Source/WebCore/platform/chromium/ReadableDataObject.h
@@ -44,7 +44,7 @@ namespace WebCore {
 // browser to the renderer.
 class ReadableDataObject : public RefCounted<ReadableDataObject> {
 public:
-    static PassRefPtr<ReadableDataObject> create(const Frame*, Clipboard::ClipboardType);
+    static PassRefPtr<ReadableDataObject> create(Clipboard::ClipboardType);
 
     bool hasData() const;
     HashSet<String> types() const;
@@ -57,14 +57,11 @@ public:
     Vector<String> filenames() const;
 
 private:
-    explicit ReadableDataObject(const Frame*, Clipboard::ClipboardType);
+    explicit ReadableDataObject(Clipboard::ClipboardType);
 
     // This isn't always const... but most of the time it is.
     void ensureTypeCacheInitialized() const;
 
-    // The owner frame. Used to send IPCs back to the correspdonging view via WebFrameClient.
-    const Frame* m_frame;
-
     Clipboard::ClipboardType m_clipboardType;
 
     // To avoid making a lot of IPC calls for each drag event, we cache some