⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 176462 in webkit


Ignore:
Timestamp:
Nov 21, 2014, 12:18:29 PM (12 years ago)
Author:
timothy_horton@apple.com
Message:

Move TextIndicator{Window} to WebCore
​https://bugs.webkit.org/show_bug.cgi?id=138954
<rdar://problem/18992185>

Some adjustments by Csaba Osztrogonác.
Reviewed by Anders Carlsson.

Move TextIndicator and TextIndicatorWindow to WebCore so that both
WebKits can share the implementation.

  • CMakeLists.txt:

Remove TextIndicator.cpp.

  • Scripts/webkit/messages.py:

(struct_or_class):
(headers_for_type):
Tell messages.py that TextIndicatorData is a struct, and comes from TextIndicator.h.

  • Shared/WebCoreArgumentCoders.h:
  • Shared/WebCoreArgumentCoders.cpp:

(IPC::ArgumentCoder<TextIndicatorData>::encode):
(IPC::ArgumentCoder<TextIndicatorData>::decode):
Add argument coders for TextIndicatorData.

  • Shared/DictionaryPopupInfo.h:
  • Shared/mac/ActionMenuHitTestResult.h:
  • Shared/mac/ActionMenuHitTestResult.mm:
  • UIProcess/API/gtk/PageClientImpl.h:
  • UIProcess/API/gtk/PageClientImpl.cpp:
  • UIProcess/API/mac/WKView.mm:
  • UIProcess/API/mac/WKViewInternal.h:
  • UIProcess/CoordinatedGraphics/WebView.h:
  • UIProcess/CoordinatedGraphics/WebView.cpp:
  • UIProcess/PageClient.h:
  • UIProcess/WebPageProxy.cpp:
  • UIProcess/WebPageProxy.h:
  • UIProcess/WebPageProxy.messages.in:
  • UIProcess/ios/PageClientImplIOS.h:
  • UIProcess/ios/WKContentView.h:
  • UIProcess/mac/PageClientImpl.h:
  • UIProcess/mac/PageClientImpl.mm:
  • UIProcess/mac/WKActionMenuController.mm:
  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
  • WebProcess/WebPage/FindController.cpp:
  • WebProcess/WebPage/WebPage.h:
  • WebProcess/WebPage/ios/WebPageIOS.mm:
  • WebProcess/WebPage/mac/WebPageMac.mm:

Adjust to TextIndicator and TextIndicatorWindow's new home.

  • CMakeLists.txt:

Build TextIndicator.

  • WebCore.exp.in:

Export TextIndicator{Window} symbols for the WebKits.

  • WebCore.xcodeproj/project.pbxproj:
  • page/TextIndicator.cpp: Renamed from Source/WebKit2/Shared/TextIndicator.cpp.
  • page/TextIndicator.h: Renamed from Source/WebKit2/Shared/TextIndicator.h.

Straighforward move of TextIndicator from WebKit2, except:

Move TextIndicator::Data and TextIndicator::PresentationTransition out directly
into the WebCore namespace to allow for implementation of WebKit2 argument coders.

Use Image instead of ShareableBitmap internally.

Move the TextIndicatorData encode/decode to WebCoreArgumentCoders.

  • page/mac/TextIndicatorWindow.h: Renamed from Source/WebKit2/UIProcess/mac/TextIndicatorWindow.h.
  • page/mac/TextIndicatorWindow.mm: Renamed from Source/WebKit2/UIProcess/mac/TextIndicatorWindow.mm.

Straighforward move of TextIndicatorWindow from WebKit2.

