Introduce painted-device-scale-factor and use it when --enable-use-zoom-for-dsf is specified.

content/renderer/gpu/render_widget_compositor.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/gpu/render_widget_compositor.h"
 
 #include <limits>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 587 matching lines @@
 void RenderWidgetCompositor::detachCompositorAnimationTimeline(
     blink::WebCompositorAnimationTimeline* compositor_timeline) {
   DCHECK(compositor_timeline);
   DCHECK(layer_tree_host_->animation_host());
   layer_tree_host_->animation_host()->RemoveAnimationTimeline(
       static_cast<const cc_blink::WebCompositorAnimationTimelineImpl*>(
           compositor_timeline)->animation_timeline());
 }
 
 void RenderWidgetCompositor::setViewportSize(
-    const WebSize&,
-    const WebSize& device_viewport_size) {
-  layer_tree_host_->SetViewportSize(device_viewport_size);
-}
-
-void RenderWidgetCompositor::setViewportSize(
     const WebSize& device_viewport_size) {
   layer_tree_host_->SetViewportSize(device_viewport_size);
 }
 
 WebFloatPoint RenderWidgetCompositor::adjustEventPointForPinchZoom(
     const WebFloatPoint& point) const {
   return point;
 }
 
 void RenderWidgetCompositor::setDeviceScaleFactor(float device_scale) {
+  DCHECK(!IsUseZoomForDSFEnabled() || device_scale == 1.f);
   layer_tree_host_->SetDeviceScaleFactor(device_scale);
 }
 
 void RenderWidgetCompositor::setBackgroundColor(blink::WebColor color) {
   layer_tree_host_->set_background_color(color);
 }
 
 void RenderWidgetCompositor::setHasTransparentBackground(bool transparent) {
   layer_tree_host_->set_has_transparent_background(transparent);
 }
@@ skipping 445 matching lines @@
 #else
   // Ignore what the system said and give all clients the same maximum
   // allocation on desktop platforms.
   actual.bytes_limit_when_visible = 512 * 1024 * 1024;
   actual.priority_cutoff_when_visible =
       gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE;
 #endif
   return actual;
 }
 
+void RenderWidgetCompositor::SetPaintedDeviceScaleFactor(
+    float device_scale) {
+  layer_tree_host_->SetPaintedDeviceScaleFactor(device_scale);
+}
+
 }  // namespace content