diff options
Diffstat (limited to 'WebCore/platform/chromium/ClipboardChromium.cpp')
| -rw-r--r-- | WebCore/platform/chromium/ClipboardChromium.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/WebCore/platform/chromium/ClipboardChromium.cpp b/WebCore/platform/chromium/ClipboardChromium.cpp index 3d82aea..c2ec80c 100644 --- a/WebCore/platform/chromium/ClipboardChromium.cpp +++ b/WebCore/platform/chromium/ClipboardChromium.cpp @@ -93,23 +93,23 @@ static ClipboardDataType clipboardTypeFromMIMEType(const String& type) PassRefPtr<Clipboard> Clipboard::create(ClipboardAccessPolicy policy, DragData* dragData, Frame* frame) { - return ClipboardChromium::create(true, dragData->platformData(), policy, frame); + return ClipboardChromium::create(DragAndDrop, dragData->platformData(), policy, frame); } -ClipboardChromium::ClipboardChromium(bool isForDragging, +ClipboardChromium::ClipboardChromium(ClipboardType clipboardType, PassRefPtr<ChromiumDataObject> dataObject, ClipboardAccessPolicy policy, Frame* frame) - : Clipboard(policy, isForDragging) + : Clipboard(policy, clipboardType) , m_dataObject(dataObject) , m_frame(frame) { } -PassRefPtr<ClipboardChromium> ClipboardChromium::create(bool isForDragging, +PassRefPtr<ClipboardChromium> ClipboardChromium::create(ClipboardType clipboardType, PassRefPtr<ChromiumDataObject> dataObject, ClipboardAccessPolicy policy, Frame* frame) { - return adoptRef(new ClipboardChromium(isForDragging, dataObject, policy, frame)); + return adoptRef(new ClipboardChromium(clipboardType, dataObject, policy, frame)); } void ClipboardChromium::clearData(const String& type) @@ -203,9 +203,7 @@ String ClipboardChromium::getData(const String& type, bool& success) const return m_dataObject->downloadMetadata; case ClipboardDataTypePlainText: - if (!isForDragging()) { - // If this isn't for a drag, it's for a cut/paste event handler. - // In this case, we need to check the clipboard. + if (isForCopyAndPaste()) { PasteboardPrivate::ClipboardBuffer buffer = Pasteboard::generalPasteboard()->isSelectionMode() ? PasteboardPrivate::SelectionBuffer : @@ -219,9 +217,7 @@ String ClipboardChromium::getData(const String& type, bool& success) const return m_dataObject->plainText; case ClipboardDataTypeHTML: - if (!isForDragging()) { - // If this isn't for a drag, it's for a cut/paste event handler. - // In this case, we need to check the clipboard. + if (isForCopyAndPaste()) { PasteboardPrivate::ClipboardBuffer buffer = Pasteboard::generalPasteboard()->isSelectionMode() ? PasteboardPrivate::SelectionBuffer : |