content/renderer/pepper/pepper_plugin_instance_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/renderer/pepper/pepper_plugin_instance_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/renderer/pepper/pepper_plugin_instance_impl.cc

diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc

index f8b2cfface3e7d74e638207ec05b54fc89e18470..64b063c36471391fecf6b68bc5a2100b7b95c10b 100644

--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc

+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc

@@ -2672,11 +2672,9 @@ base::FilePath PepperPluginInstanceImpl::GetModulePath() {

PP_Resource PepperPluginInstanceImpl::CreateImage(gfx::ImageSkia* source_image,

float scale) {

- ui::ScaleFactor scale_factor = ui::GetScaleFactorFromScale(scale);

- gfx::ImageSkiaRep image_skia_rep = source_image->GetRepresentation(

- scale_factor);

+ gfx::ImageSkiaRep image_skia_rep = source_image->GetRepresentation(scale);

- if (image_skia_rep.is_null() || image_skia_rep.scale_factor() != scale_factor)

+ if (image_skia_rep.is_null() || image_skia_rep.scale() != scale)

return 0;

scoped_refptr<PPB_ImageData_Impl> image_data(new PPB_ImageData_Impl(