<!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>[38013] trunk/WebKitTools</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/38013">38013</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2008-10-30 16:36:47 -0700 (Thu, 30 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>2008-10-30  Pierre-Olivier Latour  &lt;pol@apple.com&gt;

        Reviewed by Dan Bernstein.

        Fixed 64 bit build failure.

        * DumpRenderTree/mac/PixelDumpSupportMac.mm:
        (setupMainDisplayColorProfile):
        (createBitmapContextFromWebView):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsDumpRenderTreemacPixelDumpSupportMacmm">trunk/WebKitTools/DumpRenderTree/mac/PixelDumpSupportMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (38012 => 38013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog        2008-10-30 22:16:26 UTC (rev 38012)
+++ trunk/WebKitTools/ChangeLog        2008-10-30 23:36:47 UTC (rev 38013)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2008-10-30  Pierre-Olivier Latour  &lt;pol@apple.com&gt;
+
+        Reviewed by Dan Bernstein.
+
+        Fixed 64 bit build failure.
+
+        * DumpRenderTree/mac/PixelDumpSupportMac.mm:
+        (setupMainDisplayColorProfile):
+        (createBitmapContextFromWebView):
+
</ins><span class="cx"> 2008-10-28  Alp Toker  &lt;alp@nuanti.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Fix GTK DRT following build breakage in r37928.
</span></span></pre></div>
<a id="trunkWebKitToolsDumpRenderTreemacPixelDumpSupportMacmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/DumpRenderTree/mac/PixelDumpSupportMac.mm (38012 => 38013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/DumpRenderTree/mac/PixelDumpSupportMac.mm        2008-10-30 22:16:26 UTC (rev 38012)
+++ trunk/WebKitTools/DumpRenderTree/mac/PixelDumpSupportMac.mm        2008-10-30 23:36:47 UTC (rev 38013)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> // This implies we have to temporarily change the profile of the main display to the colorspace we want to render into.
</span><span class="cx"> // We also need to make sure the CGBitmapContext we return is in that same colorspace.
</span><span class="cx"> 
</span><del>-#define PROFILE_PATH &quot;/System/Library/ColorSync/Profiles/Generic RGB Profile.icc&quot; // FIXME: Should we be using &quot;/System/Library/ColorSync/Profiles/sRGB Profile.icc&quot;?
</del><ins>+#define PROFILE_PATH &quot;/System/Library/ColorSync/Profiles/Generic RGB Profile.icc&quot; // FIXME: This cannot be more than CS_MAX_PATH (256 characters)
</ins><span class="cx"> 
</span><span class="cx"> static CMProfileLocation sInitialProfileLocation; // The locType field is initialized to 0 which is the same as cmNoProfileBase
</span><span class="cx"> 
</span><span class="lines">@@ -85,17 +85,9 @@
</span><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     CMProfileLocation location;
</span><del>-    location.locType = cmFileBasedProfile;
-    NSURL *url = [NSURL fileURLWithPath:[NSString stringWithUTF8String:PROFILE_PATH]];
-    FSRef fsRef;
-    if (url &amp;&amp; CFURLGetFSRef((CFURLRef)url, &amp;fsRef)) {
-        error = FSGetCatalogInfo(&amp;fsRef, 0, 0, 0, &amp;location.u.fileLoc.spec, 0);
-        if (error == noErr)
-        error = CMSetDeviceProfile(cmDisplayDeviceClass, (CMDeviceID)kCGDirectMainDisplay, &amp;scope, cmDefaultProfileID, &amp;location);
-    }
-    else
-        error = -1;
-
</del><ins>+    location.locType = cmPathBasedProfile;
+    strcpy(location.u.pathLoc.path, PROFILE_PATH);
+    error = CMSetDeviceProfile(cmDisplayDeviceClass, (CMDeviceID)kCGDirectMainDisplay, &amp;scope, cmDefaultProfileID, &amp;location);
</ins><span class="cx">     if (error) {
</span><span class="cx">         fprintf(stderr, &quot;Failed to set color profile for main display!  Many pixel tests may fail as a result.  (Error: %i)&quot;, error);
</span><span class="cx">         sInitialProfileLocation.locType = cmNoProfileBase;
</span><span class="lines">@@ -126,17 +118,12 @@
</span><span class="cx">     static CGColorSpaceRef colorSpace = 0;
</span><span class="cx">     if (!colorSpace) {
</span><span class="cx">         CMProfileLocation location;
</span><del>-        location.locType = cmFileBasedProfile;
-        NSURL *url = [NSURL fileURLWithPath:[NSString stringWithUTF8String:PROFILE_PATH]];
-        FSRef fsRef;
-        if (url &amp;&amp; CFURLGetFSRef((CFURLRef)url, &amp;fsRef)) {
-            if (FSGetCatalogInfo(&amp;fsRef, 0, 0, 0, &amp;location.u.fileLoc.spec, 0) == noErr) {
-                CMProfileRef profile;
-                if (CMOpenProfile(&amp;profile, &amp;location) == noErr) {
-                    colorSpace = CGColorSpaceCreateWithPlatformColorSpace(profile);
-                    CMCloseProfile(profile);
-                }
-            }
</del><ins>+        location.locType = cmPathBasedProfile;
+        strcpy(location.u.pathLoc.path, PROFILE_PATH);
+        CMProfileRef profile;
+        if (CMOpenProfile(&amp;profile, &amp;location) == noErr) {
+            colorSpace = CGColorSpaceCreateWithPlatformColorSpace(profile);
+            CMCloseProfile(profile);
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx">     
</span></span></pre>
</div>
</div>

</body>
</html>