Diff
Modified: trunk/LayoutTests/ChangeLog (201188 => 201189)
--- trunk/LayoutTests/ChangeLog 2016-05-19 22:11:52 UTC (rev 201188)
+++ trunk/LayoutTests/ChangeLog 2016-05-19 22:19:48 UTC (rev 201189)
@@ -1,3 +1,16 @@
+2016-05-19 Enrica Casucci <[email protected]>
+
+ Drag cannot start if no drag data is available in the Pasteboard.
+ https://bugs.webkit.org/show_bug.cgi?id=157911
+ rdar://problem/24577706
+
+ Reviewed by Tim Horton.
+
+ * fast/events/draggable-div-nodata-expected.txt: Added.
+ * fast/events/draggable-div-nodata.html: Added.
+ * platform/ios-simulator/TestExpectations
+ * platform/mac-wk2/TestExpectations
+
2016-05-19 Jer Noble <[email protected]>
[IOS] Add setting to allow playback to continue inline after exiting fullscreen.
Added: trunk/LayoutTests/fast/events/draggable-div-nodata-expected.txt (0 => 201189)
--- trunk/LayoutTests/fast/events/draggable-div-nodata-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/draggable-div-nodata-expected.txt 2016-05-19 22:19:48 UTC (rev 201189)
@@ -0,0 +1,9 @@
+This test checks that we drag a draggable element without setting data to transfer
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS TEST PASSED: square dropped
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/fast/events/draggable-div-nodata.html (0 => 201189)
--- trunk/LayoutTests/fast/events/draggable-div-nodata.html (rev 0)
+++ trunk/LayoutTests/fast/events/draggable-div-nodata.html 2016-05-19 22:19:48 UTC (rev 201189)
@@ -0,0 +1,83 @@
+<html>
+<head>
+<script src=""
+<style>
+ #dropTarget, #dragMe { text-align: center; display: table-cell; vertical-align: middle }
+ #dropTarget {width: 256px; height: 256px; border: 1px dashed}
+ #dragMe {-webkit-user-drag: element; -webkit-user-select: none; background: #ff0000; width: 64px; height: 64px; color: white}
+</style>
+<script>
+ var dragMe;
+ var dropTarget;
+ var consoleElm;
+ var event;
+
+ window._onload_ = function()
+ {
+ dragMe = document.getElementById("dragMe");
+ dropTarget = document.getElementById("dropTarget");
+ consoleElm = document.getElementById("console");
+
+ if (!dragMe || !dropTarget || !consoleElm)
+ return;
+
+ dropTarget._ondragover_ = dragOver;
+ dropTarget._ondrop_ = drop;
+
+ runTest();
+ }
+
+ function drop(event)
+ {
+ testPassed("TEST PASSED: square dropped");
+ event.preventDefault();
+ dragMe.parentNode.removeChild(dragMe);
+ event.target.appendChild(dragMe);
+ }
+
+ function dragOver(event)
+ {
+ event.preventDefault();
+ }
+
+ function runTest()
+ {
+ if (!window.eventSender)
+ return;
+
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ var startX = dragMe.offsetLeft + 10;
+ var startY = dragMe.offsetTop + dragMe.offsetHeight / 2;
+ var endX = dropTarget.offsetLeft + 10;
+ var endY = dropTarget.offsetTop + dropTarget.offsetHeight / 2;
+
+ eventSender.mouseMoveTo(startX, startY);
+ eventSender.mouseDown();
+ eventSender.leapForward(1000);
+ eventSender.mouseMoveTo(endX, endY);
+ eventSender.mouseUp();
+
+ var testContainer = document.getElementById("test-container");
+ if (testContainer)
+ document.body.removeChild(testContainer);
+ debug('<br /><span class="pass">TEST COMPLETE</span>');
+ }
+</script>
+</head>
+<body>
+ <p id="description"></p>
+ <div id="test-container">
+ <div id="dropTarget">Drop the red square onto me.</div>
+ <hr/>
+ <p>Items that can be dragged to the drop target:</p>
+ <div id="dragMe" draggable="true">Square</div>
+ <hr/>
+ </div>
+ <div id="console"></div>
+ <script>
+ description("This test checks that we drag a draggable element without setting data to transfer");
+ </script>
+</body>
+</html>
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (201188 => 201189)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-05-19 22:11:52 UTC (rev 201188)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-05-19 22:19:48 UTC (rev 201189)
@@ -203,6 +203,7 @@
fast/events/drag-parent-node.html
fast/events/drag-selects-image.html
fast/events/drag-to-navigate.html
+fast/events/draggable-div-nodata.html
fast/events/drop-handler-should-not-stop-navigate.html
fast/events/drop-with-file-paths.html
fast/events/dropzone-001.html
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (201188 => 201189)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2016-05-19 22:11:52 UTC (rev 201188)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2016-05-19 22:19:48 UTC (rev 201189)
@@ -95,6 +95,7 @@
fast/events/drag-and-drop-link-fast-multiple-times-does-not-crash.html
fast/events/drag-in-frames.html
fast/events/drag-parent-node.html
+fast/events/draggable-div-nodata.html
fast/events/dropzone-001.html
fast/events/dropzone-002.html
fast/events/dropzone-003.html
Modified: trunk/Source/WebKit/mac/ChangeLog (201188 => 201189)
--- trunk/Source/WebKit/mac/ChangeLog 2016-05-19 22:11:52 UTC (rev 201188)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-05-19 22:19:48 UTC (rev 201189)
@@ -1,3 +1,18 @@
+2016-05-19 Enrica Casucci <[email protected]>
+
+ Drag cannot start if no drag data is available in the Pasteboard.
+ https://bugs.webkit.org/show_bug.cgi?id=157911
+ rdar://problem/24577706
+
+ Reviewed by Tim Horton.
+
+ * WebView/WebHTMLView.mm:
+ (+[WebHTMLView _dummyPasteboardType]):
+ (-[WebHTMLView dragImage:at:offset:event:pasteboard:source:slideBack:]):
+ * WebView/WebHTMLViewPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _registerDraggedTypes]):
+
2016-05-19 Jer Noble <[email protected]>
[IOS] Add setting to allow playback to continue inline after exiting fullscreen.
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (201188 => 201189)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-05-19 22:11:52 UTC (rev 201188)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-05-19 22:19:48 UTC (rev 201189)
@@ -2184,6 +2184,11 @@
}
}
++ (NSString *)_dummyPasteboardType
+{
+ return @"Apple WebKit dummy pasteboard type";
+}
+
+ (NSArray *)_insertablePasteboardTypes
{
static NSArray *types = nil;
@@ -4571,6 +4576,9 @@
slideBack:(BOOL)slideBack
{
ASSERT(self == [self _topHTMLView]);
+ if (![[pasteboard types] count])
+ [pasteboard setString:@"" forType:[WebHTMLView _dummyPasteboardType]];
+
[super dragImage:dragImage at:at offset:offset event:event pasteboard:pasteboard source:source slideBack:slideBack];
}
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h (201188 => 201189)
--- trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h 2016-05-19 22:11:52 UTC (rev 201188)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h 2016-05-19 22:19:48 UTC (rev 201189)
@@ -67,6 +67,7 @@
- (void)_updateMouseoverWithEvent:(NSEvent *)event;
+ (NSArray *)_insertablePasteboardTypes;
++ (NSString *)_dummyPasteboardType;
+ (NSArray *)_selectionPasteboardTypes;
- (void)_writeSelectionToPasteboard:(NSPasteboard *)pasteboard;
#endif
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (201188 => 201189)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-05-19 22:11:52 UTC (rev 201188)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-05-19 22:19:48 UTC (rev 201189)
@@ -771,12 +771,14 @@
}
#if !PLATFORM(IOS)
+
- (void)_registerDraggedTypes
{
NSArray *editableTypes = [WebHTMLView _insertablePasteboardTypes];
NSArray *URLTypes = [NSPasteboard _web_dragTypesForURL];
NSMutableSet *types = [[NSMutableSet alloc] initWithArray:editableTypes];
[types addObjectsFromArray:URLTypes];
+ [types addObject:[WebHTMLView _dummyPasteboardType]];
[self registerForDraggedTypes:[types allObjects]];
[types release];
}
Modified: trunk/Source/WebKit2/ChangeLog (201188 => 201189)
--- trunk/Source/WebKit2/ChangeLog 2016-05-19 22:11:52 UTC (rev 201188)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-19 22:19:48 UTC (rev 201189)
@@ -1,3 +1,19 @@
+2016-05-19 Enrica Casucci <[email protected]>
+
+ Drag cannot start if no drag data is available in the Pasteboard.
+ https://bugs.webkit.org/show_bug.cgi?id=157911
+ rdar://problem/24577706
+
+ Reviewed by Tim Horton.
+
+ Setting dummy data to allow drag to start.
+
+ * Shared/mac/PasteboardTypes.h:
+ * Shared/mac/PasteboardTypes.mm:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::registerDraggedTypes):
+ (WebKit::WebViewImpl::dragImageForView):
+
2016-05-19 Jer Noble <[email protected]>
[IOS] Add setting to allow playback to continue inline after exiting fullscreen.
Modified: trunk/Source/WebKit2/Shared/mac/PasteboardTypes.h (201188 => 201189)
--- trunk/Source/WebKit2/Shared/mac/PasteboardTypes.h 2016-05-19 22:11:52 UTC (rev 201188)
+++ trunk/Source/WebKit2/Shared/mac/PasteboardTypes.h 2016-05-19 22:19:48 UTC (rev 201189)
@@ -36,6 +36,7 @@
static NSString * const WebURLsWithTitlesPboardType;
static NSString * const WebURLPboardType;
static NSString * const WebURLNamePboardType;
+ static NSString * const WebDummyPboardType;
static NSArray *forEditing();
static NSArray *forURL();
Modified: trunk/Source/WebKit2/Shared/mac/PasteboardTypes.mm (201188 => 201189)
--- trunk/Source/WebKit2/Shared/mac/PasteboardTypes.mm 2016-05-19 22:11:52 UTC (rev 201188)
+++ trunk/Source/WebKit2/Shared/mac/PasteboardTypes.mm 2016-05-19 22:19:48 UTC (rev 201189)
@@ -36,6 +36,7 @@
NSString * const PasteboardTypes::WebURLsWithTitlesPboardType = @"WebURLsWithTitlesPboardType";
NSString * const PasteboardTypes::WebURLPboardType = @"public.url";
NSString * const PasteboardTypes::WebURLNamePboardType = @"public.url-name";
+NSString * const PasteboardTypes::WebDummyPboardType = @"Apple WebKit dummy pasteboard type";
static inline NSArray *retain(NSArray *array)
{
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (201188 => 201189)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-05-19 22:11:52 UTC (rev 201188)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-05-19 22:19:48 UTC (rev 201189)
@@ -2918,6 +2918,7 @@
{
auto types = adoptNS([[NSMutableSet alloc] initWithArray:PasteboardTypes::forEditing()]);
[types addObjectsFromArray:PasteboardTypes::forURL()];
+ [types addObject:PasteboardTypes::WebDummyPboardType];
[m_view registerForDraggedTypes:[types allObjects]];
}
#endif // ENABLE(DRAG_SUPPORT)
@@ -2933,14 +2934,16 @@
{
// The call below could release the view.
RetainPtr<NSView> protector(m_view);
-
+ NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:NSDragPboard];
+ if (![[pasteboard types] count])
+ [pasteboard setString:@"" forType:PasteboardTypes::WebDummyPboardType];
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[view dragImage:image
at:NSPointFromCGPoint(clientPoint)
offset:NSZeroSize
event:linkDrag ? [NSApp currentEvent] : m_lastMouseDownEvent.get()
- pasteboard:[NSPasteboard pasteboardWithName:NSDragPboard]
+ pasteboard:pasteboard
source:m_view
slideBack:YES];
#pragma clang diagnostic pop
