Attachment 368383 Details for Bug 197341 – Patch

[patch] Patch

bug-197341-20190426221406.patch (text/plain), 3.24 KB, created by Megan Gardner on 2019-04-26 20:14:06 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Megan Gardner

Created: 2019-04-26 20:14:06 PDT

Size: 3.24 KB

patch

obsolete

>Subversion Revision: 244662
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 3b72a394740981c7ae6051401258ecf15bbc8699..97eea125e0592fcdb2977b988d3cd382796421d1 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-04-26  Megan Gardner  <megan_gardner@apple.com>
>+
>+        Lookup only looking up the first word in selection
>+        https://bugs.webkit.org/show_bug.cgi?id=197341
>+        <rdar://problem/48221414>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Lookup is not testable.
>+
>+        Reveal needs the full range in order to correctly create the item for the popover.
>+
>+        * editing/cocoa/DictionaryLookup.mm:
>+        (WebCore::showPopupOrCreateAnimationController):
>+
> 2019-04-25  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix more builds after r244653
>diff --git a/Source/WebCore/editing/cocoa/DictionaryLookup.mm b/Source/WebCore/editing/cocoa/DictionaryLookup.mm
>index 1ff8a7090653a450f5283b262fe28861a75323fa..5934a219ef5b89b072b689fd1a93abe9d53756bc 100644
>--- a/Source/WebCore/editing/cocoa/DictionaryLookup.mm
>+++ b/Source/WebCore/editing/cocoa/DictionaryLookup.mm
>@@ -482,7 +482,7 @@ static WKRevealController showPopupOrCreateAnimationController(bool createAnimat
>     RetainPtr<WebRevealHighlight> webHighlight =  adoptNS([[WebRevealHighlight alloc] initWithHighlightRect: highlightRect useDefaultHighlight:!textIndicator.get().contentImage() attributedString:dictionaryPopupInfo.attributedString.get()]);
>     RetainPtr<RVPresentingContext> context = adoptNS([allocRVPresentingContextInstance() initWithPointerLocationInView:pointerLocation inView:view highlightDelegate:(id<RVPresenterHighlightDelegate>) webHighlight.get()]);
>     
>-    RetainPtr<RVItem> item = adoptNS([allocRVItemInstance() initWithText:dictionaryPopupInfo.attributedString.get().string selectedRange:NSMakeRange(0, 0)]);
>+    RetainPtr<RVItem> item = adoptNS([allocRVItemInstance() initWithText:dictionaryPopupInfo.attributedString.get().string selectedRange:NSMakeRange(0, dictionaryPopupInfo.attributedString.get().string.length-1)]);
>     
>     [webHighlight setClearTextIndicator:[webHighlight = WTFMove(webHighlight), clearTextIndicator = WTFMove(clearTextIndicator)] {
>         if (clearTextIndicator)
>@@ -504,8 +504,8 @@ static WKRevealController showPopupOrCreateAnimationController(bool createAnimat
>     auto textIndicator = TextIndicator::create(dictionaryPopupInfo.textIndicator);
>     
>     RetainPtr<WebRevealHighlight> webHighlight = adoptNS([[WebRevealHighlight alloc] initWithHighlightRect:[view convertRect:textIndicator->selectionRectInRootViewCoordinates() toView:nil] view:view image:textIndicator->contentImage()]);
>-    
>-    RetainPtr<RVItem> item = adoptNS([allocRVItemInstance() initWithText:dictionaryPopupInfo.attributedString.get().string selectedRange:NSMakeRange(0, 0)]);
>+
>+    RetainPtr<RVItem> item = adoptNS([allocRVItemInstance() initWithText:dictionaryPopupInfo.attributedString.get().string selectedRange:NSMakeRange(0, dictionaryPopupInfo.attributedString.get().string.length-1)]);
>     
>     [UINSSharedRevealController() revealItem:item.get() locationInWindow:dictionaryPopupInfo.origin window:view.window highlighter:(id<UIRVPresenterHighlightDelegate>) webHighlight.get()];
>     return nil;

Actions: View | Formatted Diff | Diff

Attachments on bug 197341: 368383 | 368385