cc: Fix hudLayer size and paint rects scale for deviceScaleFactor != 1

cc/heads_up_display_layer.cc

 // Copyright 2012 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 "cc/heads_up_display_layer.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/heads_up_display_layer_impl.h"
 #include "cc/layer_tree_host.h"
 
@@ skipping 17 matching lines @@
 void HeadsUpDisplayLayer::update(ResourceUpdateQueue&, const OcclusionTracker*, RenderingStats&)
 {
     const LayerTreeDebugState& debugState = layerTreeHost()->debugState();
     int maxTextureSize = layerTreeHost()->rendererCapabilities().maxTextureSize;
 
     gfx::Size bounds;
     gfx::Transform matrix;
     matrix.MakeIdentity();
 
     if (debugState.showPlatformLayerTree || debugState.showHudRects()) {
-        int width = std::min(maxTextureSize, layerTreeHost()->deviceViewportSize().width());
-        int height = std::min(maxTextureSize, layerTreeHost()->deviceViewportSize().height());
+        int width = std::min(maxTextureSize, layerTreeHost()->layoutViewportSize().width());
+        int height = std::min(maxTextureSize, layerTreeHost()->layoutViewportSize().height());
         bounds = gfx::Size(width, height);
     } else {
         bounds = gfx::Size(256, 128);
-        matrix.Translate(layerTreeHost()->deviceViewportSize().width() - 256, 0);
+        matrix.Translate(layerTreeHost()->layoutViewportSize().width() - 256, 0);
     }
 
     setBounds(bounds);
     setTransform(matrix);
 }
 
 bool HeadsUpDisplayLayer::drawsContent() const
 {
     return true;
 }
@@ skipping 14 matching lines @@
     Layer::pushPropertiesTo(layerImpl);
 
     if (!m_fontAtlas)
         return;
 
     HeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<HeadsUpDisplayLayerImpl*>(layerImpl);
     hudLayerImpl->setFontAtlas(m_fontAtlas.Pass());
 }
 
 }  // namespace cc