diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 17:16:29 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 17:16:29 +0000 |
| commit | 0199dbca65797698b41a7480612b52fcbeed3b78 (patch) | |
| tree | a8ffc535678491f6f96a5e1bf1155042211532f6 /content | |
| parent | 779caa5ab274192a968b0fadf496df5984fcdcc1 (diff) | |
| download | chromium_src-0199dbca65797698b41a7480612b52fcbeed3b78.zip chromium_src-0199dbca65797698b41a7480612b52fcbeed3b78.tar.gz chromium_src-0199dbca65797698b41a7480612b52fcbeed3b78.tar.bz2 | |
image-skia: Remove implicit conversion to SkBitmap on linux and chromeos.
The code for the implicit conversion is still used on windows and mac, but they
will eventually be removed too.
BUG=141146
Review URL: https://chromiumcodereview.appspot.com/10860004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/web_contents/web_contents_drag_win.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/content/browser/web_contents/web_contents_drag_win.cc b/content/browser/web_contents/web_contents_drag_win.cc index ccc2613..edd4624 100644 --- a/content/browser/web_contents/web_contents_drag_win.cc +++ b/content/browser/web_contents/web_contents_drag_win.cc @@ -28,7 +28,9 @@ #include "ui/base/clipboard/clipboard_util_win.h" #include "ui/base/clipboard/custom_data_helper.h" #include "ui/base/dragdrop/drag_utils.h" +#include "ui/base/layout.h" #include "ui/gfx/image/image_skia.h" +#include "ui/gfx/screen.h" #include "ui/gfx/size.h" #include "webkit/glue/webdropdata.h" @@ -148,10 +150,15 @@ void WebContentsDragWin::StartDragging(const WebDropData& drop_data, base::Thread::Options options; options.message_loop_type = MessageLoop::TYPE_UI; if (drag_drop_thread_->StartWithOptions(options)) { + gfx::Display display = + gfx::Screen::GetDisplayNearestWindow(web_contents_->GetNativeView()); + ui::ScaleFactor scale_factor = ui::GetScaleFactorFromScale( + display.device_scale_factor()); drag_drop_thread_->message_loop()->PostTask( FROM_HERE, base::Bind(&WebContentsDragWin::StartBackgroundDragging, this, - drop_data, ops, page_url, page_encoding, image, + drop_data, ops, page_url, page_encoding, + image.GetRepresentation(scale_factor).sk_bitmap(), image_offset)); } |