Log Message
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 Sam Weinig. * 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (231690 => 231691)
--- trunk/Source/WebCore/ChangeLog 2018-05-11 05:00:23 UTC (rev 231690)
+++ trunk/Source/WebCore/ChangeLog 2018-05-11 05:30:43 UTC (rev 231691)
@@ -1,3 +1,17 @@
+2018-05-10 Tim Horton <[email protected]>
+
+ 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 Sam Weinig.
+
+ * 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-10 Matt Baker <[email protected]>
Web Inspector: ASSERT_NOT_REACHED in PageDebuggerAgent::didAddEventListener when page adds attribute event listener
Modified: trunk/Source/WebCore/editing/mac/DictionaryLookup.mm (231690 => 231691)
--- trunk/Source/WebCore/editing/mac/DictionaryLookup.mm 2018-05-11 05:00:23 UTC (rev 231690)
+++ trunk/Source/WebCore/editing/mac/DictionaryLookup.mm 2018-05-11 05:30:43 UTC (rev 231691)
@@ -208,7 +208,9 @@
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);
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
