Diff
Modified: trunk/Tools/ChangeLog (164269 => 164270)
--- trunk/Tools/ChangeLog 2014-02-18 04:20:13 UTC (rev 164269)
+++ trunk/Tools/ChangeLog 2014-02-18 04:59:47 UTC (rev 164270)
@@ -1,3 +1,23 @@
+2014-02-17 Dan Bernstein <m...@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:
+
2014-02-17 Filip Pizlo <fpi...@apple.com>
More ARM FTL glue
Modified: trunk/Tools/DumpRenderTree/AccessibilityController.h (164269 => 164270)
--- 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)
@@ -89,7 +89,7 @@
HashMap<PlatformUIElement, JSObjectRef> m_notificationListeners;
#endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
RetainPtr<NotificationHandler> m_globalNotificationHandler;
#endif
Modified: trunk/Tools/DumpRenderTree/AccessibilityTextMarker.h (164269 => 164270)
--- 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)
@@ -34,7 +34,7 @@
#define SUPPORTS_AX_TEXTMARKERS 0
#endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
#include <wtf/RetainPtr.h>
typedef CFTypeRef PlatformTextMarker;
typedef CFTypeRef PlatformTextMarkerRange;
Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp (164269 => 164270)
--- 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)
@@ -1303,7 +1303,7 @@
JSStringRef AccessibilityUIElement::pathDescription() const { return 0; }
#endif
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
void AccessibilityUIElement::uiElementArrayAttributeValue(JSStringRef, Vector<AccessibilityUIElement>&) const { }
void AccessibilityUIElement::columnHeaders(Vector<AccessibilityUIElement>&) const { }
void AccessibilityUIElement::rowHeaders(Vector<AccessibilityUIElement>&) const { }
Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.h (164269 => 164270)
--- 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)
@@ -31,7 +31,7 @@
#include <wtf/Platform.h>
#include <wtf/Vector.h>
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
#ifdef __OBJC__
typedef id PlatformUIElement;
#else
@@ -53,7 +53,7 @@
typedef void* PlatformUIElement;
#endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
#ifdef __OBJC__
typedef id NotificationHandler;
#else
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.h (164269 => 164270)
--- 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)
@@ -34,7 +34,7 @@
#include <wtf/Platform.h>
#endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
#include "DumpRenderTreeMac.h"
#elif PLATFORM(WIN)
#include "DumpRenderTreeWin.h"
Modified: trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp (164269 => 164270)
--- 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)
@@ -85,7 +85,7 @@
MD5_CTX md5Context;
MD5_Init(&md5Context);
unsigned char* bitmapData = static_cast<unsigned char*>(CGBitmapContextGetData(bitmapContext));
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
if ((CGBitmapContextGetBitmapInfo(bitmapContext) & kCGBitmapByteOrderMask) == kCGBitmapByteOrder32Big) {
for (unsigned row = 0; row < pixelsHigh; row++) {
uint32_t buffer[pixelsWide];
Modified: trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.h (164269 => 164270)
--- 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)
@@ -41,7 +41,7 @@
typedef struct CGContext* CGContextRef;
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
typedef void* PlatformBitmapBuffer;
#elif PLATFORM(WIN)
typedef HBITMAP PlatformBitmapBuffer;
@@ -57,7 +57,7 @@
~BitmapContext()
{
if (m_buffer)
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
free(m_buffer);
#elif PLATFORM(WIN)
DeleteObject(m_buffer);
Modified: trunk/Tools/DumpRenderTree/config.h (164269 => 164270)
--- 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)
@@ -38,9 +38,9 @@
#include <wtf/FastMalloc.h>
#endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
#define WTF_USE_CF 1
-#endif // PLATFORM(MAC)
+#endif
#if PLATFORM(WIN)
#define WTF_USE_CF 1
