Update to Chromium revision 140240.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@701 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-06-21 20:35:13 +00:00
parent 93e1f9722b
commit c56def5569
15 changed files with 82 additions and 75 deletions

View File

@@ -26,6 +26,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "ui/base/dragdrop/drag_utils.h"
#include "ui/gfx/image/image_skia.h"
#include "webkit/glue/webdropdata.h"
using WebKit::WebDragOperationsMask;
@@ -291,7 +292,8 @@ void BrowserDragDelegate::DoDragging(const WebDropData& drop_data,
// Set drag image.
if (!image.isNull()) {
drag_utils::SetDragImageOnDataObject(
image, gfx::Size(image.width(), image.height()), image_offset, &data);
gfx::ImageSkia(image), gfx::Size(image.width(), image.height()),
image_offset, &data);
}
// We need to enable recursive tasks on the message loop so we can get