diff options
author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebCore/platform/gtk/ClipboardGtk.h | |
parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebCore/platform/gtk/ClipboardGtk.h')
-rw-r--r-- | WebCore/platform/gtk/ClipboardGtk.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/WebCore/platform/gtk/ClipboardGtk.h b/WebCore/platform/gtk/ClipboardGtk.h index 5b42ac6..8b8ee38 100644 --- a/WebCore/platform/gtk/ClipboardGtk.h +++ b/WebCore/platform/gtk/ClipboardGtk.h @@ -27,6 +27,7 @@ #ifndef ClipboardGtk_h #define ClipboardGtk_h +#include "CachedResourceClient.h" #include "Clipboard.h" #include "DataObjectGtk.h" @@ -39,7 +40,7 @@ namespace WebCore { // State available during IE's events for drag and drop and copy/paste // Created from the EventHandlerGtk to be used by the dom - class ClipboardGtk : public Clipboard { + class ClipboardGtk : public Clipboard, public CachedResourceClient { public: static PassRefPtr<ClipboardGtk> create(ClipboardAccessPolicy policy, GtkClipboard* clipboard, bool isForDragging, Frame* frame) { @@ -60,14 +61,14 @@ namespace WebCore { virtual HashSet<String> types() const; virtual PassRefPtr<FileList> files() const; - IntPoint dragLocation() const; - CachedImage* dragImage() const; void setDragImage(CachedImage*, const IntPoint&); - Node* dragImageElement(); void setDragImageElement(Node*, const IntPoint&); + void setDragImage(CachedImage*, Node*, const IntPoint&); virtual DragImageRef createDragImage(IntPoint&) const; +#if ENABLE(DRAG_SUPPORT) virtual void declareAndWriteDragImage(Element*, const KURL&, const String&, Frame*); +#endif virtual void writeURL(const KURL&, const String&, Frame*); virtual void writeRange(Range*, Frame*); virtual void writePlainText(const String&); |