From dcc8cf2e65d1aa555cce12431a16547e66b469ee Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 27 Apr 2010 16:31:00 +0100 Subject: Merge webkit.org at r58033 : Initial merge by git Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1 --- WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h') 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 * Copyright (C) 2009 Holger Hans Peter Freyther + * Copyright (C) 2010 Martin Robinson * 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*); }; } -- cgit v1.1