<!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>[164270] 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/164270">164270</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-02-17 20:59:47 -0800 (Mon, 17 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using PLATFORM(MAC) in DumpRenderTree except where it means “OS X but not iOS”
https://bugs.webkit.org/show_bug.cgi?id=128950
Reviewed by Anders Carlsson.
Changed all PLATFORM(MAC) instances that were not excluding iOS to PLATFORM(COCOA).
* DumpRenderTree/AccessibilityController.h:
* DumpRenderTree/AccessibilityTextMarker.h:
* DumpRenderTree/AccessibilityUIElement.cpp:
* DumpRenderTree/AccessibilityUIElement.h:
* DumpRenderTree/DumpRenderTree.h:
* DumpRenderTree/cg/PixelDumpSupportCG.cpp:
(computeMD5HashStringForBitmapContext):
* DumpRenderTree/cg/PixelDumpSupportCG.h:
(BitmapContext::~BitmapContext):
* DumpRenderTree/config.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeAccessibilityControllerh">trunk/Tools/DumpRenderTree/AccessibilityController.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeAccessibilityTextMarkerh">trunk/Tools/DumpRenderTree/AccessibilityTextMarker.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeAccessibilityUIElementcpp">trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeAccessibilityUIElementh">trunk/Tools/DumpRenderTree/AccessibilityUIElement.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreeh">trunk/Tools/DumpRenderTree/DumpRenderTree.h</a></li>
<li><a href="#trunkToolsDumpRenderTreecgPixelDumpSupportCGcpp">trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreecgPixelDumpSupportCGh">trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeconfigh">trunk/Tools/DumpRenderTree/config.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (164269 => 164270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-18 04:20:13 UTC (rev 164269)
+++ trunk/Tools/ChangeLog 2014-02-18 04:59:47 UTC (rev 164270)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-02-17 Dan Bernstein <mitz@apple.com>
+
+ Stop using PLATFORM(MAC) in DumpRenderTree except where it means “OS X but not iOS”
+ https://bugs.webkit.org/show_bug.cgi?id=128950
+
+ Reviewed by Anders Carlsson.
+
+ Changed all PLATFORM(MAC) instances that were not excluding iOS to PLATFORM(COCOA).
+
+ * DumpRenderTree/AccessibilityController.h:
+ * DumpRenderTree/AccessibilityTextMarker.h:
+ * DumpRenderTree/AccessibilityUIElement.cpp:
+ * DumpRenderTree/AccessibilityUIElement.h:
+ * DumpRenderTree/DumpRenderTree.h:
+ * DumpRenderTree/cg/PixelDumpSupportCG.cpp:
+ (computeMD5HashStringForBitmapContext):
+ * DumpRenderTree/cg/PixelDumpSupportCG.h:
+ (BitmapContext::~BitmapContext):
+ * DumpRenderTree/config.h:
+
</ins><span class="cx"> 2014-02-17 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> More ARM FTL glue
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityController.h (164269 => 164270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityController.h 2014-02-18 04:20:13 UTC (rev 164269)
+++ trunk/Tools/DumpRenderTree/AccessibilityController.h 2014-02-18 04:59:47 UTC (rev 164270)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> HashMap<PlatformUIElement, JSObjectRef> m_notificationListeners;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<NotificationHandler> m_globalNotificationHandler;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityTextMarkerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityTextMarker.h (164269 => 164270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityTextMarker.h 2014-02-18 04:20:13 UTC (rev 164269)
+++ trunk/Tools/DumpRenderTree/AccessibilityTextMarker.h 2014-02-18 04:59:47 UTC (rev 164270)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #define SUPPORTS_AX_TEXTMARKERS 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> typedef CFTypeRef PlatformTextMarker;
</span><span class="cx"> typedef CFTypeRef PlatformTextMarkerRange;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityUIElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp (164269 => 164270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2014-02-18 04:20:13 UTC (rev 164269)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2014-02-18 04:59:47 UTC (rev 164270)
</span><span class="lines">@@ -1303,7 +1303,7 @@
</span><span class="cx"> JSStringRef AccessibilityUIElement::pathDescription() const { return 0; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> void AccessibilityUIElement::uiElementArrayAttributeValue(JSStringRef, Vector<AccessibilityUIElement>&) const { }
</span><span class="cx"> void AccessibilityUIElement::columnHeaders(Vector<AccessibilityUIElement>&) const { }
</span><span class="cx"> void AccessibilityUIElement::rowHeaders(Vector<AccessibilityUIElement>&) const { }
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityUIElementh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.h (164269 => 164270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2014-02-18 04:20:13 UTC (rev 164269)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2014-02-18 04:59:47 UTC (rev 164270)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include <wtf/Platform.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #ifdef __OBJC__
</span><span class="cx"> typedef id PlatformUIElement;
</span><span class="cx"> #else
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> typedef void* PlatformUIElement;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #ifdef __OBJC__
</span><span class="cx"> typedef id NotificationHandler;
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.h (164269 => 164270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.h 2014-02-18 04:20:13 UTC (rev 164269)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.h 2014-02-18 04:59:47 UTC (rev 164270)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include <wtf/Platform.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "DumpRenderTreeMac.h"
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> #include "DumpRenderTreeWin.h"
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreecgPixelDumpSupportCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp (164269 => 164270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp 2014-02-18 04:20:13 UTC (rev 164269)
+++ trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp 2014-02-18 04:59:47 UTC (rev 164270)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> MD5_CTX md5Context;
</span><span class="cx"> MD5_Init(&md5Context);
</span><span class="cx"> unsigned char* bitmapData = static_cast<unsigned char*>(CGBitmapContextGetData(bitmapContext));
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if ((CGBitmapContextGetBitmapInfo(bitmapContext) & kCGBitmapByteOrderMask) == kCGBitmapByteOrder32Big) {
</span><span class="cx"> for (unsigned row = 0; row < pixelsHigh; row++) {
</span><span class="cx"> uint32_t buffer[pixelsWide];
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreecgPixelDumpSupportCGh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.h (164269 => 164270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.h 2014-02-18 04:20:13 UTC (rev 164269)
+++ trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.h 2014-02-18 04:59:47 UTC (rev 164270)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> typedef struct CGContext* CGContextRef;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> typedef void* PlatformBitmapBuffer;
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> typedef HBITMAP PlatformBitmapBuffer;
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> ~BitmapContext()
</span><span class="cx"> {
</span><span class="cx"> if (m_buffer)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> free(m_buffer);
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> DeleteObject(m_buffer);
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/config.h (164269 => 164270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/config.h 2014-02-18 04:20:13 UTC (rev 164269)
+++ trunk/Tools/DumpRenderTree/config.h 2014-02-18 04:59:47 UTC (rev 164270)
</span><span class="lines">@@ -38,9 +38,9 @@
</span><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #define WTF_USE_CF 1
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> #define WTF_USE_CF 1
</span></span></pre>
</div>
</div>
</body>
</html>