mac: Basic HighDPI implementation for web contents.

content/browser/web_contents/web_contents_impl.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/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 532 matching lines @@
   // Force accelerated compositing and 2d canvas off for chrome:, about: and
   // 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;
   }
-#if defined(OS_MACOSX)
-  // Mac doesn't have gfx::Screen::GetMonitorNearestWindow impl.
-  // crbug.com/125690.
-  prefs.default_device_scale_factor =
-      gfx::Monitor::GetDefaultDeviceScaleFactor();
-#else
   if (rvh->GetView()) {
     gfx::Monitor monitor = gfx::Screen::GetMonitorNearestWindow(
         rvh->GetView()->GetNativeView());
     prefs.default_device_scale_factor =
         static_cast<int>(monitor.device_scale_factor());
   } else {
     prefs.default_device_scale_factor =
         gfx::Monitor::GetDefaultDeviceScaleFactor();;
   }
-#endif
 
   if (command_line.HasSwitch(switches::kDefaultTileWidth))
     prefs.default_tile_width =
         GetSwitchValueAsInt(command_line, switches::kDefaultTileWidth, 1);
   if (command_line.HasSwitch(switches::kDefaultTileHeight))
     prefs.default_tile_height =
         GetSwitchValueAsInt(command_line, switches::kDefaultTileHeight, 1);
   if (command_line.HasSwitch(switches::kMaxUntiledLayerWidth))
     prefs.max_untiled_layer_width =
         GetSwitchValueAsInt(command_line, switches::kMaxUntiledLayerWidth, 1);
@@ skipping 2453 matching lines @@
       browser_plugin_host()->embedder_render_process_host();
   *embedder_container_id = browser_plugin_host()->instance_id();
   int embedder_process_id =
       embedder_render_process_host ? embedder_render_process_host->GetID() : -1;
   if (embedder_process_id != -1) {
     *embedder_channel_name =
         StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(),
                      embedder_process_id);
   }
 }