diff options
author | Kristian Monsen <kristianm@google.com> | 2010-07-30 10:46:49 +0100 |
---|---|---|
committer | Kristian Monsen <kristianm@google.com> | 2010-08-04 13:01:34 +0100 |
commit | 0617145a89917ae7735fe1c9538688ab9a577df5 (patch) | |
tree | 56206078694427c37ed7bdf27eb5221398b833c0 /WebCore/platform/gtk/ClipboardGtk.h | |
parent | ef1adcdfc805d4d13103f6f15cc5b4d96828a60f (diff) | |
download | external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.zip external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.tar.gz external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.tar.bz2 |
Merge WebKit at r64264 : Initial merge by git.
Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
Diffstat (limited to 'WebCore/platform/gtk/ClipboardGtk.h')
-rw-r--r-- | WebCore/platform/gtk/ClipboardGtk.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/WebCore/platform/gtk/ClipboardGtk.h b/WebCore/platform/gtk/ClipboardGtk.h index c3438c4..5b42ac6 100644 --- a/WebCore/platform/gtk/ClipboardGtk.h +++ b/WebCore/platform/gtk/ClipboardGtk.h @@ -34,20 +34,21 @@ typedef struct _GtkClipboard GtkClipboard; namespace WebCore { class CachedImage; + class Frame; class PasteboardHelper; // 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 { public: - static PassRefPtr<ClipboardGtk> create(ClipboardAccessPolicy policy, GtkClipboard* clipboard, bool isForDragging) + static PassRefPtr<ClipboardGtk> create(ClipboardAccessPolicy policy, GtkClipboard* clipboard, bool isForDragging, Frame* frame) { - return adoptRef(new ClipboardGtk(policy, clipboard)); + return adoptRef(new ClipboardGtk(policy, clipboard, frame)); } - static PassRefPtr<ClipboardGtk> create(ClipboardAccessPolicy policy, PassRefPtr<DataObjectGtk> dataObject, bool isForDragging) + static PassRefPtr<ClipboardGtk> create(ClipboardAccessPolicy policy, PassRefPtr<DataObjectGtk> dataObject, bool isForDragging, Frame* frame) { - return adoptRef(new ClipboardGtk(policy, dataObject, isForDragging)); + return adoptRef(new ClipboardGtk(policy, dataObject, isForDragging, frame)); } virtual ~ClipboardGtk(); @@ -77,12 +78,13 @@ namespace WebCore { PassRefPtr<DataObjectGtk> dataObject() { return m_dataObject; } private: - ClipboardGtk(ClipboardAccessPolicy, GtkClipboard*); - ClipboardGtk(ClipboardAccessPolicy, PassRefPtr<DataObjectGtk>, bool); + ClipboardGtk(ClipboardAccessPolicy, GtkClipboard*, Frame*); + ClipboardGtk(ClipboardAccessPolicy, PassRefPtr<DataObjectGtk>, bool, Frame*); RefPtr<DataObjectGtk> m_dataObject; GtkClipboard* m_clipboard; PasteboardHelper* m_helper; + Frame* m_frame; }; } |