Diff
Modified: trunk/Tools/ChangeLog (164294 => 164295)
--- trunk/Tools/ChangeLog 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/ChangeLog 2014-02-18 17:36:07 UTC (rev 164295)
@@ -1,3 +1,43 @@
+2014-02-18 Dan Bernstein <m...@apple.com>
+
+ Stop using PLATFORM(MAC) except where it means “OS X but not iOS”
+ https://bugs.webkit.org/show_bug.cgi?id=128952
+
+ Reviewed by Anders Carlsson.
+
+ * TestWebKitAPI/_javascript_Test.h: Changed PLATFORM(MAC) to PLATFORM(COCOA) and changed to
+ use OBJC_CLASS.
+ * TestWebKitAPI/PlatformUtilities.h: Changed PLATFORM(MAC) to USE(FOUNDATION) and changed
+ to use OBJC_CLASS.
+ * TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp: Changed PLATFORM(MAC) to
+ PLATFORM(COCOA).
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:
+ (TestWebKitAPI::TEST): Added expected default font-family values for iOS.
+ * TestWebKitAPI/config.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ * WebKitTestRunner/EventSenderProxy.h: Ditto.
+ * WebKitTestRunner/InjectedBundle/AccessibilityController.cpp: Ditto.
+ * WebKitTestRunner/InjectedBundle/AccessibilityController.h: Ditto.
+ * WebKitTestRunner/InjectedBundle/AccessibilityTextMarker.cpp: Ditto.
+ (WTR::AccessibilityTextMarker::platformTextMarker):
+ * WebKitTestRunner/InjectedBundle/AccessibilityTextMarker.h: Ditto.
+ * WebKitTestRunner/InjectedBundle/AccessibilityTextMarkerRange.cpp: Ditto.
+ (WTR::AccessibilityTextMarkerRange::platformTextMarkerRange):
+ * WebKitTestRunner/InjectedBundle/AccessibilityTextMarkerRange.h: Ditto.
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp: Ditto.
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h: Ditto.
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp: Ditto.
+ * WebKitTestRunner/InjectedBundle/TestRunner.h: Ditto.
+ * WebKitTestRunner/PlatformWebView.h: Ditto.
+ * WebKitTestRunner/TestController.cpp: Ditto.
+ (WTR::TestController::resetStateToConsistentValues):
+ (WTR::TestController::processDidCrash):
+ * WebKitTestRunner/TestInvocation.cpp: Ditto.
+ (WTR::updateThreadedScrollingForCurrentTest):
+ (WTR::TestInvocation::dumpWebProcessUnresponsiveness):
+ * WebKitTestRunner/cg/TestInvocationCG.cpp: Ditto.
+ (WTR::computeMD5HashStringForContext):
+
2014-02-17 Dan Bernstein <m...@apple.com>
Stop using PLATFORM(MAC) in DumpRenderTree except where it means “OS X but not iOS”
Modified: trunk/Tools/TestWebKitAPI/_javascript_Test.h (164294 => 164295)
--- trunk/Tools/TestWebKitAPI/_javascript_Test.h 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/TestWebKitAPI/_javascript_Test.h 2014-02-18 17:36:07 UTC (rev 164295)
@@ -23,15 +23,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if PLATFORM(MAC)
-#ifdef __OBJC__
-@class WKView;
-@class WebView;
-#else
-class WKView;
-class WebView;
+#if PLATFORM(COCOA)
+OBJC_CLASS WKView;
+OBJC_CLASS WebView;
#endif
-#endif
namespace TestWebKitAPI {
@@ -44,7 +39,7 @@
::testing::AssertionResult runJSTest(const char* pageExpr, const char* scriptExpr, const char* expectedResultExpr, WKPageRef, const char* script, const char* expectedResult);
::testing::AssertionResult compareJSResult(const char* script, const char* actualResult, const char* expectedResult);
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
::testing::AssertionResult runJSTest(const char* webViewExpr, const char* scriptExpr, const char* expectedResultExpr, WebView *, const char* script, const char* expectedResult);
::testing::AssertionResult runJSTest(const char* viewExpr, const char* scriptExpr, const char* expectedResultExpr, WKView *, const char* script, const char* expectedResult);
#endif
Modified: trunk/Tools/TestWebKitAPI/PlatformUtilities.h (164294 => 164295)
--- trunk/Tools/TestWebKitAPI/PlatformUtilities.h 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/TestWebKitAPI/PlatformUtilities.h 2014-02-18 17:36:07 UTC (rev 164295)
@@ -29,13 +29,9 @@
#include <WebKit2/WKRetainPtr.h>
#include <string>
-#if PLATFORM(MAC)
-#if __OBJC__
-@class NSString;
-#else
-class NSString;
+#if USE(FOUNDATION)
+OBJC_CLASS NSString;
#endif
-#endif
namespace TestWebKitAPI {
namespace Util {
@@ -63,7 +59,7 @@
std::string toSTD(WKStringRef);
std::string toSTD(WKRetainPtr<WKStringRef>);
std::string toSTD(const char*);
-#if PLATFORM(MAC)
+#if USE(FOUNDATION)
std::string toSTD(NSString *);
#endif
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp (164294 => 164295)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp 2014-02-18 17:36:07 UTC (rev 164295)
@@ -89,7 +89,7 @@
// On Mac, a key down event represents both a raw key down and a key press. On Windows, a key
// down event only represents a raw key down. We expect the key press to be handled (because it
// inserts text into the text field). But the raw key down should not be handled.
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
EXPECT_FALSE(didNotHandleKeyDownEvent);
#elif PLATFORM(WIN)
EXPECT_TRUE(didNotHandleKeyDownEvent);
@@ -107,7 +107,7 @@
#endif
EXPECT_JS_TRUE(webView.page(), "textFieldContainsSpace()");
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
EXPECT_FALSE(didNotHandleKeyDownEvent);
#elif PLATFORM(WIN)
EXPECT_TRUE(didNotHandleKeyDownEvent);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp (164294 => 164295)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp 2014-02-18 17:36:07 UTC (rev 164295)
@@ -57,6 +57,14 @@
static const char* expectedCursiveFontFamily = "Apple Chancery";
static const char* expectedFantasyFontFamily = "Papyrus";
static const char* expectedPictographFontFamily = "Apple Color Emoji";
+#elif PLATFORM(IOS)
+ static const char* expectedStandardFontFamily = "Times";
+ static const char* expectedFixedFontFamily = "Courier";
+ static const char* expectedSerifFontFamily = "Times";
+ static const char* expectedSansSerifFontFamily = "Helvetica";
+ static const char* expectedCursiveFontFamily = "Snell Roundhand";
+ static const char* expectedFantasyFontFamily = "Papyrus";
+ static const char* expectedPictographFontFamily = "AppleColorEmoji";
#elif PLATFORM(GTK) || PLATFORM(EFL)
static const char* expectedStandardFontFamily = "Times";
static const char* expectedFixedFontFamily = "Courier New";
Modified: trunk/Tools/TestWebKitAPI/config.h (164294 => 164295)
--- trunk/Tools/TestWebKitAPI/config.h 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/TestWebKitAPI/config.h 2014-02-18 17:36:07 UTC (rev 164295)
@@ -87,6 +87,6 @@
#pragma clang diagnostic pop
#endif
-#if PLATFORM(MAC) && defined(__OBJC__)
+#if PLATFORM(COCOA) && defined(__OBJC__)
#import <WebKit/WebKit.h>
#endif
Modified: trunk/Tools/WebKitTestRunner/EventSenderProxy.h (164294 => 164295)
--- trunk/Tools/WebKitTestRunner/EventSenderProxy.h 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/WebKitTestRunner/EventSenderProxy.h 2014-02-18 17:36:07 UTC (rev 164295)
@@ -112,7 +112,7 @@
double m_clickTime;
WKPoint m_clickPosition;
WKEventMouseButton m_clickButton;
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
int eventNumber;
#elif PLATFORM(GTK)
Deque<WTREventQueueItem> m_eventQueue;
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp (164294 => 164295)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp 2014-02-18 17:36:07 UTC (rev 164295)
@@ -87,7 +87,7 @@
// Unsupported methods on various platforms.
// As they're implemented on other platforms this list should be modified.
-#if (!PLATFORM(GTK) && !PLATFORM(MAC) && !PLATFORM(EFL)) || !HAVE(ACCESSIBILITY)
+#if (!PLATFORM(GTK) && !PLATFORM(COCOA) && !PLATFORM(EFL)) || !HAVE(ACCESSIBILITY)
bool AccessibilityController::addNotificationListener(JSValueRef) { return false; }
bool AccessibilityController::removeNotificationListener() { return false; }
PassRefPtr<AccessibilityUIElement> AccessibilityController::accessibleElementById(JSStringRef attribute) { return nullptr; }
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h (164294 => 164295)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h 2014-02-18 17:36:07 UTC (rev 164295)
@@ -66,7 +66,7 @@
private:
AccessibilityController();
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
RetainPtr<NotificationHandler> m_globalNotificationHandler;
#endif
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarker.cpp (164294 => 164295)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarker.cpp 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarker.cpp 2014-02-18 17:36:07 UTC (rev 164295)
@@ -60,7 +60,7 @@
PlatformTextMarker AccessibilityTextMarker::platformTextMarker() const
{
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
return m_textMarker.get();
#else
return m_textMarker;
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarker.h (164294 => 164295)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarker.h 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarker.h 2014-02-18 17:36:07 UTC (rev 164295)
@@ -31,7 +31,7 @@
#include <wtf/PassRefPtr.h>
#include <wtf/Platform.h>
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
#include <wtf/RetainPtr.h>
typedef CFTypeRef PlatformTextMarker;
#else
@@ -59,14 +59,14 @@
AccessibilityTextMarker(PlatformTextMarker);
AccessibilityTextMarker(const AccessibilityTextMarker&);
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
RetainPtr<PlatformTextMarker> m_textMarker;
#else
PlatformTextMarker m_textMarker;
#endif
};
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
inline bool AccessibilityTextMarker::isEqual(AccessibilityTextMarker*) { return false; }
#endif
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarkerRange.cpp (164294 => 164295)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarkerRange.cpp 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarkerRange.cpp 2014-02-18 17:36:07 UTC (rev 164295)
@@ -60,7 +60,7 @@
PlatformTextMarkerRange AccessibilityTextMarkerRange::platformTextMarkerRange() const
{
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
return m_textMarkerRange.get();
#else
return m_textMarkerRange;
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarkerRange.h (164294 => 164295)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarkerRange.h 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarkerRange.h 2014-02-18 17:36:07 UTC (rev 164295)
@@ -31,7 +31,7 @@
#include <wtf/PassRefPtr.h>
#include <wtf/Platform.h>
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
#include <wtf/RetainPtr.h>
typedef CFTypeRef PlatformTextMarkerRange;
#else
@@ -57,14 +57,14 @@
AccessibilityTextMarkerRange(PlatformTextMarkerRange);
AccessibilityTextMarkerRange(const AccessibilityTextMarkerRange&);
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
RetainPtr<PlatformTextMarkerRange> m_textMarkerRange;
#else
PlatformTextMarkerRange m_textMarkerRange;
#endif
};
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
inline bool AccessibilityTextMarkerRange::isEqual(AccessibilityTextMarkerRange*) { return false; }
#endif
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp (164294 => 164295)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2014-02-18 17:36:07 UTC (rev 164295)
@@ -61,7 +61,7 @@
JSRetainPtr<JSStringRef> AccessibilityUIElement::sentenceAtOffset(int) { return 0; }
#endif
-#if (!PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)) || !HAVE(ACCESSIBILITY)
+#if (!PLATFORM(COCOA) && !PLATFORM(GTK) && !PLATFORM(EFL)) || !HAVE(ACCESSIBILITY)
AccessibilityUIElement::AccessibilityUIElement(PlatformUIElement) { }
AccessibilityUIElement::AccessibilityUIElement(const AccessibilityUIElement&) { }
AccessibilityUIElement::~AccessibilityUIElement() { }
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h (164294 => 164295)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2014-02-18 17:36:07 UTC (rev 164295)
@@ -35,7 +35,7 @@
#include <wtf/Platform.h>
#include <wtf/Vector.h>
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
#ifdef __OBJC__
typedef id PlatformUIElement;
#else
@@ -50,7 +50,7 @@
typedef void* PlatformUIElement;
#endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
#ifdef __OBJC__
typedef id NotificationHandler;
#else
@@ -264,7 +264,7 @@
// A retained, platform specific object used to help manage notifications for this object.
#if HAVE(ACCESSIBILITY)
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
NotificationHandler m_notificationHandler;
void getLinkedUIElements(Vector<RefPtr<AccessibilityUIElement> >&);
@@ -273,7 +273,7 @@
void getUIElementsWithAttribute(JSStringRef, Vector<RefPtr<AccessibilityUIElement> >&) const;
#endif
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(EFL)
void getChildren(Vector<RefPtr<AccessibilityUIElement> >&);
void getChildrenWithRange(Vector<RefPtr<AccessibilityUIElement> >&, unsigned location, unsigned length);
#endif
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (164294 => 164295)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2014-02-18 17:36:07 UTC (rev 164295)
@@ -1862,7 +1862,7 @@
stringBuilder.appendLiteral("===============================================\n");
}
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
void InjectedBundlePage::platformDidStartProvisionalLoadForFrame(WKBundleFrameRef)
{
}
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (164294 => 164295)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2014-02-18 17:36:07 UTC (rev 164295)
@@ -33,7 +33,7 @@
#include <string>
#include <wtf/PassRefPtr.h>
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
#include <wtf/RetainPtr.h>
#include <CoreFoundation/CFRunLoop.h>
typedef RetainPtr<CFRunLoopTimerRef> PlatformTimerRef;
Modified: trunk/Tools/WebKitTestRunner/PlatformWebView.h (164294 => 164295)
--- trunk/Tools/WebKitTestRunner/PlatformWebView.h 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/WebKitTestRunner/PlatformWebView.h 2014-02-18 17:36:07 UTC (rev 164295)
@@ -80,7 +80,7 @@
void setWindowIsKey(bool isKey) { m_windowIsKey = isKey; }
bool windowIsKey() const { return m_windowIsKey; }
-#if PLATFORM(MAC) || PLATFORM(EFL)
+#if PLATFORM(COCOA) || PLATFORM(EFL)
bool viewSupportsOptions(WKDictionaryRef) const;
#else
bool viewSupportsOptions(WKDictionaryRef) const { return true; }
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (164294 => 164295)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2014-02-18 17:36:07 UTC (rev 164295)
@@ -52,11 +52,11 @@
#include <wtf/PassOwnPtr.h>
#include <wtf/text/CString.h>
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
#include <WebKit2/WKPagePrivateMac.h>
#endif
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
#include <WebKit2/WKTextChecker.h>
#endif
@@ -587,7 +587,7 @@
// some other code doing this, it should probably be responsible for cleanup too.
resetPreferencesToConsistentValues();
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
WKTextCheckerContinuousSpellCheckingEnabledStateChanged(true);
#endif
@@ -1171,7 +1171,7 @@
// This function can be called multiple times when crash logs are being saved on Windows, so
// ensure we only print the crashed message once.
if (!m_didPrintWebProcessCrashedMessage) {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
pid_t pid = WKPageGetProcessIdentifier(m_mainWebView->page());
fprintf(stderr, "#CRASHED - WebProcess (pid %ld)\n", static_cast<long>(pid));
#else
Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (164294 => 164295)
--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2014-02-18 17:36:07 UTC (rev 164295)
@@ -41,10 +41,11 @@
#include <wtf/StdLibExtras.h>
#include <wtf/text/CString.h>
-#if PLATFORM(MAC)
-#if !PLATFORM(IOS)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
#include <Carbon/Carbon.h>
#endif
+
+#if PLATFORM(COCOA)
#include <WebKit2/WKPagePrivateMac.h>
#endif
@@ -138,7 +139,7 @@
}
#endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
static bool shouldUseThreadedScrolling(const char* pathOrURL)
{
return strstr(pathOrURL, "tiled-drawing/") || strstr(pathOrURL, "tiled-drawing\\");
@@ -147,7 +148,7 @@
static void updateThreadedScrollingForCurrentTest(const char* pathOrURL)
{
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
WKRetainPtr<WKMutableDictionaryRef> viewOptions = adoptWK(WKMutableDictionaryCreate());
WKRetainPtr<WKStringRef> useThreadedScrollingKey = adoptWK(WKStringCreateWithUTF8CString("ThreadedScrolling"));
WKRetainPtr<WKBooleanRef> useThreadedScrollingValue = adoptWK(WKBooleanCreate(shouldUseThreadedScrolling(pathOrURL)));
@@ -274,7 +275,7 @@
void TestInvocation::dumpWebProcessUnresponsiveness(const char* errorMessage)
{
const char* errorMessageToStderr = 0;
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
char buffer[64];
pid_t pid = WKPageGetProcessIdentifier(TestController::shared().mainWebView()->page());
sprintf(buffer, "#PROCESS UNRESPONSIVE - WebProcess (pid %ld)\n", static_cast<long>(pid));
Modified: trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp (164294 => 164295)
--- trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp 2014-02-18 17:10:37 UTC (rev 164294)
+++ trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp 2014-02-18 17:36:07 UTC (rev 164295)
@@ -86,7 +86,7 @@
// We need to swap the bytes to ensure consistent hashes independently of endianness
MD5 md5;
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++) {
Vector<uint8_t> buffer(4 * pixelsWide);
