Title: [123256] trunk/Source/WebKit/chromium
- Revision
- 123256
- Author
- [email protected]
- Date
- 2012-07-20 14:01:30 -0700 (Fri, 20 Jul 2012)
Log Message
[chromium][Mac] Switch the MACOSX_DEPLOYMENT_TARGET to 10.6
https://bugs.webkit.org/show_bug.cgi?id=91752
Patch by Robert Sesek <[email protected]> on 2012-07-20
Reviewed by Eric Seidel.
Use 10.6 NSScreen/NSColorSpace APIs to determine if the screen is
monochrome rather than comparing against deprecated colorspace names.
* src/mac/WebScreenInfoFactory.mm:
(WebKit::WebScreenInfoFactory::screenInfo):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (123255 => 123256)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-07-20 20:42:13 UTC (rev 123255)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-07-20 21:01:30 UTC (rev 123256)
@@ -1,3 +1,16 @@
+2012-07-20 Robert Sesek <[email protected]>
+
+ [chromium][Mac] Switch the MACOSX_DEPLOYMENT_TARGET to 10.6
+ https://bugs.webkit.org/show_bug.cgi?id=91752
+
+ Reviewed by Eric Seidel.
+
+ Use 10.6 NSScreen/NSColorSpace APIs to determine if the screen is
+ monochrome rather than comparing against deprecated colorspace names.
+
+ * src/mac/WebScreenInfoFactory.mm:
+ (WebKit::WebScreenInfoFactory::screenInfo):
+
2012-07-20 Daniel Murphy <[email protected]>
Introduce WebViewBenchmarkSupport for performance experiments on a real WebView
Modified: trunk/Source/WebKit/chromium/src/mac/WebScreenInfoFactory.mm (123255 => 123256)
--- trunk/Source/WebKit/chromium/src/mac/WebScreenInfoFactory.mm 2012-07-20 20:42:13 UTC (rev 123255)
+++ trunk/Source/WebKit/chromium/src/mac/WebScreenInfoFactory.mm 2012-07-20 21:01:30 UTC (rev 123256)
@@ -91,7 +91,7 @@
WebScreenInfo WebScreenInfoFactory::screenInfo(NSView* view)
{
- NSString *colorSpace = NSColorSpaceFromDepth([[NSScreen deepestScreen] depth]);
+ NSScreen* screen = [NSScreen deepestScreen];
WebScreenInfo results;
@@ -99,14 +99,10 @@
results.horizontalDPI = deviceDPI;
results.verticalDPI = deviceDPI;
- results.depth =
- NSBitsPerPixelFromDepth([[NSScreen deepestScreen] depth]);
- results.depthPerComponent =
- NSBitsPerSampleFromDepth([[NSScreen deepestScreen] depth]);
- results.isMonochrome = colorSpace == NSCalibratedWhiteColorSpace
- || colorSpace == NSCalibratedBlackColorSpace
- || colorSpace == NSDeviceWhiteColorSpace
- || colorSpace == NSDeviceBlackColorSpace;
+ results.depth = NSBitsPerPixelFromDepth([screen depth]);
+ results.depthPerComponent = NSBitsPerSampleFromDepth([screen depth]);
+ results.isMonochrome =
+ [[screen colorSpace] colorSpaceModel] == NSGrayColorSpaceModel;
results.rect = convertRect([screenForWindow([view window]) frame], [view window]);
results.availableRect =
convertRect([screenForWindow([view window]) visibleFrame], [view window]);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes