diff options
author | Kristian Monsen <kristianm@google.com> | 2010-09-30 15:42:16 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-10-07 10:59:29 +0100 |
commit | bec39347bb3bb5bf1187ccaf471d26247f28b585 (patch) | |
tree | 56bdc4c2978fbfd3d79d0d36d5d6c640ecc09cc8 /WebCore/platform/qt/ClipboardQt.h | |
parent | 90b7966e7815b262cd19ac25f03aaad9b21fdc06 (diff) | |
download | external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.zip external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.tar.gz external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.tar.bz2 |
Merge WebKit at r68651 : Initial merge by git.
Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
Diffstat (limited to 'WebCore/platform/qt/ClipboardQt.h')
-rw-r--r-- | WebCore/platform/qt/ClipboardQt.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/platform/qt/ClipboardQt.h b/WebCore/platform/qt/ClipboardQt.h index 9b54d5f..5aca1a6 100644 --- a/WebCore/platform/qt/ClipboardQt.h +++ b/WebCore/platform/qt/ClipboardQt.h @@ -44,9 +44,9 @@ namespace WebCore { { return adoptRef(new ClipboardQt(policy, readableClipboard)); } - static PassRefPtr<ClipboardQt> create(ClipboardAccessPolicy policy, bool forDragging = false) + static PassRefPtr<ClipboardQt> create(ClipboardAccessPolicy policy, ClipboardType clipboardType = CopyAndPaste) { - return adoptRef(new ClipboardQt(policy, forDragging)); + return adoptRef(new ClipboardQt(policy, clipboardType)); } virtual ~ClipboardQt(); @@ -77,7 +77,7 @@ namespace WebCore { ClipboardQt(ClipboardAccessPolicy, const QMimeData* readableClipboard); // Clipboard is writable so it will create its own QMimeData object - ClipboardQt(ClipboardAccessPolicy, bool forDragging); + ClipboardQt(ClipboardAccessPolicy, ClipboardType); void setDragImage(CachedImage*, Node*, const IntPoint& loc); |