Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1710)

Unified Diff: content/renderer/render_view_impl.cc

Issue 1357423009: gfx: Make conversions from Size to SizeF be explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sizefconvert-gfx: . Created 5 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 5c2a1871640bb86d3d3fe4adb82ff8fcd7396691..ace648bf53d8ffc435db70708a50789c78fe606f 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -3592,7 +3592,7 @@ bool RenderViewImpl::didTapMultipleTargets(
break;
case TAP_MULTIPLE_TARGETS_STRATEGY_POPUP: {
gfx::Size canvas_size =
- gfx::ToCeiledSize(gfx::ScaleSize(zoom_rect.size(), new_total_scale));
+ gfx::ScaleToCeiledSize(zoom_rect.size(), new_total_scale);
cc::SharedBitmapManager* manager =
RenderThreadImpl::current()->shared_bitmap_manager();
scoped_ptr<cc::SharedBitmap> shared_bitmap =
@@ -3669,8 +3669,7 @@ void RenderViewImpl::SetDeviceScaleFactorForTesting(float factor) {
params.screen_info.deviceScaleFactor = factor;
params.new_size = size();
params.visible_viewport_size = visible_viewport_size_;
- params.physical_backing_size =
- gfx::ToCeiledSize(gfx::ScaleSize(size(), factor));
+ params.physical_backing_size = gfx::ScaleToCeiledSize(size(), factor);
params.top_controls_shrink_blink_size = false;
params.top_controls_height = 0.f;
params.resizer_rect = WebRect();
« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698