Title: [115292] trunk/Tools
- Revision
- 115292
- Author
- m...@apple.com
- Date
- 2012-04-25 23:27:07 -0700 (Wed, 25 Apr 2012)
Log Message
Teach LayoutTestHelper to correctly restore the color profile when it's a factory profile
https://bugs.webkit.org/show_bug.cgi?id=84931
Reviewed by Filip Pizlo.
* DumpRenderTree/mac/LayoutTestHelper.m:
(installLayoutTestColorProfile): Account for the possibility of the default
profile being a factory profile.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (115291 => 115292)
--- trunk/Tools/ChangeLog 2012-04-26 05:44:22 UTC (rev 115291)
+++ trunk/Tools/ChangeLog 2012-04-26 06:27:07 UTC (rev 115292)
@@ -1,3 +1,14 @@
+2012-04-25 Maciej Stachowiak <m...@apple.com>
+
+ Teach LayoutTestHelper to correctly restore the color profile when it's a factory profile
+ https://bugs.webkit.org/show_bug.cgi?id=84931
+
+ Reviewed by Filip Pizlo.
+
+ * DumpRenderTree/mac/LayoutTestHelper.m:
+ (installLayoutTestColorProfile): Account for the possibility of the default
+ profile being a factory profile.
+
2012-04-25 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r115240.
Modified: trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m (115291 => 115292)
--- trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m 2012-04-26 05:44:22 UTC (rev 115291)
+++ trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m 2012-04-26 06:27:07 UTC (rev 115292)
@@ -65,6 +65,11 @@
if (profileInfo) {
sUserColorProfileURL = (CFURLRef)CFDictionaryGetValue(profileInfo, CFSTR("1"));
CFRetain(sUserColorProfileURL);
+ } else {
+ profileInfo = (CFDictionaryRef)CFDictionaryGetValue(deviceInfo, kColorSyncFactoryProfiles);
+ CFDictionaryRef factoryProfile = (CFDictionaryRef)CFDictionaryGetValue(profileInfo, CFSTR("1"));
+ sUserColorProfileURL = (CFURLRef)CFDictionaryGetValue(factoryProfile, kColorSyncDeviceProfileURL);
+ CFRetain(sUserColorProfileURL);
}
CFRelease(deviceInfo);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
