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