diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h')
| -rw-r--r-- | WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h b/WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h index 97eff90..64fcdba 100644 --- a/WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h +++ b/WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h @@ -1,6 +1,7 @@ /* * Copyright (C) 2007 Luca Bruno <lethalman88@gmail.com> * Copyright (C) 2009 Holger Hans Peter Freyther + * Copyright (C) 2010 Martin Robinson <mrobinson@webkit.org> * All rights reserved. * * This library is free software; you can redistribute it and/or @@ -41,16 +42,10 @@ class PasteboardHelperGtk : public PasteboardHelper { public: PasteboardHelperGtk(); ~PasteboardHelperGtk(); - virtual GtkClipboard* getCurrentTarget(Frame*) const; - virtual GtkClipboard* getClipboard(Frame*) const; - virtual GtkClipboard* getPrimary(Frame*) const; - virtual GtkTargetList* targetList() const; - virtual gint getWebViewTargetInfoHtml() const; + virtual guint getIdForTargetType(PasteboardTargetType); - void writeClipboardContents(GtkClipboard* clipboard, gpointer data = 0); - -private: - GtkTargetList* m_targetList; +protected: + virtual bool usePrimarySelectionClipboard(GtkWidget*); }; } |