Title: [208656] trunk/Source/WebCore
Revision
208656
Author
[email protected]
Date
2016-11-12 13:34:42 -0800 (Sat, 12 Nov 2016)

Log Message

Clean up a couple of macOS *SPI headers
https://bugs.webkit.org/show_bug.cgi?id=164687

Reviewed by Sam Weinig.

* platform/spi/cocoa/NSTouchBarSPI.h: Replaced hardcoded strings with global declarations.
* platform/spi/mac/NSSpellCheckerSPI.h: Addressed FIXME by importing private header, and removed declarations
  that already appear in the SDK.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (208655 => 208656)


--- trunk/Source/WebCore/ChangeLog	2016-11-12 20:50:26 UTC (rev 208655)
+++ trunk/Source/WebCore/ChangeLog	2016-11-12 21:34:42 UTC (rev 208656)
@@ -1,3 +1,14 @@
+2016-11-12  Dan Bernstein  <[email protected]>
+
+        Clean up a couple of macOS *SPI headers
+        https://bugs.webkit.org/show_bug.cgi?id=164687
+
+        Reviewed by Sam Weinig.
+
+        * platform/spi/cocoa/NSTouchBarSPI.h: Replaced hardcoded strings with global declarations.
+        * platform/spi/mac/NSSpellCheckerSPI.h: Addressed FIXME by importing private header, and removed declarations
+          that already appear in the SDK.
+
 2016-11-12  Wenson Hsieh  <[email protected]>
 
         The main content heuristic should be robust when handling large media elements

Modified: trunk/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h (208655 => 208656)


--- trunk/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h	2016-11-12 20:50:26 UTC (rev 208655)
+++ trunk/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h	2016-11-12 21:34:42 UTC (rev 208656)
@@ -51,8 +51,8 @@
 
 @end
 
-#define NSTouchBarWillEnterCustomization @"NSTouchBarWillEnterCustomization"
-#define NSTouchBarDidExitCustomization @"NSTouchBarDidExitCustomization"
+APPKIT_EXTERN NSNotificationName const NSTouchBarWillEnterCustomization;
+APPKIT_EXTERN NSNotificationName const NSTouchBarDidExitCustomization;
 
 NS_ASSUME_NONNULL_END
 

Modified: trunk/Source/WebCore/platform/spi/mac/NSSpellCheckerSPI.h (208655 => 208656)


--- trunk/Source/WebCore/platform/spi/mac/NSSpellCheckerSPI.h	2016-11-12 20:50:26 UTC (rev 208655)
+++ trunk/Source/WebCore/platform/spi/mac/NSSpellCheckerSPI.h	2016-11-12 21:34:42 UTC (rev 208656)
@@ -22,22 +22,21 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
-#ifndef NSSpellCheckerSPI_h
-#define NSSpellCheckerSPI_h
 
 #if HAVE(ADVANCED_SPELL_CHECKING)
 
-// FIXME: This header should include system headers when possible.
+#if USE(APPLE_INTERNAL_SDK)
 
+#import <AppKit/NSTextChecker.h>
+
+#else
+
 extern NSString *NSTextCheckingInsertionPointKey;
-extern NSNotificationName const NSSpellCheckerDidChangeAutomaticTextCompletionNotification;
 
 @interface NSSpellChecker ()
-- (NSInteger)requestCandidatesForSelectedRange:(NSRange)selectedRange inString:(NSString *)stringToCheck types:(NSTextCheckingTypes)checkingTypes options:(NSDictionary<NSString *, id> *)options inSpellDocumentWithTag:(NSInteger)tag completionHandler:(void (^)(NSInteger sequenceNumber, NSArray<NSTextCheckingResult *> *candidates))completionHandler;
 - (BOOL)deletesAutospaceBeforeString:(NSString *)string language:(NSString *)language;
-+ (BOOL)isAutomaticTextCompletionEnabled;
 @end
 
+#endif
+
 #endif // HAVE(ADVANCED_SPELL_CHECKING)
-
-#endif // NSSpellCheckerSPI_h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to