Index: ui/views/cocoa/drag_drop_client_mac.mm |
diff --git a/ui/views/cocoa/drag_drop_client_mac.mm b/ui/views/cocoa/drag_drop_client_mac.mm |
new file mode 100644 |
index 0000000000000000000000000000000000000000..2daa175428cdf5175d5ac370e7253fc4a258ed10 |
--- /dev/null |
+++ b/ui/views/cocoa/drag_drop_client_mac.mm |
@@ -0,0 +1,159 @@ |
+// Copyright 2016 The Chromium Authors. All rights reserved. |
+// Use of this source code is governed by a BSD-style license that can be |
+// found in the LICENSE file. |
+ |
+#import "ui/views/cocoa/drag_drop_client_mac.h" |
+ |
+#include "base/mac/mac_util.h" |
+#include "base/strings/sys_string_conversions.h" |
+#include "ui/base/dragdrop/os_exchange_data.h" |
+#import "ui/base/dragdrop/os_exchange_data_provider_mac.h" |
+#include "ui/gfx/image/image_skia_util_mac.h" |
+#include "ui/views/drag_utils.h" |
+#import "ui/views/cocoa/bridged_content_view.h" |
+#import "ui/views/cocoa/bridged_native_widget.h" |
+#include "ui/views/widget/drop_helper.h" |
+#include "ui/views/widget/native_widget_mac.h" |
+ |
+@interface CocoaDragDropDataProvider () |
+- (id)initWithData:(const ui::OSExchangeData&)data; |
+- (id)initWithPasteboard:(NSPasteboard*)pasteboard; |
+@end |
+ |
+@implementation CocoaDragDropDataProvider |
+ |
+std::unique_ptr<ui::OSExchangeData> data_; |
+ |
+- (id)initWithData:(const ui::OSExchangeData&)data { |
+ if ((self = [super init])) { |
+ data_.reset(new OSExchangeData(data.provider().Clone())); |
+ } |
+ return self; |
+} |
+ |
+- (id)initWithPasteboard:(NSPasteboard*)pasteboard { |
+ if ((self = [super init])) { |
+ data_ = ui::OSExchangeDataProviderMac::CreateDataFromPasteboard(pasteboard); |
+ } |
+ return self; |
+} |
+ |
+- (ui::OSExchangeData*)data { |
+ return data_.get(); |
+} |
+ |
+// NSPasteboardItemDataProvider protocol implementation. |
+ |
+- (void)pasteboard:(NSPasteboard*)sender |
+ item:(NSPasteboardItem*)item |
+ provideDataForType:(NSString*)type { |
+ const ui::OSExchangeDataProviderMac& provider = |
+ static_cast<const ui::OSExchangeDataProviderMac&>(data_->provider()); |
+ NSData* ns_data = provider.GetNSDataForType(type); |
+ [sender setData:ns_data forType:type]; |
+} |
+ |
+@end |
+ |
+namespace views { |
+ |
+DragDropClientMac::DragDropClientMac(BridgedNativeWidget* bridge, |
+ View* root_view) |
+ : operation_(0), |
+ bridge_(bridge), |
+ is_run_loop_running_(false), |
+ quit_closure_(base::Closure()) { |
+ DCHECK(bridge); |
+ drop_helper_.reset(new DropHelper(root_view)); |
+} |
+ |
+DragDropClientMac::~DragDropClientMac() {} |
+ |
+void DragDropClientMac::StartDragAndDrop( |
+ View* view, |
+ const ui::OSExchangeData& data, |
+ int operation, |
+ ui::DragDropTypes::DragEventSource source) { |
+ data_source_.reset([[CocoaDragDropDataProvider alloc] initWithData:data]); |
+ operation_ = operation; |
+ |
+ const ui::OSExchangeDataProviderMac& provider = |
+ static_cast<const ui::OSExchangeDataProviderMac&>(data.provider()); |
+ |
+ // Synthesize an event for dragging, since we can't be sure that |
+ // [NSApp currentEvent] will return a valid dragging event. |
+ NSWindow* window = bridge_->ns_window(); |
+ NSPoint position = [window mouseLocationOutsideOfEventStream]; |
+ NSTimeInterval event_time = [[NSApp currentEvent] timestamp]; |
+ NSEvent* event = [NSEvent mouseEventWithType:NSLeftMouseDragged |
+ location:position |
+ modifierFlags:NSLeftMouseDraggedMask |
+ timestamp:event_time |
+ windowNumber:[window windowNumber] |
+ context:nil |
+ eventNumber:0 |
+ clickCount:1 |
+ pressure:1.0]; |
+ |
+ NSImage* image = gfx::NSImageFromImageSkiaWithColorSpace( |
+ provider.GetDragImage(), base::mac::GetSRGBColorSpace()); |
+ |
+ base::scoped_nsobject<NSPasteboardItem> item([[NSPasteboardItem alloc] init]); |
+ [item setDataProvider:data_source_.get() |
+ forTypes:ui::OSExchangeDataProviderMac:: |
+ SupportedPasteboardTypes()]; |
+ |
+ base::scoped_nsobject<NSDraggingItem> drag_item( |
+ [[NSDraggingItem alloc] initWithPasteboardWriter:item.get()]); |
+ |
+ // Subtract the image's height from the y location so that the mouse will be |
+ // at the upper left corner of the image. |
+ NSRect dragging_frame = |
+ NSMakeRect([event locationInWindow].x, |
+ [event locationInWindow].y - [image size].height, |
+ [image size].width, [image size].height); |
+ [drag_item setDraggingFrame:dragging_frame contents:image]; |
+ |
+ [bridge_->ns_view() beginDraggingSessionWithItems:@[ drag_item.get() ] |
+ event:event |
+ source:bridge_->ns_view()]; |
+ base::RunLoop run_loop; |
+ quit_closure_ = run_loop.QuitClosure(); |
+ is_run_loop_running_ = YES; |
+ run_loop.Run(); |
+} |
+ |
+NSDragOperation DragDropClientMac::DragUpdate(id<NSDraggingInfo> sender) { |
+ int drag_operation = ui::DragDropTypes::DRAG_NONE; |
+ |
+ // Since dragging from non MacView sources does not generate OSExchangeData, |
+ // we need to generate one based on the provided pasteboard. |
+ if (!data_source_.get()) { |
+ data_source_.reset([[CocoaDragDropDataProvider alloc] |
+ initWithPasteboard:[sender draggingPasteboard]]); |
+ } |
+ |
+ drag_operation = drop_helper_->OnDragOver( |
+ *[data_source_ data], LocationInView([sender draggingLocation]), |
+ operation_); |
+ return ui::DragDropTypes::DragOperationToNSDragOperation(drag_operation); |
+} |
+ |
+NSDragOperation DragDropClientMac::Drop(id<NSDraggingInfo> sender) { |
+ int drag_operation = drop_helper_->OnDrop( |
+ *[data_source_ data], LocationInView([sender draggingLocation]), |
+ operation_); |
+ return ui::DragDropTypes::DragOperationToNSDragOperation(drag_operation); |
+} |
+ |
+void DragDropClientMac::EndDrag() { |
+ data_source_.reset(); |
+ if (is_run_loop_running_) |
tapted
2016/06/01 01:57:01
Does this work:
// Allow a test to invoke EndDr
spqchan
2016/06/01 19:09:29
Nice! Yep, it works
|
+ quit_closure_.Run(); |
+} |
+ |
+gfx::Point DragDropClientMac::LocationInView(NSPoint point) const { |
+ return gfx::Point(point.x, NSHeight([bridge_->ns_window() frame]) - point.y); |
+} |
+ |
+} // namespace views |