Attachment 340153 Details for Bug 185538 – Patch

[patch] Patch

bug-185538-20180510175135.patch (text/plain), 1.85 KB, created by Tim Horton on 2018-05-10 17:51:36 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2018-05-10 17:51:36 PDT

Size: 1.85 KB

patch

obsolete

>Subversion Revision: 231574
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d75521a06ec5c3a560d9eb72c8d8539fbd50411f..f6e3bd7aca2c506fe9ef90fb8d244f9c7686988c 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-05-10  Tim Horton  <timothy_horton@apple.com>
>+
>+        Lookup sometimes shows a second yellow highlight on top of WebKit's TextIndicator
>+        https://bugs.webkit.org/show_bug.cgi?id=185538
>+        <rdar://problem/38817825>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * editing/mac/DictionaryLookup.mm:
>+        (WebCore::showPopupOrCreateAnimationController):
>+        Options can be nil, in which case we can't mutableCopy it and add
>+        LUTermOptionDisableSearchTermIndicator. Instead, create a new dictionary,
>+        and add the items from options, if it's not nil.
>+
> 2018-05-09  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [WPE] Build cleanly with GCC 8 and ICU 60
>diff --git a/Source/WebCore/editing/mac/DictionaryLookup.mm b/Source/WebCore/editing/mac/DictionaryLookup.mm
>index 4d96b7ec2da3134dd19e69cfc1dd799f12f807d3..93e74c8401ec7775a6693bfb02b1499722e65563 100644
>--- a/Source/WebCore/editing/mac/DictionaryLookup.mm
>+++ b/Source/WebCore/editing/mac/DictionaryLookup.mm
>@@ -208,7 +208,9 @@ static PlatformAnimationController showPopupOrCreateAnimationController(bool cre
>     if (!getLULookupDefinitionModuleClass())
>         return nil;
> 
>-    RetainPtr<NSMutableDictionary> mutableOptions = adoptNS([(NSDictionary *)dictionaryPopupInfo.options.get() mutableCopy]);
>+    RetainPtr<NSMutableDictionary> mutableOptions = adoptNS([[NSMutableDictionary alloc] init]);
>+    if (NSDictionary *options = dictionaryPopupInfo.options.get())
>+        [mutableOptions addEntriesFromDictionary:options];
> 
>     auto textIndicator = TextIndicator::create(dictionaryPopupInfo.textIndicator);
>

Actions: View | Formatted Diff | Diff

Attachments on bug 185538: 340153