https://bugs.webkit.org/show_bug.cgi?id=181201
Reviewed by Tim Horton.
Source/WebCore:
Adds logic to allow dragging an attachment element as a file by sending promised blob information to the UI
process. See comments below for more detail.
The only change in behavior is that dragging an attachment element will no longer write web content and injected
bundle data to the pasteboard if the attachment element's file attribute is nonnull. This will cause one
existing WK1 layout test to fail, but will otherwise not affect any attachment editing clients. On iOS,
attachment elements in the Mail viewer can be dragged, but each attachment's file is null, so we fall back to
current behavior; on macOS, Mail currently overrides the drag completely, beginning at -mouseDown:, so this
doesn't make a difference to macOS Mail either.
* editing/Editor.h:
* editing/cocoa/EditorCocoa.mm:
(WebCore::Editor::getPasteboardTypesAndDataForAttachment):
Add a helper method to retrieve an attachment element as web archive data, for moving attachments within the
same document. Also gives the injected editor bundle a chance to supply custom pasteboard types.
* loader/EmptyClients.cpp:
* page/DragClient.h:
(WebCore::DragClient::prepareToDragPromisedBlob):
Add new DragClient methods to send information about a promised blob to the UI process.
* page/DragController.cpp:
(WebCore::DragController::startDrag):
Call dragAttachmentElement when starting a drag on an attachment element.
(WebCore::DragController::dragAttachmentElement):
Try to begin dragging a given attachment element, propagating promised blob information to the client layers.
Returns true iff the attachment is backed by blob data (i.e. the file is nonnull).
* platform/PromisedBlobInfo.h:
Add a list of additional types and data to PromisedBlobInfo. In addition to the promised blob info, this would
allow injected bundle data and other private types alongside the main attachment data on the pasteboard.
Source/WebKit:
Add boilerplate plumbing for PrepareToDragPromisedBlob, which delivers blob promises to the UI process when
dragging, respectively.
* Scripts/webkit/messages.py:
(headers_for_type):
* Shared/WebCoreArgumentCoders.cpp:
(IPC::encodeTypesAndData):
(IPC::decodeTypesAndData):
(IPC::ArgumentCoder<PasteboardWebContent>::encode):
(IPC::ArgumentCoder<PasteboardWebContent>::decode):
(IPC::ArgumentCoder<PasteboardImage>::encode):
(IPC::ArgumentCoder<PasteboardImage>::decode):
(IPC::ArgumentCoder<PromisedBlobInfo>::encode):
(IPC::ArgumentCoder<PromisedBlobInfo>::decode):
Add IPC support PromisedBlobInfo's additionalTypes and additionalData.
(IPC::encodeClientTypesAndData): Deleted.
(IPC::decodeClientTypesAndData): Deleted.
Rename these helper functions and move them to the top of the file.
* UIProcess/Cocoa/WebViewImpl.h:
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::prepareToDragPromisedBlob):
* UIProcess/PageClient.h:
(WebKit::PageClient::prepareToDragPromisedBlob):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::prepareToDragPromisedBlob):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/ios/PageClientImplIOS.h:
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::prepareToDragPromisedBlob):
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _prepareToDragPromisedBlob:]):
* UIProcess/mac/PageClientImplMac.h:
* UIProcess/mac/PageClientImplMac.mm:
(WebKit::PageClientImpl::prepareToDragPromisedBlob):
* WebProcess/WebCoreSupport/WebDragClient.cpp:
(WebKit::WebDragClient::prepareToDragPromisedBlob):
* WebProcess/WebCoreSupport/WebDragClient.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::prepareToDragPromisedBlob):
* WebProcess/WebPage/WebPage.h:
Source/WebKitLegacy/mac:
Minor adjustment to account for a DragClient interface change. See WebCore ChangeLog for more details.
* WebCoreSupport/WebDragClient.h:
LayoutTests:
Remove a WK1 LayoutTest testing drag and drop of an attachment element into a contenteditable. This test no
longer passes because the implementation of attachment dragging on macOS is not yet implemented. Subsequent
patches will test this scenario once again, but as a WK2 macOS drag and drop API test.
* editing/pasteboard/drag-and-drop-attachment-contenteditable-expected.txt: Removed.
* editing/pasteboard/drag-and-drop-attachment-contenteditable.html: Removed.
* platform/gtk/TestExpectations:
* platform/ios/TestExpectations:
* platform/mac-wk2/TestExpectations:
* platform/win/TestExpectations:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@226393
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2018-01-03 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ [Attachment Support] Add plumbing for starting a drag with promised blob data
+ https://bugs.webkit.org/show_bug.cgi?id=181201
+
+ Reviewed by Tim Horton.
+
+ Remove a WK1 LayoutTest testing drag and drop of an attachment element into a contenteditable. This test no
+ longer passes because the implementation of attachment dragging on macOS is not yet implemented. Subsequent
+ patches will test this scenario once again, but as a WK2 macOS drag and drop API test.
+
+ * editing/pasteboard/drag-and-drop-attachment-contenteditable-expected.txt: Removed.
+ * editing/pasteboard/drag-and-drop-attachment-contenteditable.html: Removed.
+ * platform/gtk/TestExpectations:
+ * platform/ios/TestExpectations:
+ * platform/mac-wk2/TestExpectations:
+ * platform/win/TestExpectations:
+
2018-01-03 John Wilander <wilander@apple.com>
Storage Access API: Refactor XPC for access removal to go straight from the web process to the network process
+++ /dev/null
-These tests dragging an attachment element into contenteditable
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-
-
-PASS target.getElementsByTagName("attachment").length is 1
-PASS target.getElementsByTagName("attachment")[0].file.name is "apple.gif"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
+++ /dev/null
-<!DOCTYPE html><!-- webkit-test-runner [ enableAttachmentElement=true ] -->
-<html>
-<head>
-<script src="../../resources/js-test.js"></script>
-<style>
-#target {
- height: 200px;
- width: 220px;
- border: 5px solid blue;
-}
-</style>
-</head>
-<body onload="runTest()">
-<p id="description"></p>
-<div id="test1"><attachment id='attachment'></attachment></div>
-<div contenteditable=true id="target"></div>
-<div id="console"></div>
-
-<script>
- description('These tests dragging an attachment element into contenteditable');
-var jsTestIsAsync = true;
-var target = document.getElementById('target');
-
-function contentInserted() {
- shouldBe('target.getElementsByTagName("attachment").length', '1');
- shouldBeEqualToString('target.getElementsByTagName("attachment")[0].file.name', 'apple.gif');
- finishJSTest();
-}
-
-function setupAttachment() {
- if (window.internals) {
- var attachment = document.getElementById('attachment');
- attachment.file = window.internals.createFile("resources/apple.gif");
- }
-}
-
-function runTest() {
- setupAttachment();
- target.addEventListener('DOMNodeInserted', contentInserted, false);
- if (!window.testRunner)
- return;
-
- e = document.getElementById("attachment");
- x = e.offsetLeft + e.offsetWidth / 2;
- y = e.offsetTop + e.offsetHeight / 2;
-
- eventSender.mouseMoveTo(x, y);
- eventSender.mouseDown();
- eventSender.leapForward(100);
- e = document.getElementById("target");
- x = e.offsetLeft + e.offsetWidth / 2;
- y = e.offsetTop + e.offsetHeight / 2;
-
- eventSender.mouseMoveTo(x, y);
- eventSender.mouseUp();
-}
-</script>
-</body>
-</html>
webkit.org/b/142489 http/tests/media/video-play-waiting.html [ Timeout ]
webkit.org/b/142820 fast/images/animated-gif-body-outside-viewport.html [ Timeout Pass ]
-webkit.org/b/143473 editing/pasteboard/drag-and-drop-attachment-contenteditable.html [ Timeout ]
webkit.org/b/143477 fast/writing-mode/broken-ideograph-small-caps.html [ Timeout Pass ]
editing/pasteboard/drop-inputtext-acquires-style.html [ Skip ]
editing/pasteboard/drop-link.html [ Skip ]
editing/pasteboard/drop-text-events.html [ Skip ]
-editing/pasteboard/drag-and-drop-attachment-contenteditable.html [ Skip ]
editing/pasteboard/drag-and-drop-image-contenteditable.html [ Skip ]
editing/pasteboard/drag-and-drop-inputimage-contenteditable.html [ Skip ]
editing/pasteboard/drag-and-drop-objectimage-contenteditable.html [ Skip ]
editing/pasteboard/drag-and-drop-image-contenteditable.html
editing/pasteboard/drag-and-drop-inputimage-contenteditable.html
editing/pasteboard/drag-and-drop-objectimage-contenteditable.html
-editing/pasteboard/drag-and-drop-attachment-contenteditable.html
editing/pasteboard/drag-drop-copy-content.html
editing/pasteboard/drag-drop-dead-frame.html
editing/pasteboard/drag-drop-input-textarea.html
# TODO Attachment elements do not provide a custom renderer
webkit.org/b/142260 fast/attachment [ Skip ]
-webkit.org/b/142260 editing/pasteboard/drag-and-drop-attachment-contenteditable.html [ Skip ]
# TODO APNG is not supported
webkit.org/b/142731 fast/images/animated-png.html [ Skip ]
+2018-01-03 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ [Attachment Support] Add plumbing for starting a drag with promised blob data
+ https://bugs.webkit.org/show_bug.cgi?id=181201
+
+ Reviewed by Tim Horton.
+
+ Adds logic to allow dragging an attachment element as a file by sending promised blob information to the UI
+ process. See comments below for more detail.
+
+ The only change in behavior is that dragging an attachment element will no longer write web content and injected
+ bundle data to the pasteboard if the attachment element's file attribute is nonnull. This will cause one
+ existing WK1 layout test to fail, but will otherwise not affect any attachment editing clients. On iOS,
+ attachment elements in the Mail viewer can be dragged, but each attachment's file is null, so we fall back to
+ current behavior; on macOS, Mail currently overrides the drag completely, beginning at -mouseDown:, so this
+ doesn't make a difference to macOS Mail either.
+
+ * editing/Editor.h:
+ * editing/cocoa/EditorCocoa.mm:
+ (WebCore::Editor::getPasteboardTypesAndDataForAttachment):
+
+ Add a helper method to retrieve an attachment element as web archive data, for moving attachments within the
+ same document. Also gives the injected editor bundle a chance to supply custom pasteboard types.
+
+ * loader/EmptyClients.cpp:
+ * page/DragClient.h:
+ (WebCore::DragClient::prepareToDragPromisedBlob):
+
+ Add new DragClient methods to send information about a promised blob to the UI process.
+
+ * page/DragController.cpp:
+ (WebCore::DragController::startDrag):
+
+ Call dragAttachmentElement when starting a drag on an attachment element.
+
+ (WebCore::DragController::dragAttachmentElement):
+
+ Try to begin dragging a given attachment element, propagating promised blob information to the client layers.
+ Returns true iff the attachment is backed by blob data (i.e. the file is nonnull).
+
+ * platform/PromisedBlobInfo.h:
+
+ Add a list of additional types and data to PromisedBlobInfo. In addition to the promised blob info, this would
+ allow injected bundle data and other private types alongside the main attachment data on the pasteboard.
+
2018-01-03 Simon Fraser <simon.fraser@apple.com>
Remove the 'resolutionScale' parameter from ImageBufferDataCG get/putBytes
WEBCORE_EXPORT void insertAttachment(const String& identifier, const AttachmentDisplayOptions&, const String& filename, Ref<SharedBuffer>&& data, std::optional<String> contentType = std::nullopt);
void didInsertAttachmentElement(HTMLAttachmentElement&);
void didRemoveAttachmentElement(HTMLAttachmentElement&);
+
+#if PLATFORM(COCOA)
+ void getPasteboardTypesAndDataForAttachment(HTMLAttachmentElement&, Vector<String>& outTypes, Vector<RefPtr<SharedBuffer>>& outData);
+#endif
#endif
private:
#import "Frame.h"
#import "FrameLoader.h"
#import "FrameSelection.h"
+#import "HTMLAttachmentElement.h"
#import "HTMLConverter.h"
#import "HTMLImageElement.h"
#import "HTMLSpanElement.h"
return { };
}
+#if ENABLE(ATTACHMENT_ELEMENT)
+
+void Editor::getPasteboardTypesAndDataForAttachment(HTMLAttachmentElement& attachment, Vector<String>& outTypes, Vector<RefPtr<SharedBuffer>>& outData)
+{
+ auto attachmentRange = Range::create(attachment.document(), { &attachment, Position::PositionIsBeforeAnchor }, { &attachment, Position::PositionIsAfterAnchor });
+ client()->getClientPasteboardDataForRange(attachmentRange.ptr(), outTypes, outData);
+ if (auto archive = LegacyWebArchive::create(attachmentRange.ptr())) {
+ outTypes.append(WebArchivePboardType);
+ outData.append(SharedBuffer::create(archive->rawDataRepresentation().get()));
+ }
+}
+
+#endif
+
void Editor::writeSelectionToPasteboard(Pasteboard& pasteboard)
{
NSAttributedString *attributedString = attributedStringFromRange(*selectedRange());
DragSourceAction dragSourceActionMaskForPoint(const IntPoint&) final { return DragSourceActionNone; }
void startDrag(DragItem, DataTransfer&, Frame&) final { }
void dragControllerDestroyed() final { }
+ void prepareToDragPromisedBlob(const PromisedBlobInfo&) final { }
};
#endif // ENABLE(DRAG_SUPPORT)
class Element;
class Frame;
class Image;
+struct PromisedBlobInfo;
class DragClient {
public:
virtual void declareAndWriteDragImage(const String&, Element&, const URL&, const String&, Frame*) { }
#endif
+ virtual void prepareToDragPromisedBlob(const PromisedBlobInfo&) { }
+
virtual ~DragClient() = default;
};
#include "EditorClient.h"
#include "ElementAncestorIterator.h"
#include "EventHandler.h"
+#include "File.h"
#include "FloatRect.h"
#include "FocusController.h"
#include "FrameLoadRequest.h"
#include "PluginDocument.h"
#include "PluginViewBase.h"
#include "Position.h"
+#include "PromisedBlobInfo.h"
#include "RenderAttachment.h"
#include "RenderFileUploadControl.h"
#include "RenderImage.h"
#if ENABLE(ATTACHMENT_ELEMENT)
if (is<HTMLAttachmentElement>(element) && m_dragSourceAction & DragSourceActionAttachment) {
- auto* attachmentRenderer = downcast<HTMLAttachmentElement>(element).attachmentRenderer();
+ auto& attachment = downcast<HTMLAttachmentElement>(element);
+ auto* attachmentRenderer = attachment.attachmentRenderer();
if (!attachmentRenderer)
return false;
auto previousSelection = src.selection().selection();
if (hasData == HasNonDefaultPasteboardData::No) {
selectElement(element);
- if (src.editor().client()) {
+ if (!dragAttachmentElement(src, attachment) && src.editor().client()) {
#if PLATFORM(COCOA)
// Otherwise, if no file URL is specified, call out to the injected bundle to populate the pasteboard with data.
auto& editor = src.editor();
#endif
}
+#if ENABLE(ATTACHMENT_ELEMENT)
+
+bool DragController::dragAttachmentElement(Frame& frame, HTMLAttachmentElement& attachment)
+{
+ if (!attachment.file())
+ return false;
+
+ Vector<String> additionalTypes;
+ Vector<RefPtr<SharedBuffer>> additionalData;
+#if PLATFORM(COCOA)
+ if (frame.editor().client())
+ frame.editor().getPasteboardTypesAndDataForAttachment(attachment, additionalTypes, additionalData);
+#endif
+
+ auto& file = *attachment.file();
+ auto blobURL = file.url().string();
+ bool isFileBacked = !file.path().isEmpty();
+ auto blobType = isFileBacked ? PromisedBlobType::FileBacked : PromisedBlobType::DataBacked;
+ m_client.prepareToDragPromisedBlob({ blobURL, file.type(), file.name(), blobType, additionalTypes, additionalData });
+
+ return true;
+}
+
+#endif // ENABLE(ATTACHMENT_ELEMENT)
+
#endif // ENABLE(DRAG_SUPPORT)
} // namespace WebCore
class Element;
class Frame;
class FrameSelection;
+class HTMLAttachmentElement;
class HTMLInputElement;
class IntRect;
class Page;
void cleanupAfterSystemDrag();
void declareAndWriteDragImage(DataTransfer&, Element&, const URL&, const String& label);
+
+#if ENABLE(ATTACHMENT_ELEMENT)
+ bool dragAttachmentElement(Frame&, HTMLAttachmentElement&);
+#endif
Page& m_page;
DragClient& m_client;
#pragma once
-#include <WebCore/SharedBuffer.h>
+#include "SharedBuffer.h"
namespace WebCore {
String filename;
PromisedBlobType blobType;
+ Vector<String> additionalTypes;
+ Vector<RefPtr<SharedBuffer>> additionalData;
+
operator bool() const { return !blobURL.isEmpty(); }
};
+2018-01-03 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ [Attachment Support] Add plumbing for starting a drag with promised blob data
+ https://bugs.webkit.org/show_bug.cgi?id=181201
+
+ Reviewed by Tim Horton.
+
+ Add boilerplate plumbing for PrepareToDragPromisedBlob, which delivers blob promises to the UI process when
+ dragging, respectively.
+
+ * Scripts/webkit/messages.py:
+ (headers_for_type):
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::encodeTypesAndData):
+ (IPC::decodeTypesAndData):
+ (IPC::ArgumentCoder<PasteboardWebContent>::encode):
+ (IPC::ArgumentCoder<PasteboardWebContent>::decode):
+ (IPC::ArgumentCoder<PasteboardImage>::encode):
+ (IPC::ArgumentCoder<PasteboardImage>::decode):
+ (IPC::ArgumentCoder<PromisedBlobInfo>::encode):
+ (IPC::ArgumentCoder<PromisedBlobInfo>::decode):
+
+ Add IPC support PromisedBlobInfo's additionalTypes and additionalData.
+
+ (IPC::encodeClientTypesAndData): Deleted.
+ (IPC::decodeClientTypesAndData): Deleted.
+
+ Rename these helper functions and move them to the top of the file.
+
+ * UIProcess/Cocoa/WebViewImpl.h:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::prepareToDragPromisedBlob):
+ * UIProcess/PageClient.h:
+ (WebKit::PageClient::prepareToDragPromisedBlob):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::prepareToDragPromisedBlob):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::prepareToDragPromisedBlob):
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _prepareToDragPromisedBlob:]):
+ * UIProcess/mac/PageClientImplMac.h:
+ * UIProcess/mac/PageClientImplMac.mm:
+ (WebKit::PageClientImpl::prepareToDragPromisedBlob):
+ * WebProcess/WebCoreSupport/WebDragClient.cpp:
+ (WebKit::WebDragClient::prepareToDragPromisedBlob):
+ * WebProcess/WebCoreSupport/WebDragClient.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::prepareToDragPromisedBlob):
+ * WebProcess/WebPage/WebPage.h:
+
2018-01-03 David Kilzer <ddkilzer@apple.com>
REGRESSION (r212929): WKSnapshotConfiguration may leak an NSNumber when deallocated
'WebCore::IncludeSecureCookies': ['<WebCore/CookiesStrategy.h>'],
'WebCore::KeyframeValueList': ['<WebCore/GraphicsLayer.h>'],
'WebCore::KeypressCommand': ['<WebCore/KeyboardEvent.h>'],
- 'WebCore::MediaConstraints': ['<WebCore/MediaConstraints.h>'],
'WebCore::PasteboardCustomData': ['<WebCore/Pasteboard.h>'],
'WebCore::PasteboardImage': ['<WebCore/Pasteboard.h>'],
'WebCore::PasteboardURL': ['<WebCore/Pasteboard.h>'],
return true;
}
+static void encodeTypesAndData(Encoder& encoder, const Vector<String>& types, const Vector<RefPtr<SharedBuffer>>& data)
+{
+ ASSERT(types.size() == data.size());
+ encoder << types;
+ encoder << static_cast<uint64_t>(data.size());
+ for (auto& buffer : data)
+ encodeSharedBuffer(encoder, buffer.get());
+}
+
+static bool decodeTypesAndData(Decoder& decoder, Vector<String>& types, Vector<RefPtr<SharedBuffer>>& data)
+{
+ if (!decoder.decode(types))
+ return false;
+
+ uint64_t dataSize;
+ if (!decoder.decode(dataSize))
+ return false;
+
+ ASSERT(dataSize == types.size());
+
+ data.resize(dataSize);
+ for (auto& buffer : data)
+ decodeSharedBuffer(decoder, buffer);
+
+ return true;
+}
+
void ArgumentCoder<MonotonicTime>::encode(Encoder& encoder, const MonotonicTime& time)
{
encoder << time.secondsSinceEpoch().value();
return true;
}
-static void encodeClientTypesAndData(Encoder& encoder, const Vector<String>& types, const Vector<RefPtr<SharedBuffer>>& data)
-{
- ASSERT(types.size() == data.size());
- encoder << types;
- encoder << static_cast<uint64_t>(data.size());
- for (auto& buffer : data)
- encodeSharedBuffer(encoder, buffer.get());
-}
-
-static bool decodeClientTypesAndData(Decoder& decoder, Vector<String>& types, Vector<RefPtr<SharedBuffer>>& data)
-{
- if (!decoder.decode(types))
- return false;
-
- uint64_t dataSize;
- if (!decoder.decode(dataSize))
- return false;
-
- ASSERT(dataSize == types.size());
-
- data.resize(dataSize);
- for (auto& buffer : data)
- decodeSharedBuffer(decoder, buffer);
-
- return true;
-}
-
void ArgumentCoder<PasteboardWebContent>::encode(Encoder& encoder, const PasteboardWebContent& content)
{
encoder << content.contentOrigin;
encodeSharedBuffer(encoder, content.dataInRTFFormat.get());
encodeSharedBuffer(encoder, content.dataInAttributedStringFormat.get());
- encodeClientTypesAndData(encoder, content.clientTypes, content.clientData);
+ encodeTypesAndData(encoder, content.clientTypes, content.clientData);
}
bool ArgumentCoder<PasteboardWebContent>::decode(Decoder& decoder, PasteboardWebContent& content)
return false;
if (!decodeSharedBuffer(decoder, content.dataInAttributedStringFormat))
return false;
- if (!decodeClientTypesAndData(decoder, content.clientTypes, content.clientData))
+ if (!decodeTypesAndData(decoder, content.clientTypes, content.clientData))
return false;
return true;
}
encoder << pasteboardImage.imageSize;
if (pasteboardImage.resourceData)
encodeSharedBuffer(encoder, pasteboardImage.resourceData.get());
- encodeClientTypesAndData(encoder, pasteboardImage.clientTypes, pasteboardImage.clientData);
+ encodeTypesAndData(encoder, pasteboardImage.clientTypes, pasteboardImage.clientData);
}
bool ArgumentCoder<PasteboardImage>::decode(Decoder& decoder, PasteboardImage& pasteboardImage)
return false;
if (!decodeSharedBuffer(decoder, pasteboardImage.resourceData))
return false;
- if (!decodeClientTypesAndData(decoder, pasteboardImage.clientTypes, pasteboardImage.clientData))
+ if (!decodeTypesAndData(decoder, pasteboardImage.clientTypes, pasteboardImage.clientData))
return false;
return true;
}
encoder << info.contentType;
encoder << info.filename;
encoder.encodeEnum(info.blobType);
+ encodeTypesAndData(encoder, info.additionalTypes, info.additionalData);
}
bool ArgumentCoder<PromisedBlobInfo>::decode(Decoder& decoder, PromisedBlobInfo& info)
if (!decoder.decode(info.blobType))
return false;
+ if (!decodeTypesAndData(decoder, info.additionalTypes, info.additionalData))
+ return false;
+
return true;
}
#include "WeakObjCPtr.h"
#include "WebPageProxy.h"
#include "_WKOverlayScrollbarStyle.h"
+#include <WebCore/PromisedBlobInfo.h>
#include <WebCore/TextIndicatorWindow.h>
#include <WebCore/UserInterfaceLayoutDirection.h>
#include <pal/spi/cocoa/AVKitSPI.h>
void setIsCustomizingTouchBar(bool isCustomizingTouchBar) { m_isCustomizingTouchBar = isCustomizingTouchBar; };
#endif // HAVE(TOUCH_BAR)
+ void prepareToDragPromisedBlob(const WebCore::PromisedBlobInfo&);
+
private:
#if HAVE(TOUCH_BAR)
void setUpTextTouchBar(NSTouchBar *);
[types addObject:PasteboardTypes::WebDummyPboardType];
[m_view registerForDraggedTypes:[types allObjects]];
}
+
+void WebViewImpl::prepareToDragPromisedBlob(const WebCore::PromisedBlobInfo& info)
+{
+ // FIXME: Add macOS support for dragging promised blob data as file promises.
+ UNUSED_PARAM(info);
+}
+
#endif // ENABLE(DRAG_SUPPORT)
void WebViewImpl::startWindowDrag()
virtual void setPromisedDataForImage(const String& pasteboardName, Ref<WebCore::SharedBuffer>&& imageBuffer, const String& filename, const String& extension, const String& title, const String& url, const String& visibleUrl, RefPtr<WebCore::SharedBuffer>&& archiveBuffer) = 0;
#endif
+ virtual void prepareToDragPromisedBlob(const WebCore::PromisedBlobInfo&) { }
+
virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&) = 0;
virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&) = 0;
virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) = 0;
}
#endif
+void WebPageProxy::prepareToDragPromisedBlob(const PromisedBlobInfo& info)
+{
+ m_pageClient.prepareToDragPromisedBlob(info);
+}
+
#if PLATFORM(COCOA)
void WebPageProxy::touchBarMenuDataChanged(const TouchBarMenuData& touchBarMenuData)
{
void requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, uint64_t webProcessContextId);
#endif
+ void prepareToDragPromisedBlob(const WebCore::PromisedBlobInfo&);
+
#if ENABLE(ATTACHMENT_ELEMENT)
void insertAttachment(const String& identifier, const WebCore::AttachmentDisplayOptions&, const String& filename, std::optional<String> contentType, WebCore::SharedBuffer& data, Function<void(CallbackBase::Error)>&&);
void requestAttachmentData(const String& identifier, Function<void(RefPtr<WebCore::SharedBuffer>, CallbackBase::Error)>&&);
DidInsertAttachment(String identifier)
DidRemoveAttachment(String identifier)
#endif
+
+ PrepareToDragPromisedBlob(struct WebCore::PromisedBlobInfo blobInfo)
}
OBJC_CLASS WKContentView;
OBJC_CLASS WKEditorUndoTargetObjC;
+namespace WebCore {
+struct PromisedBlobInfo;
+}
+
namespace WebKit {
class PageClientImpl : public PageClientImplCocoa
void didChangeDataInteractionCaretRect(const WebCore::IntRect& previousCaretRect, const WebCore::IntRect& caretRect) override;
#endif
+ void prepareToDragPromisedBlob(const WebCore::PromisedBlobInfo&) final;
+
WKContentView *m_contentView;
RetainPtr<WKEditorUndoTargetObjC> m_undoTarget;
};
#import "_WKDownloadInternal.h"
#import <WebCore/NotImplemented.h>
#import <WebCore/PlatformScreen.h>
+#import <WebCore/PromisedBlobInfo.h>
#import <WebCore/SharedBuffer.h>
#import <WebCore/TextIndicator.h>
#import <WebCore/ValidationBubble.h>
}
#endif
+void PageClientImpl::prepareToDragPromisedBlob(const WebCore::PromisedBlobInfo& info)
+{
+ [m_contentView _prepareToDragPromisedBlob:info];
+}
+
} // namespace WebKit
#endif // PLATFORM(IOS)
class FloatQuad;
class IntSize;
class SelectionRect;
+struct PromisedBlobInfo;
}
#if ENABLE(DRAG_SUPPORT)
- (void)_startDrag:(RetainPtr<CGImageRef>)image item:(const WebCore::DragItem&)item;
- (void)_didConcludeEditDataInteraction:(std::optional<WebCore::TextIndicatorData>)data;
- (void)_didChangeDataInteractionCaretRect:(CGRect)previousRect currentRect:(CGRect)rect;
+- (void)_prepareToDragPromisedBlob:(const WebCore::PromisedBlobInfo&)info;
#endif
@end
#import <WebCore/Pasteboard.h>
#import <WebCore/Path.h>
#import <WebCore/PathUtilities.h>
+#import <WebCore/PromisedBlobInfo.h>
#import <WebCore/RuntimeApplicationChecks.h>
#import <WebCore/Scrollbar.h>
#import <WebCore/TextIndicator.h>
[_editDropCaretView updateToPosition:[WKTextPosition textPositionWithRect:rect]];
}
+- (void)_prepareToDragPromisedBlob:(const PromisedBlobInfo&)info
+{
+ // FIXME: Add iOS support for dragging promised blob data as file promises.
+ UNUSED_PARAM(info);
+}
+
- (WKDragDestinationAction)_dragDestinationActionForDropSession:(id <UIDropSession>)session
{
id <WKUIDelegatePrivate> uiDelegate = self.webViewUIDelegate;
namespace WebCore {
class AlternativeTextUIController;
+struct PromisedBlobInfo;
}
namespace WebKit {
void didRestoreScrollPosition() override;
bool windowIsFrontWindowUnderMouse(const NativeWebMouseEvent&) override;
+
+ void prepareToDragPromisedBlob(const WebCore::PromisedBlobInfo&) final;
};
} // namespace WebKit
#import <WebCore/Image.h>
#import <WebCore/KeyboardEvent.h>
#import <WebCore/NotImplemented.h>
+#import <WebCore/PromisedBlobInfo.h>
#import <WebCore/SharedBuffer.h>
#import <WebCore/TextIndicator.h>
#import <WebCore/TextIndicatorWindow.h>
return (m_view.userInterfaceLayoutDirection == NSUserInterfaceLayoutDirectionLeftToRight) ? WebCore::UserInterfaceLayoutDirection::LTR : WebCore::UserInterfaceLayoutDirection::RTL;
}
+void PageClientImpl::prepareToDragPromisedBlob(const WebCore::PromisedBlobInfo& info)
+{
+ m_impl->prepareToDragPromisedBlob(info);
+}
+
} // namespace WebKit
#endif // PLATFORM(MAC)
delete this;
}
+void WebDragClient::prepareToDragPromisedBlob(const WebCore::PromisedBlobInfo& info)
+{
+ m_page->prepareToDragPromisedBlob(info);
+}
+
} // namespace WebKit
#endif // ENABLE(DRAG_SUPPORT)
void declareAndWriteDragImage(const String& pasteboardName, WebCore::Element&, const WebCore::URL&, const String&, WebCore::Frame*) override;
#endif
+ void prepareToDragPromisedBlob(const WebCore::PromisedBlobInfo&) final;
+
void dragControllerDestroyed() override;
WebPage* m_page;
#include <WebCore/PlatformKeyboardEvent.h>
#include <WebCore/PluginDocument.h>
#include <WebCore/PrintContext.h>
+#include <WebCore/PromisedBlobInfo.h>
#include <WebCore/Range.h>
#include <WebCore/RenderLayer.h>
#include <WebCore/RenderTreeAsText.h>
#if ENABLE(DRAG_SUPPORT)
+void WebPage::prepareToDragPromisedBlob(const WebCore::PromisedBlobInfo& info)
+{
+ send(Messages::WebPageProxy::PrepareToDragPromisedBlob(info));
+}
+
#if PLATFORM(GTK)
void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, uint64_t draggingSourceOperationMask, WebSelectionData&& selection, uint32_t flags)
{
struct DictationAlternative;
struct Highlight;
struct KeypressCommand;
+struct PromisedBlobInfo;
struct TextCheckingResult;
struct ViewportArguments;
void willStartDrag() { ASSERT(!m_isStartingDrag); m_isStartingDrag = true; }
void didStartDrag();
void dragCancelled();
+
+ void prepareToDragPromisedBlob(const WebCore::PromisedBlobInfo&);
#endif
void beginPrinting(uint64_t frameID, const PrintInfo&);
+2018-01-03 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ [Attachment Support] Add plumbing for starting a drag with promised blob data
+ https://bugs.webkit.org/show_bug.cgi?id=181201
+
+ Reviewed by Tim Horton.
+
+ Minor adjustment to account for a DragClient interface change. See WebCore ChangeLog for more details.
+
+ * WebCoreSupport/WebDragClient.h:
+
2018-01-02 Jiewen Tan <jiewen_tan@apple.com>
Add a WebAuthentication runtime feature flag
void declareAndWriteDragImage(const String& pasteboardName, WebCore::Element&, const WebCore::URL&, const String&, WebCore::Frame*) override;
void didConcludeEditDrag() override;
+
+ void prepareToDragPromisedBlob(const WebCore::PromisedBlobInfo&) final { }
+
private:
WebView* m_webView;
};
git://git.webkit.org / WebKit-https.git / commitdiff