Remove a couple of PLATFORM defines intended for watchOS
authorwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 27 Jan 2019 23:51:29 +0000 (23:51 +0000)
committerwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 27 Jan 2019 23:51:29 +0000 (23:51 +0000)
https://bugs.webkit.org/show_bug.cgi?id=193888

Reviewed by Alexey Proskuryakov.

Remove the use of !PLATFORM(WATCH), since this is true on every platform.

* editing/cocoa/DictionaryLookup.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240556 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/editing/cocoa/DictionaryLookup.mm

index dde1905..d01af33 100644 (file)
@@ -1,3 +1,14 @@
+2019-01-27  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Remove a couple of PLATFORM defines intended for watchOS
+        https://bugs.webkit.org/show_bug.cgi?id=193888
+
+        Reviewed by Alexey Proskuryakov.
+
+        Remove the use of !PLATFORM(WATCH), since this is true on every platform.
+
+        * editing/cocoa/DictionaryLookup.mm:
+
 2019-01-27  Jiewen Tan  <jiewen_tan@apple.com>
 
         Use a load optimizer for some sites
index ea28959..a010b83 100644 (file)
@@ -55,7 +55,7 @@
 
 #if PLATFORM(MAC)
 #import <Quartz/Quartz.h>
-#elif !PLATFORM(WATCH)
+#else
 #import <PDFKit/PDFKit.h>
 #endif
 
@@ -372,8 +372,6 @@ std::tuple<RefPtr<Range>, NSDictionary *> DictionaryLookup::rangeAtHitTestResult
     return { nullptr, nil };
     
 }
-    
-#if !PLATFORM(WATCH)
 
 static void expandSelectionByCharacters(PDFSelection *selection, NSInteger numberOfCharactersToExpand, NSInteger& charactersAddedBeforeStart, NSInteger& charactersAddedAfterEnd)
 {
@@ -431,8 +429,6 @@ std::tuple<NSString *, NSDictionary *> DictionaryLookup::stringForPDFSelection(P
 
     return { @"", nil };
 }
-    
-#endif // !PLATFORM(WATCH)
 
 static WKRevealController showPopupOrCreateAnimationController(bool createAnimationController, const DictionaryPopupInfo& dictionaryPopupInfo, RevealView *view, const WTF::Function<void(TextIndicator&)>& textIndicatorInstallationCallback, const WTF::Function<FloatRect(FloatRect)>& rootViewToViewConversionCallback, WTF::Function<void()>&& clearTextIndicator)
 {