Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Unified Diff: content/browser/web_contents/web_contents_view_mac.mm

Issue 2336113003: Revert of cc: Plumb the monitor color profile to renderer for rasterization (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.cc ('k') | content/common/view_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_view_mac.mm
diff --git a/content/browser/web_contents/web_contents_view_mac.mm b/content/browser/web_contents/web_contents_view_mac.mm
index 5a1368d92f5c03a7beb97094210eefededd29a75..f553ce963e6ee08b268a63f9266f4122ce04edb2 100644
--- a/content/browser/web_contents/web_contents_view_mac.mm
+++ b/content/browser/web_contents/web_contents_view_mac.mm
@@ -82,12 +82,15 @@
display::Display display =
display::Screen::GetScreen()->GetDisplayNearestWindow(view);
+ NSScreen* screen = [NSScreen deepestScreen];
+
content::ScreenInfo results;
+
results.device_scale_factor = static_cast<int>(display.device_scale_factor());
- results.icc_profile = display.icc_profile();
- results.depth = display.color_depth();
- results.depth_per_component = display.depth_per_component();
- results.is_monochrome = display.is_monochrome();
+ results.depth = NSBitsPerPixelFromDepth([screen depth]);
+ results.depth_per_component = NSBitsPerSampleFromDepth([screen depth]);
+ results.is_monochrome =
+ [[screen colorSpace] colorSpaceModel] == NSGrayColorSpaceModel;
results.rect = display.bounds();
results.available_rect = display.work_area();
results.orientation_angle = display.RotationAsDegree();
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.cc ('k') | content/common/view_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698