Location:
trunk/Source
Files:
4 added
4 deleted
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r176423 r176462  
    19351935    page/SpatialNavigation.cpp
    19361936    page/SuspendableTimer.cpp
     1937    page/TextIndicator.cpp
    19371938    page/UserContentController.cpp
    19381939    page/UserContentURLPattern.cpp

  • trunk/Source/WebCore/ChangeLog

    r176461 r176462  
     12014-11-21  Tim Horton  <timothy_horton@apple.com>
     2
     3        Move TextIndicator{Window} to WebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=138954
     5        <rdar://problem/18992185>
     6
     7        Some adjustments by Csaba Osztrogonác.
     8        Reviewed by Anders Carlsson.
     9
     10        Move TextIndicator and TextIndicatorWindow to WebCore so that both
     11        WebKits can share the implementation.
     12
     13        * CMakeLists.txt:
     14        Build TextIndicator.
     15
     16        * WebCore.exp.in:
     17        Export TextIndicator{Window} symbols for the WebKits.
     18
     19        * WebCore.xcodeproj/project.pbxproj:
     20        * page/TextIndicator.cpp: Renamed from Source/WebKit2/Shared/TextIndicator.cpp.
     21        * page/TextIndicator.h: Renamed from Source/WebKit2/Shared/TextIndicator.h.
     22        Straighforward move of TextIndicator from WebKit2, except:
     23
     24        Move TextIndicator::Data and TextIndicator::PresentationTransition out directly
     25        into the WebCore namespace to allow for implementation of WebKit2 argument coders.
     26
     27        Use Image instead of ShareableBitmap internally.
     28
     29        Move the TextIndicatorData encode/decode to WebCoreArgumentCoders.
     30       
     31        * page/mac/TextIndicatorWindow.h: Renamed from Source/WebKit2/UIProcess/mac/TextIndicatorWindow.h.
     32        * page/mac/TextIndicatorWindow.mm: Renamed from Source/WebKit2/UIProcess/mac/TextIndicatorWindow.mm.
     33        Straighforward move of TextIndicatorWindow from WebKit2.
     34
    1352014-11-21  Anders Carlsson  <andersca@apple.com>
    236

  • trunk/Source/WebCore/WebCore.exp.in

    r176437 r176462  
    22962296__ZN7WebCore12EventHandler9mouseDownEP7NSEvent
    22972297__ZN7WebCore13DataDetection29detectItemAroundHitTestResultERKNS_13HitTestResultERNS_9FloatRectERN3WTF6RefPtrINS_5RangeEEE
     2298__ZN7WebCore13TextIndicator15createWithRangeERKNS_5RangeENS_35TextIndicatorPresentationTransitionE
     2299__ZN7WebCore13TextIndicator26createWithSelectionInFrameERNS_5FrameENS_35TextIndicatorPresentationTransitionE
     2300__ZN7WebCore13TextIndicator6createERKNS_17TextIndicatorDataE
     2301__ZN7WebCore13TextIndicatorD1Ev
    22982302__ZN7WebCore13getRawCookiesERKNS_21NetworkStorageSessionERKNS_3URLES5_RN3WTF6VectorINS_6CookieELj0ENS6_15CrashOnOverflowEEE
    22992303__ZN7WebCore13toDeviceSpaceERKNS_9FloatRectEP8NSWindow
    … …  
    23102314__ZN7WebCore17ScrollbarThemeMac27setUpOverhangAreaBackgroundEP7CALayerRKNS_5ColorE
    23112315__ZN7WebCore17ScrollbarThemeMac28removeOverhangAreaBackgroundEP7CALayer
     2316__ZN7WebCore19TextIndicatorWindow16setTextIndicatorEN3WTF10PassRefPtrINS_13TextIndicatorEEEbNSt3__18functionIFvvEEE
     2317__ZN7WebCore19TextIndicatorWindowC1EP6NSView
     2318__ZN7WebCore19TextIndicatorWindowD1Ev
    23122319__ZN7WebCore19applicationIsSafariEv
    23132320__ZN7WebCore20PlatformEventFactory24createPlatformMouseEventEP7NSEventP6NSView

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r176448 r176462  
    11051105                2D481F03146B5C6500AA7834 /* GradientImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D2FC0561460CD6F00263633 /* GradientImage.cpp */; };
    11061106                2D481F04146B5C6B00AA7834 /* GradientImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D2FC0571460CD6F00263633 /* GradientImage.h */; };
     1107                2D4F96F51A1ECC240098BF88 /* TextIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */; };
     1108                2D4F96F61A1ECC240098BF88 /* TextIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D4F96F21A1ECC240098BF88 /* TextIndicator.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1109                2D4F96F71A1ECC240098BF88 /* TextIndicatorWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D4F96F31A1ECC240098BF88 /* TextIndicatorWindow.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1110                2D4F96F81A1ECC240098BF88 /* TextIndicatorWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D4F96F41A1ECC240098BF88 /* TextIndicatorWindow.mm */; };
    11071111                2D58D8551A15F65F00A5F726 /* DataDetection.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D58D8531A15F65F00A5F726 /* DataDetection.h */; settings = {ATTRIBUTES = (Private, ); }; };
    11081112                2D58D8561A15F65F00A5F726 /* DataDetection.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D58D8541A15F65F00A5F726 /* DataDetection.mm */; };
    … …  
    81338137                2D46F04D17B96FBD005647F0 /* IntPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IntPoint.cpp; sourceTree = "<group>"; };
    81348138                2D46F04F17B96FD2005647F0 /* IntSize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IntSize.cpp; sourceTree = "<group>"; };
     8139                2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextIndicator.cpp; sourceTree = "<group>"; };
     8140                2D4F96F21A1ECC240098BF88 /* TextIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextIndicator.h; sourceTree = "<group>"; };
     8141                2D4F96F31A1ECC240098BF88 /* TextIndicatorWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextIndicatorWindow.h; sourceTree = "<group>"; };
     8142                2D4F96F41A1ECC240098BF88 /* TextIndicatorWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextIndicatorWindow.mm; sourceTree = "<group>"; };
    81358143                2D58D8531A15F65F00A5F726 /* DataDetection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataDetection.h; sourceTree = "<group>"; };
    81368144                2D58D8541A15F65F00A5F726 /* DataDetection.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DataDetection.mm; sourceTree = "<group>"; };
    … …  
    1672416732                                62C1217A11AB9E76003C462C /* SuspendableTimer.cpp */,
    1672516733                                62C1217B11AB9E77003C462C /* SuspendableTimer.h */,
     16734                                2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */,
     16735                                2D4F96F21A1ECC240098BF88 /* TextIndicator.h */,
    1672616736                                1AE79D40188DB61F002239C2 /* UserContentController.cpp */,
    1672716737                                1AE79D41188DB61F002239C2 /* UserContentController.h */,
    … …  
    1763117641                                2D93AEE219DF5641002A86C3 /* ServicesOverlayController.mm */,
    1763217642                                E1C2F2481533A2120083F974 /* SettingsMac.mm */,
     17643                                2D4F96F31A1ECC240098BF88 /* TextIndicatorWindow.h */,
     17644                                2D4F96F41A1ECC240098BF88 /* TextIndicatorWindow.mm */,
    1763317645                                26255F0218878E110006E1FD /* UserAgentMac.mm */,
    1763417646                                F587854C02DE375901EA4122 /* WebCoreFrameView.h */,
    … …  
    2353823550                                6ED8C37A183BFF8C009E53BD /* BoxShape.h in Headers */,
    2353923551                                BCEA4855097D93020094C9E4 /* break_lines.h in Headers */,
     23552                                2D4F96F61A1ECC240098BF88 /* TextIndicator.h in Headers */,
    2354023553                                93309DDB099E64920056E581 /* BreakBlockquoteCommand.h in Headers */,
    2354123554                                599E759011055A1F00D904FA /* Bridge.h in Headers */,
    … …  
    2609726110                                4512502315DCE37D002F84E2 /* SpinButtonElement.h in Headers */,
    2609826111                                93309E12099E64920056E581 /* SplitElementCommand.h in Headers */,
     26112                                2D4F96F71A1ECC240098BF88 /* TextIndicatorWindow.h in Headers */,
    2609926113                                93309E14099E64920056E581 /* SplitTextNodeCommand.h in Headers */,
    2610026114                                93309E16099E64920056E581 /* SplitTextNodeContainingElementCommand.h in Headers */,
    … …  
    2762827642                                85C050BB0AD84F5E005532E7 /* DOMHTMLEmbedElement.mm in Sources */,
    2762927643                                85BA4CE00AA6861B0088052D /* DOMHTMLFieldSetElement.mm in Sources */,
     27644                                2D4F96F81A1ECC240098BF88 /* TextIndicatorWindow.mm in Sources */,
    2763027645                                85ECBEF00AA7626900544F0B /* DOMHTMLFontElement.mm in Sources */,
    2763127646                                85DF2C5D0AA341F600AD64C5 /* DOMHTMLFormElement.mm in Sources */,
    … …  
    2953529550                                97BC6A4D1505F081001B74AC /* SQLStatementSync.cpp in Sources */,
    2953629551                                97BC6A4F1505F081001B74AC /* SQLTransaction.cpp in Sources */,
     29552                                2D4F96F51A1ECC240098BF88 /* TextIndicator.cpp in Sources */,
    2953729553                                FEE1811316C319E800084849 /* SQLTransactionBackend.cpp in Sources */,
    2953829554                                FEAD7D8716C339EE00D4670B /* SQLTransactionBackendSync.cpp in Sources */,

  • trunk/Source/WebKit2/CMakeLists.txt

    r176011 r176462  
    208208    Shared/ShareableResource.cpp
    209209    Shared/StatisticsData.cpp
    210     Shared/TextIndicator.cpp
    211210    Shared/UpdateInfo.cpp
    212211    Shared/UserData.cpp

  • trunk/Source/WebKit2/ChangeLog

    r176460 r176462  
     12014-11-21  Tim Horton  <timothy_horton@apple.com>
     2
     3        Move TextIndicator{Window} to WebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=138954
     5        <rdar://problem/18992185>
     6
     7        Some adjustments by Csaba Osztrogonác.
     8        Reviewed by Anders Carlsson.
     9
     10        * CMakeLists.txt:
     11        Remove TextIndicator.cpp.
     12
     13        * Scripts/webkit/messages.py:
     14        (struct_or_class):
     15        (headers_for_type):
     16        Tell messages.py that TextIndicatorData is a struct, and comes from TextIndicator.h.
     17
     18        * Shared/WebCoreArgumentCoders.h:
     19        * Shared/WebCoreArgumentCoders.cpp:
     20        (IPC::ArgumentCoder<TextIndicatorData>::encode):
     21        (IPC::ArgumentCoder<TextIndicatorData>::decode):
     22        Add argument coders for TextIndicatorData.
     23
     24        * Shared/DictionaryPopupInfo.h:       
     25        * Shared/mac/ActionMenuHitTestResult.h:
     26        * Shared/mac/ActionMenuHitTestResult.mm:
     27        * UIProcess/API/gtk/PageClientImpl.h:
     28        * UIProcess/API/gtk/PageClientImpl.cpp:
     29        * UIProcess/API/mac/WKView.mm:
     30        * UIProcess/API/mac/WKViewInternal.h:
     31        * UIProcess/CoordinatedGraphics/WebView.h:
     32        * UIProcess/CoordinatedGraphics/WebView.cpp:
     33        * UIProcess/PageClient.h:
     34        * UIProcess/WebPageProxy.cpp:
     35        * UIProcess/WebPageProxy.h:
     36        * UIProcess/WebPageProxy.messages.in:
     37        * UIProcess/ios/PageClientImplIOS.h:
     38        * UIProcess/ios/WKContentView.h:
     39        * UIProcess/mac/PageClientImpl.h:
     40        * UIProcess/mac/PageClientImpl.mm:
     41        * UIProcess/mac/WKActionMenuController.mm:
     42        * WebKit2.xcodeproj/project.pbxproj:
     43        * WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
     44        * WebProcess/WebPage/FindController.cpp:
     45        * WebProcess/WebPage/WebPage.h:
     46        * WebProcess/WebPage/ios/WebPageIOS.mm:
     47        * WebProcess/WebPage/mac/WebPageMac.mm:
     48        Adjust to TextIndicator and TextIndicatorWindow's new home.
     49
    1502014-11-21  Tim Horton  <timothy_horton@apple.com>
    251

  • trunk/Source/WebKit2/Scripts/webkit/messages.py

    r175075 r176462  
    184184        'WebCore::ScaleTransformOperation',
    185185        'WebCore::SkewTransformOperation',
     186        'WebCore::TextIndicatorData',
    186187        'WebCore::TimingFunction',
    187188        'WebCore::TransformationMatrix',
    … …  
    439440        'WebCore::TextCheckingRequestData': ['<WebCore/TextChecking.h>'],
    440441        'WebCore::TextCheckingResult': ['<WebCore/TextCheckerClient.h>'],
     442        'WebCore::TextIndicatorData': ['<WebCore/TextIndicator.h>'],
    441443        'WebCore::ViewportAttributes': ['<WebCore/ViewportArguments.h>'],
    442444        'WebKit::BackForwardListItemState': ['"SessionState.h"'],

  • trunk/Source/WebKit2/Shared/DictionaryPopupInfo.h

    r176164 r176462  
    2727#define DictionaryPopupInfo_h
    2828
    29 #include "TextIndicator.h"
    3029#include <WebCore/FloatPoint.h>
     30#include <WebCore/TextIndicator.h>
    3131
    3232#if PLATFORM(COCOA)
    … …  
    4747
    4848    WebCore::FloatPoint origin;
    49     TextIndicator::Data textIndicator;
     49    WebCore::TextIndicatorData textIndicator;
    5050#if PLATFORM(COCOA)
    5151    RetainPtr<CFDictionaryRef> options;

  • trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp

    r175794 r176462  
    6060#include <WebCore/SessionID.h>
    6161#include <WebCore/TextCheckerClient.h>
     62#include <WebCore/TextIndicator.h>
    6263#include <WebCore/TimingFunction.h>
    6364#include <WebCore/TransformationMatrix.h>
    … …  
    19611962}
    19621963
     1964void ArgumentCoder<TextIndicatorData>::encode(ArgumentEncoder& encoder, const TextIndicatorData& textIndicatorData)
     1965{
     1966    encoder << textIndicatorData.selectionRectInWindowCoordinates;
     1967    encoder << textIndicatorData.textBoundingRectInWindowCoordinates;
     1968    encoder << textIndicatorData.textRectsInBoundingRectCoordinates;
     1969    encoder << textIndicatorData.contentImageScaleFactor;
     1970    encoder.encodeEnum(textIndicatorData.presentationTransition);
     1971    encodeImage(encoder, textIndicatorData.contentImage.get());
     1972    encodeImage(encoder, textIndicatorData.contentImageWithHighlight.get());
     1973}
     1974
     1975bool ArgumentCoder<TextIndicatorData>::decode(ArgumentDecoder& decoder, TextIndicatorData& textIndicatorData)
     1976{
     1977    if (!decoder.decode(textIndicatorData.selectionRectInWindowCoordinates))
     1978        return false;
     1979
     1980    if (!decoder.decode(textIndicatorData.textBoundingRectInWindowCoordinates))
     1981        return false;
     1982
     1983    if (!decoder.decode(textIndicatorData.textRectsInBoundingRectCoordinates))
     1984        return false;
     1985
     1986    if (!decoder.decode(textIndicatorData.contentImageScaleFactor))
     1987        return false;
     1988
     1989    if (!decoder.decodeEnum(textIndicatorData.presentationTransition))
     1990        return false;
     1991
     1992    if (!decodeImage(decoder, textIndicatorData.contentImage))
     1993        return false;
     1994
     1995    if (!decodeImage(decoder, textIndicatorData.contentImageWithHighlight))
     1996        return false;
     1997
     1998    return true;
     1999}
     2000
    19632001} // namespace IPC

  • trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h

    r175794 r176462  
    8686struct ScrollableAreaParameters;
    8787struct TextCheckingResult;
     88struct TextIndicatorData;
    8889struct ViewportAttributes;
    8990struct WindowFeatures;
    … …  
    436437#endif
    437438
     439template<> struct ArgumentCoder<WebCore::TextIndicatorData> {
     440    static void encode(ArgumentEncoder&, const WebCore::TextIndicatorData&);
     441    static bool decode(ArgumentDecoder&, WebCore::TextIndicatorData&);
     442};
     443
    438444} // namespace IPC
    439445

  • trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.h

    r176288 r176462  
    3030#include "ShareableBitmap.h"
    3131#include "SharedMemory.h"
    32 #include "TextIndicator.h"
    3332#include "WebHitTestResult.h"
    3433#include <WebCore/FloatRect.h>
    3534#include <WebCore/PageOverlay.h>
     35#include <WebCore/TextIndicator.h>
    3636#include <wtf/text/WTFString.h>
    3737
    … …  
    5858    RetainPtr<DDActionContext> actionContext;
    5959    WebCore::FloatRect detectedDataBoundingBox;
    60     RefPtr<TextIndicator> detectedDataTextIndicator;
     60    RefPtr<WebCore::TextIndicator> detectedDataTextIndicator;
    6161    WebCore::PageOverlay::PageOverlayID detectedDataOriginatingPageOverlay;
    6262};

  • trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.mm

    r176288 r176462  
    3232#import "ArgumentDecoder.h"
    3333#import "ArgumentEncoder.h"
    34 #import "TextIndicator.h"
    3534#import "WebCoreArgumentCoders.h"
    3635#import <WebCore/DataDetectorsSPI.h>
     36#import <WebCore/TextIndicator.h>
    3737
    3838namespace WebKit {
    … …  
    119119
    120120        if (hasTextIndicator) {
    121             TextIndicator::Data indicatorData;
     121            WebCore::TextIndicatorData indicatorData;
    122122            if (!decoder.decode(indicatorData))
    123123                return false;
    124124
    125             actionMenuHitTestResult.detectedDataTextIndicator = TextIndicator::create(indicatorData);
     125            actionMenuHitTestResult.detectedDataTextIndicator = WebCore::TextIndicator::create(indicatorData);
    126126        }
    127127    }

  • trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp

    r176385 r176462  
    234234#endif
    235235
    236 void PageClientImpl::setTextIndicator(PassRefPtr<TextIndicator>, bool /* fadeOut */)
     236void PageClientImpl::setTextIndicator(PassRefPtr<WebCore::TextIndicator>, bool /* fadeOut */)
    237237{
    238238    notImplemented();

  • trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h

    r176385 r176462  
    9494    virtual PassRefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& intialColor, const WebCore::IntRect&) override;
    9595#endif
    96     virtual void setTextIndicator(PassRefPtr<TextIndicator>, bool fadeOut) override;
     96    virtual void setTextIndicator(PassRefPtr<WebCore::TextIndicator>, bool fadeOut) override;
    9797    virtual void getEditorCommandsForKeyEvent(const NativeWebKeyboardEvent&, const AtomicString&, Vector<WTF::String>&) override;
    9898    virtual void updateTextInputState() override;

  • trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

    r176427 r176462  
    5252#import "TextChecker.h"
    5353#import "TextCheckerState.h"
    54 #import "TextIndicator.h"
    55 #import "TextIndicatorWindow.h"
    5654#import "TiledCoreAnimationDrawingAreaProxy.h"
    5755#import "ViewGestureController.h"
    … …  
    9795#import <WebCore/SoftLinking.h>
    9896#import <WebCore/TextAlternativeWithRange.h>
     97#import <WebCore/TextIndicator.h>
     98#import <WebCore/TextIndicatorWindow.h>
    9999#import <WebCore/TextUndoInsertionMarkupMac.h>
    100100#import <WebCore/WebActionDisablingCALayerDelegate.h>

  • trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h

    r176363 r176462  
    4242class Image;
    4343class SharedBuffer;
     44class TextIndicator;
    4445struct KeypressCommand;
    4546}
    … …  
    4849class DrawingAreaProxy;
    4950class LayerTreeContext;
    50 class TextIndicator;
    5151class ViewSnapshot;
    5252class WebContext;
    … …  
    8181- (NSRect)_convertToDeviceSpace:(NSRect)rect;
    8282- (NSRect)_convertToUserSpace:(NSRect)rect;
    83 - (void)_setTextIndicator:(PassRefPtr<WebKit::TextIndicator>)textIndicator fadeOut:(BOOL)fadeOut;
    84 - (void)_setTextIndicator:(PassRefPtr<WebKit::TextIndicator>)textIndicator fadeOut:(BOOL)fadeOut animationCompletionHandler:(std::function<void ()>)completionHandler;
     83- (void)_setTextIndicator:(PassRefPtr<WebCore::TextIndicator>)textIndicator fadeOut:(BOOL)fadeOut;
     84- (void)_setTextIndicator:(PassRefPtr<WebCore::TextIndicator>)textIndicator fadeOut:(BOOL)fadeOut animationCompletionHandler:(std::function<void ()>)completionHandler;
    8585
    8686- (void)_setAcceleratedCompositingModeRootLayer:(CALayer *)rootLayer;

  • trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp

    r176375 r176462  
    449449#endif
    450450
    451 void WebView::setTextIndicator(PassRefPtr<TextIndicator>, bool)
     451void WebView::setTextIndicator(PassRefPtr<WebCore::TextIndicator>, bool)
    452452{
    453453    notImplemented();

  • trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h

    r176375 r176462  
    185185#endif
    186186
    187     virtual void setTextIndicator(PassRefPtr<TextIndicator>, bool) override;
     187    virtual void setTextIndicator(PassRefPtr<WebCore::TextIndicator>, bool) override;
    188188
    189189    virtual void enterAcceleratedCompositingMode(const LayerTreeContext&) override;

  • trunk/Source/WebKit2/UIProcess/PageClient.h

    r176363 r176462  
    4848namespace WebCore {
    4949class Cursor;
     50class TextIndicator;
     51struct Highlight;
    5052struct ViewportAttributes;
    51 struct Highlight;
    5253}
    5354
    … …  
    5556
    5657class DrawingAreaProxy;
    57 class TextIndicator;
    5858class NativeWebKeyboardEvent;
    5959class RemoteLayerTreeTransaction;
    … …  
    215215#endif
    216216
    217     virtual void setTextIndicator(PassRefPtr<TextIndicator>, bool fadeOut) = 0;
     217    virtual void setTextIndicator(PassRefPtr<WebCore::TextIndicator>, bool fadeOut) = 0;
    218218
    219219    virtual void enterAcceleratedCompositingMode(const LayerTreeContext&) = 0;

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r176408 r176462  
    5555#include "TextChecker.h"
    5656#include "TextCheckerState.h"
    57 #include "TextIndicator.h"
    5857#include "UserMediaPermissionRequestProxy.h"
    5958#include "WKContextPrivate.h"
    … …  
    9897#include <WebCore/SerializedCryptoKeyWrap.h>
    9998#include <WebCore/TextCheckerClient.h>
     99#include <WebCore/TextIndicator.h>
    100100#include <WebCore/WindowFeatures.h>
    101101#include <stdio.h>
    … …  
    36593659}
    36603660
    3661 void WebPageProxy::setTextIndicator(const TextIndicator::Data& indicatorData, bool fadeOut)
     3661void WebPageProxy::setTextIndicator(const TextIndicatorData& indicatorData, bool fadeOut)
    36623662{
    36633663    m_pageClient.setTextIndicator(TextIndicator::create(indicatorData), fadeOut);

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r176408 r176462  
    131131class RunLoopObserver;
    132132class SharedBuffer;
     133class TextIndicator;
    133134struct FileChooserSettings;
    134135struct TextAlternativeWithRange;
    … …  
    156157class RemoteScrollingCoordinatorProxy;
    157158class StringPairVector;
    158 class TextIndicator;
    159159class ViewSnapshot;
    160160class VisitedLinkProvider;
    … …  
    669669    void countStringMatches(const String&, FindOptions, unsigned maxMatchCount);
    670670    void didCountStringMatches(const String&, uint32_t matchCount);
    671     void setTextIndicator(const TextIndicator::Data&, bool fadeOut);
     671    void setTextIndicator(const WebCore::TextIndicatorData&, bool fadeOut);
    672672    void clearTextIndicator();
    673673    void didFindString(const String&, uint32_t matchCount, int32_t matchIndex);

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

    r176363 r176462  
    228228    # Find messages
    229229    DidCountStringMatches(String string, uint32_t matchCount)
    230     SetTextIndicator(WebKit::TextIndicator::Data indicator, bool fadeOut)
     230    SetTextIndicator(WebCore::TextIndicatorData indicator, bool fadeOut)
    231231    ClearTextIndicator()
    232232    DidFindString(String string, uint32_t matchCount, int32_t matchIndex)

  • trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h

    r176363 r176462  
    9797    virtual PassRefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*) override;
    9898    virtual PassRefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*) override;
    99     virtual void setTextIndicator(PassRefPtr<TextIndicator>, bool fadeOut) override;
     99    virtual void setTextIndicator(PassRefPtr<WebCore::TextIndicator>, bool fadeOut) override;
    100100
    101101    virtual void enterAcceleratedCompositingMode(const LayerTreeContext&) override;

  • trunk/Source/WebKit2/UIProcess/ios/WKContentView.h

    r175476 r176462  
    4242class GeolocationPermissionRequestProxy;
    4343class RemoteLayerTreeTransaction;
    44 class TextIndicator;
    4544class WebContext;
    4645class WebFrameProxy;

  • trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h

    r176363 r176462  
    4343
    4444namespace WebKit {
    45 class TextIndicatorWindow;
    4645
    4746class PageClientImpl final : public PageClient
    … …  
    121120#endif
    122121
    123     void setTextIndicator(PassRefPtr<TextIndicator>, bool fadeOut);
     122    void setTextIndicator(PassRefPtr<WebCore::TextIndicator>, bool fadeOut);
    124123
    125124    virtual void enterAcceleratedCompositingMode(const LayerTreeContext&);

  • trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm

    r176363 r176462  
    3838#import "NavigationState.h"
    3939#import "StringUtilities.h"
    40 #import "TextIndicator.h"
    4140#import "ViewSnapshotStore.h"
    4241#import "WKAPICast.h"
    … …  
    6261#import <WebCore/NotImplemented.h>
    6362#import <WebCore/SharedBuffer.h>
     63#import <WebCore/TextIndicator.h>
    6464#import <WebCore/TextUndoInsertionMarkupMac.h>
    6565#import <WebKitSystemInterface.h>

  • trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm

    r176460 r176462  
    2929#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
    3030
    31 #import "TextIndicator.h"
    3231#import "WKNSURLExtras.h"
    3332#import "WKViewInternal.h"
    … …  
    5150#import <WebCore/NSViewSPI.h>
    5251#import <WebCore/SoftLinking.h>
     52#import <WebCore/TextIndicator.h>
    5353#import <WebCore/URL.h>
    5454
    … …  
    653653    NSArray *menuItems = [[getDDActionsManagerClass() sharedManager] menuItemsForResult:[_currentActionContext mainResult] actionContext:_currentActionContext.get()];
    654654    if (menuItems.count == 1 && _hitTestResult.detectedDataTextIndicator)
    655         _hitTestResult.detectedDataTextIndicator->setPresentationTransition(TextIndicator::PresentationTransition::Bounce);
     655        _hitTestResult.detectedDataTextIndicator->setPresentationTransition(TextIndicatorPresentationTransition::Bounce);
    656656    return menuItems;
    657657}

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r176362 r176462  
    111111                0FCB4E5418BBE044000FCFC9 /* WKScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E4418BBE044000FCFC9 /* WKScrollView.h */; };
    112112                0FCB4E5518BBE044000FCFC9 /* WKScrollView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E4518BBE044000FCFC9 /* WKScrollView.mm */; };
    113                 0FCB4E6018BBE3D9000FCFC9 /* TextIndicatorWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E5618BBE3D9000FCFC9 /* TextIndicatorWindow.h */; };
    114                 0FCB4E6118BBE3D9000FCFC9 /* TextIndicatorWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E5718BBE3D9000FCFC9 /* TextIndicatorWindow.mm */; };
    115113                0FCB4E6218BBE3D9000FCFC9 /* PageClientImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E5818BBE3D9000FCFC9 /* PageClientImpl.h */; };
    116114                0FCB4E6318BBE3D9000FCFC9 /* PageClientImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E5918BBE3D9000FCFC9 /* PageClientImpl.mm */; };
    … …  
    309307                1A90C1F41264FD71003E44D4 /* FindController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A90C1F21264FD71003E44D4 /* FindController.h */; };
    310308                1A90C1F51264FD71003E44D4 /* FindController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A90C1F31264FD71003E44D4 /* FindController.cpp */; };
    311                 1A910071126675C4001842F5 /* TextIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A91006F126675C3001842F5 /* TextIndicator.h */; };
    312                 1A910072126675C4001842F5 /* TextIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A910070126675C4001842F5 /* TextIndicator.cpp */; };
    313309                1A92DC1112F8BA460017AF65 /* LayerTreeContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */; };
    314310                1A92DC1312F8BAB90017AF65 /* LayerTreeContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A92DC1212F8BAB90017AF65 /* LayerTreeContext.cpp */; };
    … …  
    20722068                0FCB4E4418BBE044000FCFC9 /* WKScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKScrollView.h; path = ios/WKScrollView.h; sourceTree = "<group>"; };
    20732069                0FCB4E4518BBE044000FCFC9 /* WKScrollView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKScrollView.mm; path = ios/WKScrollView.mm; sourceTree = "<group>"; };
    2074                 0FCB4E5618BBE3D9000FCFC9 /* TextIndicatorWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextIndicatorWindow.h; sourceTree = "<group>"; };
    2075                 0FCB4E5718BBE3D9000FCFC9 /* TextIndicatorWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextIndicatorWindow.mm; sourceTree = "<group>"; };
    20762070                0FCB4E5818BBE3D9000FCFC9 /* PageClientImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageClientImpl.h; sourceTree = "<group>"; };
    20772071                0FCB4E5918BBE3D9000FCFC9 /* PageClientImpl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageClientImpl.mm; sourceTree = "<group>"; };
    … …  
    22952289                1A90C1F21264FD71003E44D4 /* FindController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FindController.h; sourceTree = "<group>"; };
    22962290                1A90C1F31264FD71003E44D4 /* FindController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FindController.cpp; sourceTree = "<group>"; };
    2297                 1A91006F126675C3001842F5 /* TextIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextIndicator.h; sourceTree = "<group>"; };
    2298                 1A910070126675C4001842F5 /* TextIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextIndicator.cpp; sourceTree = "<group>"; };
    22992291                1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerTreeContext.h; sourceTree = "<group>"; };
    23002292                1A92DC1212F8BAB90017AF65 /* LayerTreeContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayerTreeContext.cpp; sourceTree = "<group>"; };
    … …  
    44944486                                5272B2891406985D0096A5D0 /* StatisticsData.h */,
    44954487                                1A5E4DA312D3BD3D0099A2BB /* TextCheckerState.h */,
    4496                                 1A910070126675C4001842F5 /* TextIndicator.cpp */,
    4497                                 1A91006F126675C3001842F5 /* TextIndicator.h */,
    44984488                                1A64245D12DE29A100CAAE2C /* UpdateInfo.cpp */,
    44994489                                1A64245C12DE29A100CAAE2C /* UpdateInfo.h */,
    … …  
    66426632                                B878B613133428DC006888E9 /* CorrectionPanel.h */,
    66436633                                B878B614133428DC006888E9 /* CorrectionPanel.mm */,
    6644                                 0FCB4E5618BBE3D9000FCFC9 /* TextIndicatorWindow.h */,
    6645                                 0FCB4E5718BBE3D9000FCFC9 /* TextIndicatorWindow.mm */,
    66466634                                1AFDE65B1954E8D500C48FFA /* LegacySessionStateCoding.cpp */,
    66476635                                0FCB4E5818BBE3D9000FCFC9 /* PageClientImpl.h */,
    … …  
    72387226                                1AA575FB1496B52600A4EE06 /* EventDispatcher.h in Headers */,
    72397227                                1A90C1F41264FD71003E44D4 /* FindController.h in Headers */,
    7240                                 1A910071126675C4001842F5 /* TextIndicator.h in Headers */,
    72417228                                515E7728183DD6F60007203F /* AsyncRequest.h in Headers */,
    72427229                                BCE81D8D1319F7EF00241910 /* FontInfo.h in Headers */,
    … …  
    72867273                                BC33E0D112408E8600360F3F /* InjectedBundleRangeHandle.h in Headers */,
    72877274                                A115DC72191D82DA00DA8072 /* _WKWebViewPrintFormatter.h in Headers */,
    7288                                 0FCB4E6018BBE3D9000FCFC9 /* TextIndicatorWindow.h in Headers */,
    72897275                                BC14DF77120B5B7900826C0C /* InjectedBundleScriptWorld.h in Headers */,
    72907276                                BCB0B0DE12305A8C00B1341E /* InjectedBundleUserMessageCoders.h in Headers */,
    … …  
    89018887                                1A1E093318861D3800D2DC49 /* WebProgressTrackerClient.cpp in Sources */,
    89028888                                1A90C1F51264FD71003E44D4 /* FindController.cpp in Sources */,
    8903                                 1A910072126675C4001842F5 /* TextIndicator.cpp in Sources */,
    89048889                                BCE81D8C1319F7EF00241910 /* FontInfo.cpp in Sources */,
    89058890                                378E1A4918208CD60031007A /* WKNSString.mm in Sources */,
    … …  
    94079392                                BCBAACF51452324F0053F82F /* WKBrowsingContextGroup.mm in Sources */,
    94089393                                51290992183ACEAF005522A6 /* WebIDBServerConnection.cpp in Sources */,
    9409                                 0FCB4E6118BBE3D9000FCFC9 /* TextIndicatorWindow.mm in Sources */,
    94109394                                BC204EEE11C83EC8008F3375 /* WKBundle.cpp in Sources */,
    94119395                                7C6E70FB18B2DC7A00F24E2E /* WebProcessCocoa.mm in Sources */,

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm

    r176363 r176462  
    3030
    3131#import "DictionaryPopupInfo.h"
    32 #import "TextIndicator.h"
    3332#import "WebCoreArgumentCoders.h"
    3433#import "WebPage.h"
    … …  
    3736#import <WebCore/MainFrame.h>
    3837#import <WebCore/Page.h>
     38#import <WebCore/TextIndicator.h>
    3939#import <wtf/text/WTFString.h>
    4040
    … …  
    4545void WebContextMenuClient::lookUpInDictionary(Frame* frame)
    4646{
    47     m_page->performDictionaryLookupForSelection(frame, frame->selection().selection(), TextIndicator::PresentationTransition::BounceAndCrossfade);
     47    m_page->performDictionaryLookupForSelection(frame, frame->selection().selection(), TextIndicatorPresentationTransition::BounceAndCrossfade);
    4848}
    4949

  • trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp

    r176363 r176462  
    3030#include "PluginView.h"
    3131#include "ShareableBitmap.h"
    32 #include "TextIndicator.h"
    3332#include "WKPage.h"
    3433#include "WebCoreArgumentCoders.h"
    … …  
    4544#include <WebCore/PlatformMouseEvent.h>
    4645#include <WebCore/PluginDocument.h>
     46#include <WebCore/TextIndicator.h>
    4747
    4848using namespace WebCore;
    … …  
    315315bool FindController::updateFindIndicator(Frame& selectedFrame, bool isShowingOverlay, bool shouldAnimate)
    316316{
    317     RefPtr<TextIndicator> indicator = TextIndicator::createWithSelectionInFrame(*WebFrame::fromCoreFrame(selectedFrame), shouldAnimate ? TextIndicator::PresentationTransition::Bounce : TextIndicator::PresentationTransition::None);
     317    RefPtr<TextIndicator> indicator = TextIndicator::createWithSelectionInFrame(selectedFrame, shouldAnimate ? TextIndicatorPresentationTransition::Bounce : TextIndicatorPresentationTransition::None);
    318318    if (!indicator)
    319319        return false;

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r176437 r176462  
    4545#include "SandboxExtension.h"
    4646#include "ShareableBitmap.h"
    47 #include "TextIndicator.h"
    4847#include "UserMediaPermissionRequestManager.h"
    4948#include <WebCore/DictationAlternative.h>
    … …  
    5958#include <WebCore/ScrollTypes.h>
    6059#include <WebCore/TextChecking.h>
     60#include <WebCore/TextIndicator.h>
    6161#include <WebCore/UserActivity.h>
    6262#include <WebCore/ViewState.h>
    … …  
    674674    void stopSpeaking();
    675675
    676     void performDictionaryLookupForSelection(WebCore::Frame*, const WebCore::VisibleSelection&, TextIndicator::PresentationTransition);
     676    void performDictionaryLookupForSelection(WebCore::Frame*, const WebCore::VisibleSelection&, WebCore::TextIndicatorPresentationTransition);
    677677#endif
    678678
    … …  
    992992    void performDictionaryLookupAtLocation(const WebCore::FloatPoint&);
    993993    void performDictionaryLookupOfCurrentSelection();
    994     void performDictionaryLookupForRange(WebCore::Frame*, WebCore::Range&, NSDictionary *options, TextIndicator::PresentationTransition);
     994    void performDictionaryLookupForRange(WebCore::Frame*, WebCore::Range&, NSDictionary *options, WebCore::TextIndicatorPresentationTransition);
    995995
    996996    void windowAndViewFramesChanged(const WebCore::FloatRect& windowFrameInScreenCoordinates, const WebCore::FloatRect& windowFrameInUnflippedScreenCoordinates, const WebCore::FloatRect& viewFrameInWindowCoordinates, const WebCore::FloatPoint& accessibilityViewCoordinates);

  • trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

    r176437 r176462  
    297297}
    298298
    299 void WebPage::performDictionaryLookupForSelection(Frame*, const VisibleSelection&, TextIndicator::PresentationTransition)
     299void WebPage::performDictionaryLookupForSelection(Frame*, const VisibleSelection&, TextIndicatorPresentationTransition)
    300300{
    301301    notImplemented();
    302302}
    303303
    304 void WebPage::performDictionaryLookupForRange(Frame*, Range&, NSDictionary *, TextIndicator::PresentationTransition)
     304void WebPage::performDictionaryLookupForRange(Frame*, Range&, NSDictionary *, TextIndicatorPresentationTransition)
    305305{
    306306    notImplemented();

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

    r176412 r176462  
    495495        return;
    496496
    497     performDictionaryLookupForRange(frame, *range, options, TextIndicator::PresentationTransition::Bounce);
    498 }
    499 
    500 void WebPage::performDictionaryLookupForSelection(Frame* frame, const VisibleSelection& selection, TextIndicator::PresentationTransition presentationTransition)
     497    performDictionaryLookupForRange(frame, *range, options, TextIndicatorPresentationTransition::Bounce);
     498}
     499
     500void WebPage::performDictionaryLookupForSelection(Frame* frame, const VisibleSelection& selection, TextIndicatorPresentationTransition presentationTransition)
    501501{
    502502    NSDictionary *options = nil;
    … …  
    509509{
    510510    Frame* frame = &m_page->focusController().focusedOrMainFrame();
    511     performDictionaryLookupForSelection(frame, frame->selection().selection(), TextIndicator::PresentationTransition::BounceAndCrossfade);
    512 }
    513 
    514 void WebPage::performDictionaryLookupForRange(Frame* frame, Range& range, NSDictionary *options, TextIndicator::PresentationTransition presentationTransition)
     511    performDictionaryLookupForSelection(frame, frame->selection().selection(), TextIndicatorPresentationTransition::BounceAndCrossfade);
     512}
     513
     514void WebPage::performDictionaryLookupForRange(Frame* frame, Range& range, NSDictionary *options, TextIndicatorPresentationTransition presentationTransition)
    515515{
    516516    if (range.text().stripWhiteSpace().isEmpty())
    … …  
    10411041
    10421042        actionMenuResult.detectedDataBoundingBox = detectedDataBoundingBox;
    1043         actionMenuResult.detectedDataTextIndicator = TextIndicator::createWithRange(*mainResultRange, TextIndicator::PresentationTransition::BounceAndCrossfade);
     1043        actionMenuResult.detectedDataTextIndicator = TextIndicator::createWithRange(*mainResultRange, TextIndicatorPresentationTransition::BounceAndCrossfade);
    10441044        actionMenuResult.detectedDataOriginatingPageOverlay = overlay->pageOverlayID();
    10451045        m_lastActionMenuRangeForSelection = mainResultRange;
    … …  
    10551055        if (actionMenuResult.actionContext && detectedDataRange) {
    10561056            actionMenuResult.detectedDataBoundingBox = detectedDataBoundingBox;
    1057             actionMenuResult.detectedDataTextIndicator = TextIndicator::createWithRange(*detectedDataRange, TextIndicator::PresentationTransition::BounceAndCrossfade);
     1057            actionMenuResult.detectedDataTextIndicator = TextIndicator::createWithRange(*detectedDataRange, TextIndicatorPresentationTransition::BounceAndCrossfade);
    10581058            m_lastActionMenuRangeForSelection = detectedDataRange;
    10591059        }
Note: See TracChangeset for help on using the changeset viewer.