Title: [153004] branches/safari-537-branch/Source/WebCore
- Revision
- 153004
- Author
- [email protected]
- Date
- 2013-07-22 15:17:02 -0700 (Mon, 22 Jul 2013)
Log Message
Merged r152839. <rdar://problem/14247011>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (153003 => 153004)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-22 22:10:07 UTC (rev 153003)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-22 22:17:02 UTC (rev 153004)
@@ -1,5 +1,23 @@
2013-07-22 Lucas Forschler <[email protected]>
+ Merge r152839
+
+ 2013-07-18 Ryosuke Niwa <[email protected]>
+
+ willWriteSelectionToPasteboard and willPerformDragSourceAction editing callbacks are not called for drag and drop
+ https://bugs.webkit.org/show_bug.cgi?id=118828
+
+ Reviewed by Gavin Barraclough.
+
+ Call these two callbacks when we start a drag and drop.
+
+ No new tests for now but we should start logging these callbacks in DRT and WTR's EditorClients.
+
+ * page/DragController.cpp:
+ (WebCore::DragController::startDrag):
+
+2013-07-22 Lucas Forschler <[email protected]>
+
Merge r152824
2013-07-17 Tim Horton <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/page/DragController.cpp (153003 => 153004)
--- branches/safari-537-branch/Source/WebCore/page/DragController.cpp 2013-07-22 22:10:07 UTC (rev 153003)
+++ branches/safari-537-branch/Source/WebCore/page/DragController.cpp 2013-07-22 22:17:02 UTC (rev 153004)
@@ -789,14 +789,17 @@
Image* image = getImage(element);
if (state.type == DragSourceActionSelection) {
if (!clipboard->hasData()) {
+ RefPtr<Range> selectionRange = src->selection()->toNormalizedRange();
+ ASSERT(selectionRange);
+
+ src->editor().willWriteSelectionToPasteboard(selectionRange.get());
+
if (enclosingTextFormControl(src->selection()->start()))
clipboard->writePlainText(src->editor().selectedTextForClipboard());
- else {
- RefPtr<Range> selectionRange = src->selection()->toNormalizedRange();
- ASSERT(selectionRange);
+ else
+ clipboard->writeRange(selectionRange.get(), src);
- clipboard->writeRange(selectionRange.get(), src);
- }
+ src->editor().didWriteSelectionToPasteboard();
}
m_client->willPerformDragSourceAction(DragSourceActionSelection, dragOrigin, clipboard);
if (!dragImage) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes