Title: [148584] trunk
Revision
148584
Author
wei...@apple.com
Date
2013-04-16 17:30:25 -0700 (Tue, 16 Apr 2013)

Log Message

Fix fallout after r148545.

Source/WebCore: 

* platform/text/TextChecking.h:
Move Platform defines that were incorrectly in WebCore, into Platform.h

Source/WTF: 

* wtf/Platform.h:
Move Platform defines that were incorrectly in WebCore, into Platform.h

Tools: 

* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetStateToConsistentValues):
Remove calls to non-existent API functions.

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (148583 => 148584)


--- trunk/Source/WTF/ChangeLog	2013-04-17 00:21:19 UTC (rev 148583)
+++ trunk/Source/WTF/ChangeLog	2013-04-17 00:30:25 UTC (rev 148584)
@@ -1,3 +1,10 @@
+2013-04-16  Sam Weinig  <s...@webkit.org>
+
+        Fix fallout after r148545.
+
+        * wtf/Platform.h:
+        Move Platform defines that were incorrectly in WebCore, into Platform.h
+
 2013-04-15  Commit Queue  <rn...@webkit.org>
 
         Unreviewed, rolling out r148488.

Modified: trunk/Source/WTF/wtf/Platform.h (148583 => 148584)


--- trunk/Source/WTF/wtf/Platform.h	2013-04-17 00:21:19 UTC (rev 148583)
+++ trunk/Source/WTF/wtf/Platform.h	2013-04-17 00:30:25 UTC (rev 148584)
@@ -1016,4 +1016,22 @@
 #define WTF_USE_CONTENT_FILTERING 1
 #endif
 
+
+#define WTF_USE_GRAMMAR_CHECKING 1
+
+#if PLATFORM(MAC) || PLATFORM(BLACKBERRY) || PLATFORM(EFL)
+#define WTF_USE_UNIFIED_TEXT_CHECKING 1
+#endif
+#if PLATFORM(MAC)
+#define WTF_USE_AUTOMATIC_TEXT_REPLACEMENT 1
+#endif
+
+#if PLATFORM(MAC) && (PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
+// Some platforms provide UI for suggesting autocorrection.
+#define WTF_USE_AUTOCORRECTION_PANEL 1
+// Some platforms use spelling and autocorrection markers to provide visual cue.
+// On such platform, if word with marker is edited, we need to remove the marker.
+#define WTF_USE_MARKER_REMOVAL_UPON_EDITING 1
+#endif // #if PLATFORM(MAC) && (PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
+
 #endif /* WTF_Platform_h */

Modified: trunk/Source/WebCore/ChangeLog (148583 => 148584)


--- trunk/Source/WebCore/ChangeLog	2013-04-17 00:21:19 UTC (rev 148583)
+++ trunk/Source/WebCore/ChangeLog	2013-04-17 00:30:25 UTC (rev 148584)
@@ -1,3 +1,10 @@
+2013-04-16  Sam Weinig  <s...@webkit.org>
+
+        Fix fallout after r148545.
+
+        * platform/text/TextChecking.h:
+        Move Platform defines that were incorrectly in WebCore, into Platform.h
+
 2013-04-16  Hans Muller  <hmul...@adobe.com>
 
         [CSS Exclusions] polygon shape-inside layout fails

Modified: trunk/Source/WebCore/platform/text/TextChecking.h (148583 => 148584)


--- trunk/Source/WebCore/platform/text/TextChecking.h	2013-04-17 00:21:19 UTC (rev 148583)
+++ trunk/Source/WebCore/platform/text/TextChecking.h	2013-04-17 00:30:25 UTC (rev 148584)
@@ -37,23 +37,6 @@
 
 namespace WebCore {
 
-#define WTF_USE_GRAMMAR_CHECKING 1
-
-#if PLATFORM(MAC) || PLATFORM(BLACKBERRY) || PLATFORM(EFL)
-#define WTF_USE_UNIFIED_TEXT_CHECKING 1
-#endif
-#if PLATFORM(MAC)
-#define WTF_USE_AUTOMATIC_TEXT_REPLACEMENT 1
-#endif
-
-#if PLATFORM(MAC) && (PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
-// Some platforms provide UI for suggesting autocorrection.
-#define WTF_USE_AUTOCORRECTION_PANEL 1
-// Some platforms use spelling and autocorrection markers to provide visual cue.
-// On such platform, if word with marker is edited, we need to remove the marker.
-#define WTF_USE_MARKER_REMOVAL_UPON_EDITING 1
-#endif // #if PLATFORM(MAC) && (PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
-
 enum TextCheckingType {
     TextCheckingTypeNone        = 0,
     TextCheckingTypeSpelling    = 1 << 1,

Modified: trunk/Tools/ChangeLog (148583 => 148584)


--- trunk/Tools/ChangeLog	2013-04-17 00:21:19 UTC (rev 148583)
+++ trunk/Tools/ChangeLog	2013-04-17 00:30:25 UTC (rev 148584)
@@ -1,3 +1,11 @@
+2013-04-16  Sam Weinig  <s...@webkit.org>
+
+        Fix fallout after r148545.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::resetStateToConsistentValues):
+        Remove calls to non-existent API functions.
+
 2013-04-13  Roger Fong  <roger_f...@apple.com>
 
         Unreviewed. Disable WinEWS tests, simply not enough bots.

Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (148583 => 148584)


--- trunk/Tools/WebKitTestRunner/TestController.cpp	2013-04-17 00:21:19 UTC (rev 148583)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp	2013-04-17 00:30:25 UTC (rev 148584)
@@ -577,13 +577,6 @@
 #if !PLATFORM(MAC)
     WKTextCheckerContinuousSpellCheckingEnabledStateChanged(true);
 #endif
-#if USE(AUTOMATIC_TEXT_REPLACEMENT)
-    WKTextCheckerAutomaticQuoteSubstitutionEnabledStateChanged(false);
-    WKTextCheckerAutomaticLinkDetectionEnabledStateChanged(false);
-    WKTextCheckerAutomaticDashSubstitutionEnabledStateChanged(false);
-    WKTextCheckerAutomaticTextReplacementEnabledStateChanged(false);
-    WKTextCheckerAutomaticSpellingCorrectionEnabledStateChanged(true);
-#endif
 
     // in the case that a test using the chrome input field failed, be sure to clean up for the next test
     m_mainWebView->removeChromeInputField();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to