Attachment 360307 Details for Bug 193888 – Patch

[patch] Patch

bug-193888-20190127125003.patch (text/plain), 2.10 KB, created by Wenson Hsieh on 2019-01-27 12:50:03 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2019-01-27 12:50:03 PST

Size: 2.10 KB

patch

obsolete

>Subversion Revision: 240539
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index fcf31f21a069f2bd4973813d8ae1853d7f589b45..ee36813973ff5c181cbc1ebcd7d39d235345d50f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-01-27  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Fix a few PLATFORM defines intended for watchOS and Apple TV
>+        https://bugs.webkit.org/show_bug.cgi?id=193888
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove the use of !PLATFORM(WATCH), since this is true on every platform.
>+
>+        * editing/cocoa/DictionaryLookup.mm:
>+
> 2019-01-25  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Document::updateMainArticleElementAfterLayout() should be a no-op when no client depends on knowing the main article element
>diff --git a/Source/WebCore/editing/cocoa/DictionaryLookup.mm b/Source/WebCore/editing/cocoa/DictionaryLookup.mm
>index ea28959f320c475d49cb73d8771ca084eb0bfd60..a010b8399ac916433aa87d3f80fc6c28e9c20780 100644
>--- a/Source/WebCore/editing/cocoa/DictionaryLookup.mm
>+++ b/Source/WebCore/editing/cocoa/DictionaryLookup.mm
>@@ -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)
> {

Actions: View | Formatted Diff | Diff

Attachments on bug 193888: 360307 | 360308