content/browser/renderer_host/render_view_host_impl.cc - Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix new usage of scale in FastShowPickler Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/browser/renderer_host/render_view_host_impl.cc

diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc

index 68204fb746a36dc3416fb2428238d013f2a5c689..772d0dff1bd91abb6dd5dbfea269b411bb0f15da 100644

--- a/content/browser/renderer_host/render_view_host_impl.cc

+++ b/content/browser/renderer_host/render_view_host_impl.cc

@@ -1494,8 +1494,8 @@ void RenderViewHostImpl::OnStartDragging(

if (policy->CanReadFile(GetProcess()->GetID(), path))

filtered_data.filenames.push_back(*it);

}

- ui::ScaleFactor scale_factor = GetScaleFactorForView(GetView());

- gfx::ImageSkia image(gfx::ImageSkiaRep(bitmap, scale_factor));

+ float scale = ui::GetImageScale(GetScaleFactorForView(GetView()));

+ gfx::ImageSkia image(gfx::ImageSkiaRep(bitmap, scale));

view->StartDragging(filtered_data, drag_operations_mask, image,

bitmap_offset_in_dip, event_info);

}