<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169788] trunk/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169788">169788</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-06-10 19:28:42 -0700 (Tue, 10 Jun 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Always switch to an sRGB screen color profile when running tests
https://bugs.webkit.org/show_bug.cgi?id=133712

Reviewed by Tim Horton.

Switch the screen color profile to sRGB when running tests, because even ref
tests need the screen to use the correct color profile.

* DumpRenderTree/mac/LayoutTestHelper.m:
(installLayoutTestColorProfile):
* Scripts/webkitpy/port/mac.py:
(MacPort.start_helper):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacLayoutTestHelperm">trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m</a></li>
<li><a href="#trunkToolsScriptswebkitpyportmacpy">trunk/Tools/Scripts/webkitpy/port/mac.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (169787 => 169788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2014-06-11 01:53:19 UTC (rev 169787)
+++ trunk/Tools/ChangeLog        2014-06-11 02:28:42 UTC (rev 169788)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-06-10  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+        Always switch to an sRGB screen color profile when running tests
+        https://bugs.webkit.org/show_bug.cgi?id=133712
+
+        Reviewed by Tim Horton.
+        
+        Switch the screen color profile to sRGB when running tests, because even ref
+        tests need the screen to use the correct color profile.
+
+        * DumpRenderTree/mac/LayoutTestHelper.m:
+        (installLayoutTestColorProfile):
+        * Scripts/webkitpy/port/mac.py:
+        (MacPort.start_helper):
+
</ins><span class="cx"> 2014-06-10  Martin Hodovan  &lt;mhodovan@partner.samsung.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [EFL] Bump EFL libraries to 1.9
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacLayoutTestHelperm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m (169787 => 169788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m        2014-06-11 01:53:19 UTC (rev 169787)
+++ trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m        2014-06-11 02:28:42 UTC (rev 169788)
</span><span class="lines">@@ -81,9 +81,9 @@
</span><span class="cx">         CFRelease(deviceInfo);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    ColorSyncProfileRef genericRGBProfile = ColorSyncProfileCreateWithName(kColorSyncGenericRGBProfile);
</del><ins>+    ColorSyncProfileRef sRGBProfile = ColorSyncProfileCreateWithName(kColorSyncSRGBProfile);
</ins><span class="cx">     CFErrorRef error;
</span><del>-    CFURLRef profileURL = ColorSyncProfileGetURL(genericRGBProfile, &amp;error);
</del><ins>+    CFURLRef profileURL = ColorSyncProfileGetURL(sRGBProfile, &amp;error);
</ins><span class="cx">     if (!profileURL) {
</span><span class="cx">         NSLog(@&quot;Failed to get URL of Generic RGB color profile! Many pixel tests may fail as a result. Error: %@&quot;, error);
</span><span class="cx">         
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">             sUserColorProfileURL = 0;
</span><span class="cx">         }
</span><span class="cx">         
</span><del>-        CFRelease(genericRGBProfile);
</del><ins>+        CFRelease(sRGBProfile);
</ins><span class="cx">         CFRelease(mainDisplayID);
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     CFRelease(profileInfo);
</span><del>-    CFRelease(genericRGBProfile);
</del><ins>+    CFRelease(sRGBProfile);
</ins><span class="cx">     CFRelease(mainDisplayID);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportmacpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (169787 => 169788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/mac.py        2014-06-11 01:53:19 UTC (rev 169787)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py        2014-06-11 02:28:42 UTC (rev 169788)
</span><span class="lines">@@ -278,9 +278,7 @@
</span><span class="cx">         helper_path = self._path_to_helper()
</span><span class="cx">         if helper_path:
</span><span class="cx">             _log.debug(&quot;Starting layout helper %s&quot; % helper_path)
</span><del>-            arguments = [helper_path]
-            if pixel_tests:
-                arguments.append('--install-color-profile')
</del><ins>+            arguments = [helper_path, '--install-color-profile']
</ins><span class="cx">             self._helper = self._executive.popen(arguments,
</span><span class="cx">                 stdin=self._executive.PIPE, stdout=self._executive.PIPE, stderr=None)
</span><span class="cx">             is_ready = self._helper.stdout.readline()
</span></span></pre>
</div>
</div>

</body>
</html>