Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index d31126bf3642cd27a150f1735d3b6e17d8c47ea4..9d38244d52b4374ccc0d43a76bd7bca80e4ab740 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -58,6 +58,8 @@ |
#include "content/public/common/content_restriction.h" |
#include "content/public/common/content_switches.h" |
#include "content/public/common/url_constants.h" |
+#include "ui/gfx/monitor.h" |
+#include "ui/gfx/screen.h" |
#include "net/base/mime_util.h" |
#include "net/base/net_util.h" |
#include "net/base/network_change_notifier.h" |
@@ -74,6 +76,7 @@ |
#include "content/browser/web_contents/web_contents_view_gtk.h" |
#elif defined(OS_MACOSX) |
#include "content/browser/web_contents/web_contents_view_mac.h" |
+#include "ui/base/ui_base_switches.h" |
#include "ui/gfx/surface/io_surface_support_mac.h" |
#elif defined(OS_ANDROID) |
#include "content/browser/web_contents/web_contents_view_android.h" |
@@ -504,13 +507,24 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh, |
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. |
int default_device_scale_factor; |
base::StringToInt(command_line.GetSwitchValueASCII( |
switches::kDefaultDeviceScaleFactor), |
&default_device_scale_factor); |
- |
prefs.default_device_scale_factor = default_device_scale_factor; |
+#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 = 1; |
+ } |
+#endif |
content::GetContentClient()->browser()->OverrideWebkitPrefs(rvh, url, &prefs); |