Mac: Update drag&drop image creation.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@943 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-12-06 20:49:39 +00:00
parent 33fad449b6
commit 086f3cb47d
2 changed files with 10 additions and 13 deletions

View File

@@ -88,7 +88,6 @@ void PromiseWriterHelper(const WebDropData& drop_data,
@interface WebDragSource(Private)
- (void)fillPasteboard;
- (NSImage*)dragImage;
@end // @interface WebDragSource(Private)
@@ -238,9 +237,10 @@ void PromiseWriterHelper(const WebDropData& drop_data,
// Deal with Cocoa's flipped coordinate system.
position.y -= [dragImage_.get() size].height - imageOffset_.y;
}
// Per kwebster, offset arg is ignored, see -_web_DragImageForElement: in
// third_party/WebKit/Source/WebKit/mac/Misc/WebNSViewExtras.m.
[window dragImage:[self dragImage]
[window dragImage:dragImage_
at:position
offset:NSZeroSize
event:dragEvent
@@ -423,12 +423,4 @@ void PromiseWriterHelper(const WebDropData& drop_data,
owner:view_];
}
- (NSImage*)dragImage {
if (dragImage_)
return dragImage_;
// Default to returning a generic image.
return gfx::GetCachedImageWithName(@"nav.pdf");
}
@end // @implementation WebDragSource (Private)