Pass DefaultDeviceScaleFactor to webkit

content/browser/tab_contents/tab_contents.cc

 // Copyright (c) 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 "content/browser/tab_contents/tab_contents.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.h"
 #include "base/string16.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/debugger/devtools_manager_impl.h"
 #include "content/browser/download/download_stats.h"
 #include "content/browser/download/save_package.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/host_zoom_map_impl.h"
@@ skipping 427 matching lines @@
   // chrome-devtools: pages (unless it's specifically allowed).
   if ((url.SchemeIs(chrome::kChromeDevToolsScheme) ||
       url.SchemeIs(chrome::kChromeUIScheme) ||
       (url.SchemeIs(chrome::kAboutScheme) &&
        url.spec() != chrome::kAboutBlankURL)) &&
       !command_line.HasSwitch(switches::kAllowWebUICompositing)) {
     prefs.accelerated_compositing_enabled = false;
     prefs.accelerated_2d_canvas_enabled = false;
   }
 
+  int default_device_scale_factor;
+  base::StringToInt(command_line.GetSwitchValueASCII(
+                    switches::kDefaultDeviceScaleFactor),
+                    &default_device_scale_factor);
+
+  if (default_device_scale_factor)

[Fady Samuel, 2012/02/29 15:42:25]

This if statement is probably not necessary. We can just ignore a
defaultDeviceScaleFactor of 0 in RenderViewImpl.

[tdresser, 2012/02/29 16:51:30]

Done.

+    prefs.default_device_scale_factor = default_device_scale_factor;
+
   content::GetContentClient()->browser()->OverrideWebkitPrefs(rvh, &prefs);
 
   return prefs;
 }
 
 NavigationControllerImpl& TabContents::GetControllerImpl() {
   return controller_;
 }
 
 RenderViewHostManager* TabContents::GetRenderManagerForTesting() {
@@ skipping 2002 matching lines @@
                    save_info,
                    this);
 }
 
 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
   RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh);
   // Can be NULL during tests.
   if (rwh_view)
     rwh_view->SetSize(GetView()->GetContainerSize());
 }