[DevTools] Handle emulated device scale factor and original device scale factor properly.

content/renderer/devtools/render_widget_screen_metrics_emulator.cc

 // Copyright 2016 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/devtools/render_widget_screen_metrics_emulator.h"
 
 #include "content/common/resize_params.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/renderer/devtools/render_widget_screen_metrics_emulator_delegate.h"
 
 namespace content {
 
 RenderWidgetScreenMetricsEmulator::RenderWidgetScreenMetricsEmulator(
     RenderWidgetScreenMetricsEmulatorDelegate* delegate,
     const blink::WebDeviceEmulationParams& params,
     const ResizeParams& resize_params,
     const gfx::Rect& view_screen_rect,
     const gfx::Rect& window_screen_rect)
     : delegate_(delegate),
       emulation_params_(params),
       scale_(1.f),
       original_resize_params_(resize_params),
       original_view_screen_rect_(view_screen_rect),
       original_window_screen_rect_(window_screen_rect) {
-  Apply();
+  // Apply();

[dgozman, 2016/02/29 20:26:20]

Why this change?

[oshima, 2016/02/29 21:28:03]

I updated the description. This is to be able to check if RenderViewImpl is in
emulation mode. (The scoped_ptr is set after ctor is finished)

 }
 
 RenderWidgetScreenMetricsEmulator::~RenderWidgetScreenMetricsEmulator() {
   delegate_->SetScreenMetricsEmulationParameters(false, emulation_params_);
   delegate_->SetScreenRects(original_view_screen_rect_,
                             original_window_screen_rect_);
   delegate_->Resize(original_resize_params_);
 }
 
 void RenderWidgetScreenMetricsEmulator::ChangeEmulationParams(
@@ skipping 125 matching lines @@
 
 gfx::Rect RenderWidgetScreenMetricsEmulator::AdjustValidationMessageAnchor(
     const gfx::Rect& anchor) {
   gfx::Rect scaled = gfx::ScaleToEnclosedRect(anchor, scale_);
   scaled.set_x(scaled.x() + offset_.x());
   scaled.set_y(scaled.y() + offset_.y());
   return scaled;
 }
 
 }  // namespace content