Attachment 359223 Details for Bug 193408 – Patch for landing

[patch] Patch for landing

bug-193408-20190115164144.patch (text/plain), 18.46 KB, created by Megan Gardner on 2019-01-15 16:41:45 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Megan Gardner

Created: 2019-01-15 16:41:45 PST

Size: 18.46 KB

patch

obsolete

>Subversion Revision: 240019
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e00d3145c707897b692f580be3269ab6d189ed48..d8c8975ab46d01040eb3d86658016ec952a86d1a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,34 @@
>+2019-01-15  Megan Gardner  <megan_gardner@apple.com>
>+
>+        Add Reveal support in iOSMac
>+        https://bugs.webkit.org/show_bug.cgi?id=193408
>+        <rdar://problem/47300699>
>+
>+        Reviewed by Tim Horton.
>+
>+        iOSMac and Reveal are currently not testable.
>+
>+        Add support for the reveal SPI specifically for iOSMac.
>+        Show the controller when called, and implement the delegate to 
>+        correctly re-paint the content with the auto-generated highlight from
>+        the reveal framework.
>+
>+        * Configurations/WebCore.xcconfig:
>+        * editing/cocoa/DictionaryLookup.mm:
>+        (-[WebRevealHighlight initWithHighlightRect:view:]):
>+        (-[WebRevealHighlight setImage:]):
>+        (-[WebRevealHighlight highlightRectsForItem:]):
>+        (-[WebRevealHighlight startHighlightingItem:]):
>+        (-[WebRevealHighlight highlightItem:withProgress:]):
>+        (-[WebRevealHighlight completeHighlightingItem:]):
>+        (-[WebRevealHighlight stopHighlightingItem:]):
>+        (-[WebRevealHighlight highlightRangeChangedForItem:]):
>+        (-[WebRevealHighlight highlighting]):
>+        (-[WebRevealHighlight drawHighlightContentForItem:context:]):
>+        (WebCore::showPopupOrCreateAnimationController):
>+        (WebCore::DictionaryLookup::showPopup):
>+        * editing/mac/DictionaryLookup.h:
>+
> 2019-01-15  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         [WHLSL] Implement the loop checker
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 4560dd22034d2bcb3560a5d516f3849154240c0a..8257d7638a5f6eb33e6054d747a8ef2c94b62871 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-01-15  Megan Gardner  <megan_gardner@apple.com>
>+
>+        Add Reveal support in iOSMac
>+        https://bugs.webkit.org/show_bug.cgi?id=193408
>+        <rdar://problem/47300699>
>+
>+        Reviewed by Tim Horton.
>+
>+        Add additional needed SPI.
>+
>+        * pal/spi/cocoa/RevealSPI.h:
>+
> 2019-01-15  Tim Horton  <timothy_horton@apple.com>
> 
>         Cannot tab out of WKWebView on macOS
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 1eecb4bd95c968fe99516fe90cc11bf1d6f72bc6..36e06dcaf58ec9897544fcb26c954299e226c8d9 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,22 @@
>+2019-01-15  Megan Gardner  <megan_gardner@apple.com>
>+
>+        Add Reveal support in iOSMac
>+        https://bugs.webkit.org/show_bug.cgi?id=193408
>+        <rdar://problem/47300699>
>+
>+        Reviewed by Tim Horton.
>+
>+        Add calls to DictionaryLookup from the appropriate places.
>+
>+        * UIProcess/PageClient.h:
>+        * UIProcess/ios/PageClientImplIOS.h:
>+        * UIProcess/ios/PageClientImplIOS.mm:
>+        (WebKit::PageClientImpl::didPerformDictionaryLookup):
>+        * UIProcess/ios/WebPageProxyIOS.mm:
>+        (WebKit::WebPageProxy::didPerformDictionaryLookup):
>+        * WebProcess/WebPage/Cocoa/WebPageCocoa.mm:
>+        (WebKit::WebPage::dictionaryPopupInfoForRange):
>+
> 2019-01-15  Claudio Saavedra  <csaavedra@igalia.com>
> 
>         [SOUP] Remove usage of NetworkProcess::singleton()
>diff --git a/Source/WebCore/PAL/pal/spi/cocoa/RevealSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/RevealSPI.h
>index 82b7c4a091bc9ddbc9462b58719ab53391b470f4..39dba5c7b68905d0b0bd03b87c59cf77c60a1c27 100644
>--- a/Source/WebCore/PAL/pal/spi/cocoa/RevealSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/cocoa/RevealSPI.h
>@@ -44,9 +44,9 @@ SOFT_LINK_CLASS_OPTIONAL(RevealCore, RVSelection)
> #import <Reveal/RVPresenter.h>
> #import <Reveal/Reveal.h>
> #endif // PLATFORM(MAC)
>+#import <RevealCore/RVItem_Private.h>
> #import <RevealCore/RVSelection.h>
> #import <RevealCore/RevealCore.h>
>-
> #else // USE(APPLE_INTERNAL_SDK)
> 
> 
>diff --git a/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h b/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h
>index def7dfb95a43e0ab29df7d028016013e4563b1b5..c4b8dcc86911a3746585765dee56beda759f6e46 100644
>--- a/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h
>@@ -47,9 +47,10 @@ WTF_EXTERN_C_END
> @interface UIApplication ()
> + (UIApplicationSceneClassicMode)_classicMode;
> - (GSKeyboardRef)_hardwareKeyboard;
>+- (CGFloat)_iOSMacScale;
> @end
> 
>-#else
>+#else // USE(APPLE_INTERNAL_SDK)
> 
> #import <UIKit/UIKit.h>
> 
>diff --git a/Source/WebCore/editing/cocoa/DictionaryLookup.mm b/Source/WebCore/editing/cocoa/DictionaryLookup.mm
>index 671ac9ab30a59fda8941f3845c3ea8bba9e54f21..0617174d0e307fc2172ea2e098d5ee68899d7384 100644
>--- a/Source/WebCore/editing/cocoa/DictionaryLookup.mm
>+++ b/Source/WebCore/editing/cocoa/DictionaryLookup.mm
>@@ -35,6 +35,7 @@
> #import "FocusController.h"
> #import "Frame.h"
> #import "FrameSelection.h"
>+#import "GraphicsContextCG.h"
> #import "HTMLConverter.h"
> #import "HitTestResult.h"
> #import "NotImplemented.h"
>@@ -45,17 +46,30 @@
> #import "VisiblePosition.h"
> #import "VisibleSelection.h"
> #import "VisibleUnits.h"
>+#import <pal/spi/cg/CoreGraphicsSPI.h>
> #import <pal/spi/cocoa/RevealSPI.h>
>+#import <pal/spi/ios/UIKitSPI.h>
> #import <pal/spi/mac/LookupSPI.h>
> #import <wtf/BlockObjCExceptions.h>
> #import <wtf/RefPtr.h>
> 
> #if !PLATFORM(WATCH)
>-
> #import <PDFKit/PDFKit.h>
>-
> #endif // !PLATFORM(WATCH)
> 
>+#if PLATFORM(IOSMAC)
>+extern "C" {
>+#import <UIKitMacHelper/UINSRevealController.h>
>+}
>+SOFT_LINK_PRIVATE_FRAMEWORK(UIKitMacHelper)
>+SOFT_LINK(UIKitMacHelper, UINSSharedRevealController, id<UINSRevealController>, (void), ())
>+
>+SOFT_LINK_FRAMEWORK(UIKit)
>+SOFT_LINK_CLASS(UIKit, UIApplication)
>+
>+
>+#endif // PLATFORM(IOSMAC)
>+
> #if PLATFORM(MAC)
> 
> @interface WebRevealHighlight <RVPresenterHighlightDelegate> : NSObject {
>@@ -141,7 +155,108 @@ - (void)revealContext:(RVPresentingContext *)context stopHighlightingItem:(RVIte
> 
> @end
> 
>-#endif // PLATFORM(MAC)
>+#elif PLATFORM(IOSMAC) // PLATFORM(MAC)
>+
>+@interface WebRevealHighlight <UIRVPresenterHighlightDelegate> : NSObject {
>+@private
>+    RefPtr<WebCore::Image> _image;
>+    CGRect _highlightRect;
>+    BOOL _highlighting;
>+    UIView *_view;
>+}
>+
>+- (instancetype)initWithHighlightRect:(NSRect)highlightRect view:(UIView *)view image:(RefPtr<WebCore::Image>&&)image;
>+
>+@end
>+
>+@implementation WebRevealHighlight
>+
>+- (instancetype)initWithHighlightRect:(NSRect)highlightRect view:(UIView *)view image:(RefPtr<WebCore::Image>&&)image
>+{
>+    if (!(self = [super init]))
>+        return nil;
>+    
>+    _highlightRect = highlightRect;
>+    _view = view;
>+    _highlighting = NO;
>+    _image = image;
>+    
>+    return self;
>+}
>+
>+- (void)setImage:(RefPtr<WebCore::Image>&&)image
>+{
>+    _image = WTFMove(image);
>+}
>+
>+- (NSArray<NSValue *> *)highlightRectsForItem:(RVItem *)item
>+{
>+    UNUSED_PARAM(item);
>+    return @[[NSValue valueWithCGRect:_highlightRect]];
>+}
>+
>+- (void)startHighlightingItem:(RVItem *)item
>+{
>+    UNUSED_PARAM(item);
>+    _highlighting = YES;
>+}
>+
>+- (void)highlightItem:(RVItem *)item withProgress:(CGFloat)progress
>+{
>+    UNUSED_PARAM(item);
>+    UNUSED_PARAM(progress);
>+}
>+
>+- (void)completeHighlightingItem:(RVItem *)item
>+{
>+    UNUSED_PARAM(item);
>+}
>+
>+- (void)stopHighlightingItem:(RVItem *)item
>+{
>+    UNUSED_PARAM(item);
>+    _highlighting = NO;
>+}
>+
>+- (void)highlightRangeChangedForItem:(RVItem *)item
>+{
>+    UNUSED_PARAM(item);
>+}
>+
>+- (BOOL)highlighting
>+{
>+    return _highlighting;
>+}
>+
>+- (void)drawHighlightContentForItem:(RVItem *)item context:(CGContextRef)context
>+{
>+    NSArray <NSValue *> *rects = [self highlightRectsForItem:item];
>+    if (!rects.count)
>+        return;
>+    
>+    CGRect highlightRect = rects.firstObject.CGRectValue;
>+    for (NSValue *rect in rects)
>+        highlightRect = CGRectUnion(highlightRect, rect.CGRectValue);
>+    highlightRect = [_view convertRect:highlightRect fromView:nil];
>+    
>+    WebCore::CGContextStateSaver saveState(context);
>+    CGAffineTransform contextTransform = CGContextGetCTM(context);
>+    CGFloat backingScale = contextTransform.a;
>+    CGFloat iOSMacScaleFactor = [getUIApplicationClass() sharedApplication]._iOSMacScale;
>+    CGAffineTransform transform = CGAffineTransformMakeScale(iOSMacScaleFactor * backingScale, iOSMacScaleFactor * backingScale);
>+    CGContextSetCTM(context, transform);
>+    
>+    for (NSValue *v in rects) {
>+        CGRect imgSrcRect = [_view convertRect:v.CGRectValue fromView:nil];
>+        RetainPtr<CGImageRef> imageRef = _image->nativeImage();
>+        CGRect origin = CGRectMake(imgSrcRect.origin.x - highlightRect.origin.x, imgSrcRect.origin.y - highlightRect.origin.y, highlightRect.size.width, highlightRect.size.height);
>+        CGContextDrawImage(context, origin, imageRef.get());
>+    }
>+}
>+
>+@end
>+
>+#endif // PLATFORM(IOSMAC)
> 
> #endif // ENABLE(REVEAL)
> 
>@@ -321,7 +436,7 @@ std::tuple<NSString *, NSDictionary *> DictionaryLookup::stringForPDFSelection(P
>     
> #endif // !PLATFORM(WATCH)
> 
>-static WKRevealController showPopupOrCreateAnimationController(bool createAnimationController, const DictionaryPopupInfo& dictionaryPopupInfo, NSView *view, const WTF::Function<void(TextIndicator&)>& textIndicatorInstallationCallback, const WTF::Function<FloatRect(FloatRect)>& rootViewToViewConversionCallback, WTF::Function<void()>&& clearTextIndicator)
>+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)
> {
>     BEGIN_BLOCK_OBJC_EXCEPTIONS;
>     
>@@ -379,7 +494,23 @@ static WKRevealController showPopupOrCreateAnimationController(bool createAnimat
>     [presenter revealItem:item.get() documentContext:nil presentingContext:context.get() options:nil];
>     return nil;
>     
>-#else // PLATFORM(MAC)
>+#elif PLATFORM(IOSMAC)
>+    
>+    UNUSED_PARAM(textIndicatorInstallationCallback);
>+    UNUSED_PARAM(rootViewToViewConversionCallback);
>+    UNUSED_PARAM(clearTextIndicator);
>+    ASSERT_UNUSED(createAnimationController, !createAnimationController);
>+
>+    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)]);
>+    
>+    [UINSSharedRevealController() revealItem:item.get() locationInWindow:dictionaryPopupInfo.origin window:view.window highlighter:(id<UIRVPresenterHighlightDelegate>) webHighlight.get()];
>+    return nil;
>+    
>+#else // PLATFORM(IOS_FAMILY)
>     
>     UNUSED_PARAM(createAnimationController);
>     UNUSED_PARAM(dictionaryPopupInfo);
>@@ -389,13 +520,13 @@ static WKRevealController showPopupOrCreateAnimationController(bool createAnimat
>     UNUSED_PARAM(clearTextIndicator);
>     
>     return nil;
>-#endif // PLATFORM(MAC)
>+#endif // PLATFORM(IOS_FAMILY)
>     
>     END_BLOCK_OBJC_EXCEPTIONS;
>     
> }
> 
>-void DictionaryLookup::showPopup(const DictionaryPopupInfo& dictionaryPopupInfo, NSView *view, const WTF::Function<void(TextIndicator&)>& textIndicatorInstallationCallback, const WTF::Function<FloatRect(FloatRect)>& rootViewToViewConversionCallback, WTF::Function<void()>&& clearTextIndicator)
>+void DictionaryLookup::showPopup(const DictionaryPopupInfo& dictionaryPopupInfo, RevealView *view, const WTF::Function<void(TextIndicator&)>& textIndicatorInstallationCallback, const WTF::Function<FloatRect(FloatRect)>& rootViewToViewConversionCallback, WTF::Function<void()>&& clearTextIndicator)
> {
>     showPopupOrCreateAnimationController(false, dictionaryPopupInfo, view, textIndicatorInstallationCallback, rootViewToViewConversionCallback, WTFMove(clearTextIndicator));
> }
>diff --git a/Source/WebCore/editing/mac/DictionaryLookup.h b/Source/WebCore/editing/mac/DictionaryLookup.h
>index f8f761cdc81aebd3df08837a3231c08f35a4feb9..1631967ff92adf8a8895f7fec5782d8c6123a637 100644
>--- a/Source/WebCore/editing/mac/DictionaryLookup.h
>+++ b/Source/WebCore/editing/mac/DictionaryLookup.h
>@@ -34,12 +34,15 @@
> #include <wtf/Function.h>
> 
> OBJC_CLASS NSView;
>+OBJC_CLASS UIView;
> OBJC_CLASS PDFSelection;
> 
> #if PLATFORM(MAC)
> typedef id <NSImmediateActionAnimationController> WKRevealController;
>+using RevealView = NSView;
> #else
> typedef id WKRevealController;
>+using RevealView = UIView;
> #endif // PLATFORM(MAC)
> 
> namespace WebCore {
>@@ -56,7 +59,7 @@ public:
> 
>     // FIXME: Should move/unify dictionaryPopupInfoForRange here too.
> 
>-    WEBCORE_EXPORT static void showPopup(const DictionaryPopupInfo&, NSView *, const WTF::Function<void(TextIndicator&)>& textIndicatorInstallationCallback, const WTF::Function<FloatRect(FloatRect)>& rootViewToViewConversionCallback = nullptr, WTF::Function<void()>&& clearTextIndicator = nullptr);
>+    WEBCORE_EXPORT static void showPopup(const DictionaryPopupInfo&, RevealView *, const WTF::Function<void(TextIndicator&)>& textIndicatorInstallationCallback, const WTF::Function<FloatRect(FloatRect)>& rootViewToViewConversionCallback = nullptr, WTF::Function<void()>&& clearTextIndicator = nullptr);
>     WEBCORE_EXPORT static void hidePopup();
>     
> #if PLATFORM(MAC)
>diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h
>index aaabcc288c478892007531efe40a9201e9ea1deb..007b28184f36af2abb95e32fe50e8ff915bed6dd 100644
>--- a/Source/WebKit/UIProcess/PageClient.h
>+++ b/Source/WebKit/UIProcess/PageClient.h
>@@ -304,6 +304,8 @@ public:
>     virtual void setTextIndicator(Ref<WebCore::TextIndicator>, WebCore::TextIndicatorWindowLifetime) = 0;
>     virtual void clearTextIndicator(WebCore::TextIndicatorWindowDismissalAnimation) = 0;
>     virtual void setTextIndicatorAnimationProgress(float) = 0;
>+    
>+    virtual void didPerformDictionaryLookup(const WebCore::DictionaryPopupInfo&) = 0;
> #endif
> 
>     virtual void enterAcceleratedCompositingMode(const LayerTreeContext&) = 0;
>@@ -315,7 +317,6 @@ public:
> #if PLATFORM(MAC)
>     virtual void pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus) = 0;
>     virtual void setPluginComplexTextInputState(uint64_t pluginComplexTextInputIdentifier, PluginComplexTextInputState) = 0;
>-    virtual void didPerformDictionaryLookup(const WebCore::DictionaryPopupInfo&) = 0;
>     virtual void showCorrectionPanel(WebCore::AlternativeTextType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings) = 0;
>     virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeText) = 0;
>     virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingAlternativeText) = 0;
>diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.h b/Source/WebKit/UIProcess/ios/PageClientImplIOS.h
>index 877c8137f3316582ac5433eed5b17bdab2539d9f..5da6f99bf524023303d871da07bf72e16afcb526 100644
>--- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.h
>+++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.h
>@@ -134,6 +134,8 @@ private:
> 
>     void didCommitLayerTree(const RemoteLayerTreeTransaction&) override;
>     void layerTreeCommitComplete() override;
>+        
>+    void didPerformDictionaryLookup(const WebCore::DictionaryPopupInfo&) override;
> 
>     void couldNotRestorePageState() override;
>     void restorePageState(Optional<WebCore::FloatPoint>, const WebCore::FloatPoint&, const WebCore::FloatBoxExtent&, double) override;
>diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
>index 7e063da1d38c05ea36f2109b20fd7414c20b7532..b237ef5052af375c1ec5647b7bdb281e07fa48bc 100644
>--- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
>+++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
>@@ -54,6 +54,7 @@
> #import "WebEditCommandProxy.h"
> #import "WebProcessProxy.h"
> #import "_WKDownloadInternal.h"
>+#import <WebCore/DictionaryLookup.h>
> #import <WebCore/NotImplemented.h>
> #import <WebCore/PlatformScreen.h>
> #import <WebCore/PromisedAttachmentInfo.h>
>@@ -453,6 +454,15 @@ void PageClientImpl::updateAcceleratedCompositingMode(const LayerTreeContext&)
> {
> }
> 
>+void PageClientImpl::didPerformDictionaryLookup(const DictionaryPopupInfo& dictionaryPopupInfo)
>+{
>+#if ENABLE(REVEAL)
>+    DictionaryLookup::showPopup(dictionaryPopupInfo, m_contentView, nullptr);
>+#else
>+    UNUSED_PARAM(dictionaryPopupInfo);
>+#endif // ENABLE(REVEAL)
>+}
>+
> void PageClientImpl::setRemoteLayerTreeRootNode(RemoteLayerTreeNode* rootNode)
> {
>     [m_contentView _setAcceleratedCompositingRootView:rootNode ? rootNode->uiView() : nil];
>diff --git a/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm b/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
>index 11a746739f76bf723c3ba80116addde93ab48210..b9bd70c9bee1069e1b4f123098b9cae12d6487c5 100644
>--- a/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
>+++ b/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
>@@ -981,9 +981,9 @@ void WebPageProxy::setFocusedElementSelectedIndex(uint32_t index, bool allowMult
>     process().send(Messages::WebPage::SetFocusedElementSelectedIndex(index, allowMultipleSelection), m_pageID);
> }
> 
>-void WebPageProxy::didPerformDictionaryLookup(const DictionaryPopupInfo&)
>+void WebPageProxy::didPerformDictionaryLookup(const DictionaryPopupInfo& dictionaryPopupInfo)
> {
>-    notImplemented();
>+    pageClient().didPerformDictionaryLookup(dictionaryPopupInfo);
> }
> 
> void WebPageProxy::savePDFToTemporaryFolderAndOpenWithNativeApplication(const String&, const String&, const IPC::DataReference&, const String&)
>diff --git a/Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm b/Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm
>index 8ce565fb956f36cb752ef811a1245eb55ddcf9b3..36c9b35261288bd5e31691edf01e896a4fa4c14d 100644
>--- a/Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm
>+++ b/Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm
>@@ -175,6 +175,10 @@ DictionaryPopupInfo WebPage::dictionaryPopupInfoForRange(Frame& frame, Range& ra
>     dictionaryPopupInfo.attributedString = scaledNSAttributedString;
> #endif // PLATFORM(MAC)
>     
>+#if PLATFORM(IOSMAC)
>+    dictionaryPopupInfo.attributedString = adoptNS([[NSMutableAttributedString alloc] initWithString:range.text()]);
>+#endif // PLATFORM(IOSMAC)
>+    
>     editor.setIsGettingDictionaryPopupInfo(false);
>     return dictionaryPopupInfo;
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 193408: 359079 | 359093 | 359102 | 359103 | 359184 | 359212 | 359219 | 359223