Merge WebKit at r68651 : Initial merge by git.

Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12

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);