Changeset 175570 in webkit


Ignore:
Timestamp:
Nov 4, 2014, 12:35:37 PM (11 years ago)
Author:
dburkart@apple.com
Message:

Merge r175476. <rdar://problem/18855190>

Location:
branches/safari-600.3-branch/Source/WebKit2
Files:
4 deleted
15 edited
4 copied

Legend:

Unmodified
Added
Removed

  • branches/safari-600.3-branch/Source/WebKit2/CMakeLists.txt

    r175296 r175570  
    294294    UIProcess/BackingStore.cpp
    295295    UIProcess/DrawingAreaProxy.cpp
    296     UIProcess/FindIndicator.cpp
    297296    UIProcess/FrameLoadState.cpp
    298297    UIProcess/GeolocationPermissionRequestManagerProxy.cpp
    … …  
    305304    UIProcess/StatisticsRequest.cpp
    306305    UIProcess/TextCheckerCompletion.cpp
     306    UIProcess/TextIndicator.cpp
    307307    UIProcess/VisitedLinkProvider.cpp
    308308    UIProcess/WebApplicationCacheManagerProxy.cpp

  • branches/safari-600.3-branch/Source/WebKit2/ChangeLog

    r175567 r175570  
     12014-11-04  Dana Burkart  <dburkart@apple.com>
     2
     3        Merge r175476. <rdar://problem/18855190>
     4
     5    2014-11-03  Tim Horton  <timothy_horton@apple.com>
     6   
     7            Rename FindIndicator{Window} to TextIndicator{Window}
     8            https://bugs.webkit.org/show_bug.cgi?id=138302
     9            <rdar://problem/18855190>
     10   
     11            Reviewed by Anders Carlsson.
     12   
     13            Rename FindIndicator{Window} to TextIndicator{Window} (and related),
     14            because it will soon be used to indicate ranges of text that are not
     15            necessarily find-in-page results.
     16   
     17            FindController still has things named 'findIndicator' internally,
     18            and I left the API alone (because all the API bits are actually find-specific),
     19            but the actual FindIndicator/Window and the message to set it up, etc. are all
     20            now called Text*.
     21   
     22            * CMakeLists.txt:
     23            * UIProcess/API/mac/WKView.mm:
     24            * UIProcess/API/mac/WKViewInternal.h:
     25            * UIProcess/PageClient.h:
     26            * UIProcess/TextIndicator.cpp: Renamed from Source/WebKit2/UIProcess/FindIndicator.cpp.
     27            * UIProcess/TextIndicator.h: Renamed from Source/WebKit2/UIProcess/FindIndicator.h.
     28            * UIProcess/WebPageProxy.cpp:
     29            * UIProcess/WebPageProxy.h:
     30            * UIProcess/WebPageProxy.messages.in:
     31            * UIProcess/ios/PageClientImplIOS.h:
     32            * UIProcess/ios/PageClientImplIOS.mm:
     33            * UIProcess/ios/WKContentView.h:
     34            * UIProcess/mac/PageClientImpl.h:
     35            * UIProcess/mac/PageClientImpl.mm:
     36            * UIProcess/mac/TextIndicatorWindow.h: Renamed from Source/WebKit2/UIProcess/mac/FindIndicatorWindow.h.
     37            * UIProcess/mac/TextIndicatorWindow.mm: Renamed from Source/WebKit2/UIProcess/mac/FindIndicatorWindow.mm.
     38            * WebKit2.xcodeproj/project.pbxproj:
     39            * WebProcess/WebPage/FindController.cpp:
     40   
    1412014-11-04  Matthew Hanson  <matthew_hanson@apple.com>
    242

  • branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm

    r175567 r175570  
    4141#import "EditingRange.h"
    4242#import "EditorState.h"
    43 #import "FindIndicator.h"
    44 #import "FindIndicatorWindow.h"
    4543#import "LayerTreeContext.h"
    4644#import "Logging.h"
    … …  
    5452#import "TextChecker.h"
    5553#import "TextCheckerState.h"
     54#import "TextIndicator.h"
     55#import "TextIndicatorWindow.h"
    5656#import "TiledCoreAnimationDrawingAreaProxy.h"
    5757#import "ViewGestureController.h"
    … …  
    183183    ValidationMap _validationMap;
    184184
    185     std::unique_ptr<FindIndicatorWindow> _findIndicatorWindow;
     185    std::unique_ptr<TextIndicatorWindow> _textIndicatorWindow;
    186186
    187187    // We keep here the event when resending it to
    … …  
    493493{
    494494    // Hide the find indicator.
    495     _data->_findIndicatorWindow = nullptr;
     495    _data->_textIndicatorWindow = nullptr;
    496496
    497497    // Update the view frame.
    … …  
    30423042}
    30433043
    3044 - (void)_setFindIndicator:(PassRefPtr<FindIndicator>)findIndicator fadeOut:(BOOL)fadeOut animate:(BOOL)animate
    3045 {
    3046     if (!findIndicator) {
    3047         _data->_findIndicatorWindow = nullptr;
    3048         return;
    3049     }
    3050 
    3051     if (!_data->_findIndicatorWindow)
    3052         _data->_findIndicatorWindow = std::make_unique<FindIndicatorWindow>(self);
    3053 
    3054     _data->_findIndicatorWindow->setFindIndicator(findIndicator, fadeOut, animate);
     3044- (void)_setTextIndicator:(PassRefPtr<TextIndicator>)textIndicator fadeOut:(BOOL)fadeOut animate:(BOOL)animate
     3045{
     3046    if (!textIndicator) {
     3047        _data->_textIndicatorWindow = nullptr;
     3048        return;
     3049    }
     3050
     3051    if (!_data->_textIndicatorWindow)
     3052        _data->_textIndicatorWindow = std::make_unique<TextIndicatorWindow>(self);
     3053
     3054    _data->_textIndicatorWindow->setTextIndicator(textIndicator, fadeOut, animate);
    30553055}
    30563056

  • branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h

    r175567 r175570  
    4747namespace WebKit {
    4848class DrawingAreaProxy;
    49 class FindIndicator;
    5049class LayerTreeContext;
     50class TextIndicator;
    5151class ViewSnapshot;
    5252class WebContext;
    … …  
    8181- (NSRect)_convertToDeviceSpace:(NSRect)rect;
    8282- (NSRect)_convertToUserSpace:(NSRect)rect;
    83 - (void)_setFindIndicator:(PassRefPtr<WebKit::FindIndicator>)findIndicator fadeOut:(BOOL)fadeOut animate:(BOOL)animate;
     83- (void)_setTextIndicator:(PassRefPtr<WebKit::TextIndicator>)textIndicator fadeOut:(BOOL)fadeOut animate:(BOOL)animate;
    8484
    8585- (void)_setAcceleratedCompositingModeRootLayer:(CALayer *)rootLayer;

  • branches/safari-600.3-branch/Source/WebKit2/UIProcess/PageClient.h

    r175567 r175570  
    5555
    5656class DrawingAreaProxy;
    57 class FindIndicator;
     57class TextIndicator;
    5858class NativeWebKeyboardEvent;
    5959class RemoteLayerTreeTransaction;
    … …  
    215215#endif
    216216
    217     virtual void setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut, bool animate) = 0;
     217    virtual void setTextIndicator(PassRefPtr<TextIndicator>, bool fadeOut, bool animate) = 0;
    218218
    219219    virtual void enterAcceleratedCompositingMode(const LayerTreeContext&) = 0;

  • branches/safari-600.3-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r175567 r175570  
    4242#include "DrawingAreaProxyMessages.h"
    4343#include "EventDispatcherMessages.h"
    44 #include "FindIndicator.h"
    4544#include "Logging.h"
    4645#include "NativeWebKeyboardEvent.h"
    … …  
    5655#include "TextChecker.h"
    5756#include "TextCheckerState.h"
     57#include "TextIndicator.h"
    5858#include "WKContextPrivate.h"
    5959#include "WebBackForwardList.h"
    … …  
    35493549}
    35503550
    3551 void WebPageProxy::setFindIndicator(const FloatRect& selectionRectInWindowCoordinates, const Vector<FloatRect>& textRectsInSelectionRectCoordinates, float contentImageScaleFactor, const ShareableBitmap::Handle& contentImageHandle, bool fadeOut, bool animate)
    3552 {
    3553     RefPtr<FindIndicator> findIndicator = FindIndicator::create(selectionRectInWindowCoordinates, textRectsInSelectionRectCoordinates, contentImageScaleFactor, contentImageHandle);
    3554     m_pageClient.setFindIndicator(findIndicator.release(), fadeOut, animate);
     3551void WebPageProxy::setTextIndicator(const FloatRect& selectionRectInWindowCoordinates, const Vector<FloatRect>& textRectsInSelectionRectCoordinates, float contentImageScaleFactor, const ShareableBitmap::Handle& contentImageHandle, bool fadeOut, bool animate)
     3552{
     3553    RefPtr<TextIndicator> textIndicator = TextIndicator::create(selectionRectInWindowCoordinates, textRectsInSelectionRectCoordinates, contentImageScaleFactor, contentImageHandle);
     3554    m_pageClient.setTextIndicator(textIndicator.release(), fadeOut, animate);
    35553555}
    35563556

  • branches/safari-600.3-branch/Source/WebKit2/UIProcess/WebPageProxy.h

    r175567 r175570  
    657657    void countStringMatches(const String&, FindOptions, unsigned maxMatchCount);
    658658    void didCountStringMatches(const String&, uint32_t matchCount);
    659     void setFindIndicator(const WebCore::FloatRect& selectionRectInWindowCoordinates, const Vector<WebCore::FloatRect>& textRectsInSelectionRectCoordinates, float contentImageScaleFactor, const ShareableBitmap::Handle& contentImageHandle, bool fadeOut, bool animate);
     659    void setTextIndicator(const WebCore::FloatRect& selectionRectInWindowCoordinates, const Vector<WebCore::FloatRect>& textRectsInSelectionRectCoordinates, float contentImageScaleFactor, const ShareableBitmap::Handle& contentImageHandle, bool fadeOut, bool animate);
    660660    void didFindString(const String&, uint32_t matchCount, int32_t matchIndex);
    661661    void didFailToFindString(const String&);

  • branches/safari-600.3-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in

    r175567 r175570  
    224224    # Find messages
    225225    DidCountStringMatches(String string, uint32_t matchCount)
    226     SetFindIndicator(WebCore::FloatRect selectionRect, Vector<WebCore::FloatRect> textRects, float contentImageScaleFactor, WebKit::ShareableBitmap::Handle contentImageHandle, bool fadeOut, bool animate)
     226    SetTextIndicator(WebCore::FloatRect selectionRect, Vector<WebCore::FloatRect> textRects, float contentImageScaleFactor, WebKit::ShareableBitmap::Handle contentImageHandle, bool fadeOut, bool animate)
    227227    DidFindString(String string, uint32_t matchCount, int32_t matchIndex)
    228228    DidFailToFindString(String string)

  • branches/safari-600.3-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h

    r175124 r175570  
    9797    virtual PassRefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*) override;
    9898    virtual PassRefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*) override;
    99     virtual void setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut, bool animate) override;
     99    virtual void setTextIndicator(PassRefPtr<TextIndicator>, bool fadeOut, bool animate) override;
    100100
    101101    virtual void enterAcceleratedCompositingMode(const LayerTreeContext&) override;

  • branches/safari-600.3-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm

    r175124 r175570  
    3232#import "DataReference.h"
    3333#import "DownloadProxy.h"
    34 #import "FindIndicator.h"
    3534#import "InteractionInformationAtPosition.h"
    3635#import "NativeWebKeyboardEvent.h"
    3736#import "NavigationState.h"
     37#import "TextIndicator.h"
    3838#import "ViewSnapshotStore.h"
    3939#import "WKContentView.h"
    … …  
    439439}
    440440
    441 void PageClientImpl::setFindIndicator(PassRefPtr<FindIndicator> findIndicator, bool fadeOut, bool animate)
     441void PageClientImpl::setTextIndicator(PassRefPtr<TextIndicator> textIndicator, bool fadeOut, bool animate)
    442442{
    443443}

  • branches/safari-600.3-branch/Source/WebKit2/UIProcess/ios/WKContentView.h

    r171664 r175570  
    4040namespace WebKit {
    4141class DrawingAreaProxy;
    42 class FindIndicator;
    4342class GeolocationPermissionRequestProxy;
    4443class RemoteLayerTreeTransaction;
     44class TextIndicator;
    4545class WebContext;
    4646class WebFrameProxy;

  • branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.h

    r175567 r175570  
    4343
    4444namespace WebKit {
    45 class FindIndicatorWindow;
     45class TextIndicatorWindow;
    4646
    4747class PageClientImpl final : public PageClient
    … …  
    121121#endif
    122122
    123     void setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut, bool animate);
     123    void setTextIndicator(PassRefPtr<TextIndicator>, bool fadeOut, bool animate);
    124124
    125125    virtual void enterAcceleratedCompositingMode(const LayerTreeContext&);

  • branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm

    r175567 r175570  
    3434#import "DictionaryPopupInfo.h"
    3535#import "DownloadProxy.h"
    36 #import "FindIndicator.h"
    3736#import "NativeWebKeyboardEvent.h"
    3837#import "NativeWebWheelEvent.h"
    3938#import "NavigationState.h"
    4039#import "StringUtilities.h"
     40#import "TextIndicator.h"
    4141#import "ViewSnapshotStore.h"
    4242#import "WKAPICast.h"
    … …  
    468468#endif
    469469
    470 void PageClientImpl::setFindIndicator(PassRefPtr<FindIndicator> findIndicator, bool fadeOut, bool animate)
    471 {
    472     [m_wkView _setFindIndicator:findIndicator fadeOut:fadeOut animate:animate];
     470void PageClientImpl::setTextIndicator(PassRefPtr<TextIndicator> textIndicator, bool fadeOut, bool animate)
     471{
     472    [m_wkView _setTextIndicator:textIndicator fadeOut:fadeOut animate:animate];
    473473}
    474474

  • branches/safari-600.3-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r175566 r175570  
    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 /* FindIndicatorWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E5618BBE3D9000FCFC9 /* FindIndicatorWindow.h */; };
    114                 0FCB4E6118BBE3D9000FCFC9 /* FindIndicatorWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E5718BBE3D9000FCFC9 /* FindIndicatorWindow.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 */; };
    115115                0FCB4E6218BBE3D9000FCFC9 /* PageClientImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E5818BBE3D9000FCFC9 /* PageClientImpl.h */; };
    116116                0FCB4E6318BBE3D9000FCFC9 /* PageClientImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E5918BBE3D9000FCFC9 /* PageClientImpl.mm */; };
    … …  
    308308                1A90C1F41264FD71003E44D4 /* FindController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A90C1F21264FD71003E44D4 /* FindController.h */; };
    309309                1A90C1F51264FD71003E44D4 /* FindController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A90C1F31264FD71003E44D4 /* FindController.cpp */; };
    310                 1A910071126675C4001842F5 /* FindIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A91006F126675C3001842F5 /* FindIndicator.h */; };
    311                 1A910072126675C4001842F5 /* FindIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A910070126675C4001842F5 /* FindIndicator.cpp */; };
     310                1A910071126675C4001842F5 /* TextIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A91006F126675C3001842F5 /* TextIndicator.h */; };
     311                1A910072126675C4001842F5 /* TextIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A910070126675C4001842F5 /* TextIndicator.cpp */; };
    312312                1A92DC1112F8BA460017AF65 /* LayerTreeContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */; };
    313313                1A92DC1312F8BAB90017AF65 /* LayerTreeContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A92DC1212F8BAB90017AF65 /* LayerTreeContext.cpp */; };
    … …  
    20622062                0FCB4E4418BBE044000FCFC9 /* WKScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKScrollView.h; path = ios/WKScrollView.h; sourceTree = "<group>"; };
    20632063                0FCB4E4518BBE044000FCFC9 /* WKScrollView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKScrollView.mm; path = ios/WKScrollView.mm; sourceTree = "<group>"; };
    2064                 0FCB4E5618BBE3D9000FCFC9 /* FindIndicatorWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FindIndicatorWindow.h; sourceTree = "<group>"; };
    2065                 0FCB4E5718BBE3D9000FCFC9 /* FindIndicatorWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FindIndicatorWindow.mm; sourceTree = "<group>"; };
     2064                0FCB4E5618BBE3D9000FCFC9 /* TextIndicatorWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextIndicatorWindow.h; sourceTree = "<group>"; };
     2065                0FCB4E5718BBE3D9000FCFC9 /* TextIndicatorWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextIndicatorWindow.mm; sourceTree = "<group>"; };
    20662066                0FCB4E5818BBE3D9000FCFC9 /* PageClientImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageClientImpl.h; sourceTree = "<group>"; };
    20672067                0FCB4E5918BBE3D9000FCFC9 /* PageClientImpl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageClientImpl.mm; sourceTree = "<group>"; };
    … …  
    22842284                1A90C1F21264FD71003E44D4 /* FindController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FindController.h; sourceTree = "<group>"; };
    22852285                1A90C1F31264FD71003E44D4 /* FindController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FindController.cpp; sourceTree = "<group>"; };
    2286                 1A91006F126675C3001842F5 /* FindIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FindIndicator.h; sourceTree = "<group>"; };
    2287                 1A910070126675C4001842F5 /* FindIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FindIndicator.cpp; sourceTree = "<group>"; };
     2286                1A91006F126675C3001842F5 /* TextIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextIndicator.h; sourceTree = "<group>"; };
     2287                1A910070126675C4001842F5 /* TextIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextIndicator.cpp; sourceTree = "<group>"; };
    22882288                1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerTreeContext.h; sourceTree = "<group>"; };
    22892289                1A92DC1212F8BAB90017AF65 /* LayerTreeContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayerTreeContext.cpp; sourceTree = "<group>"; };
    … …  
    57995799                                BC2652131182608100243E12 /* DrawingAreaProxy.h */,
    58005800                                1A6422FC12DD08FE00CAAE2C /* DrawingAreaProxy.messages.in */,
    5801                                 1A910070126675C4001842F5 /* FindIndicator.cpp */,
     5801                                1A910070126675C4001842F5 /* TextIndicator.cpp */,
    58025802                                1AE00D5E1831792100087DD7 /* FrameLoadState.cpp */,
    58035803                                1AE00D5F1831792100087DD7 /* FrameLoadState.h */,
    5804                                 1A91006F126675C3001842F5 /* FindIndicator.h */,
     5804                                1A91006F126675C3001842F5 /* TextIndicator.h */,
    58055805                                BC17753E118BABF0007D9E9A /* GenericCallback.h */,
    58065806                                BC06F44912DBD1F5002D78DE /* GeolocationPermissionRequestManagerProxy.cpp */,
    … …  
    66066606                                B878B613133428DC006888E9 /* CorrectionPanel.h */,
    66076607                                B878B614133428DC006888E9 /* CorrectionPanel.mm */,
    6608                                 0FCB4E5618BBE3D9000FCFC9 /* FindIndicatorWindow.h */,
    6609                                 0FCB4E5718BBE3D9000FCFC9 /* FindIndicatorWindow.mm */,
     6608                                0FCB4E5618BBE3D9000FCFC9 /* TextIndicatorWindow.h */,
     6609                                0FCB4E5718BBE3D9000FCFC9 /* TextIndicatorWindow.mm */,
    66106610                                1AFDE65B1954E8D500C48FFA /* LegacySessionStateCoding.cpp */,
    66116611                                0FCB4E5818BBE3D9000FCFC9 /* PageClientImpl.h */,
    … …  
    71827182                                1AA575FB1496B52600A4EE06 /* EventDispatcher.h in Headers */,
    71837183                                1A90C1F41264FD71003E44D4 /* FindController.h in Headers */,
    7184                                 1A910071126675C4001842F5 /* FindIndicator.h in Headers */,
     7184                                1A910071126675C4001842F5 /* TextIndicator.h in Headers */,
    71857185                                515E7728183DD6F60007203F /* AsyncRequest.h in Headers */,
    71867186                                BCE81D8D1319F7EF00241910 /* FontInfo.h in Headers */,
    … …  
    72317231                                BC33E0D112408E8600360F3F /* InjectedBundleRangeHandle.h in Headers */,
    72327232                                A115DC72191D82DA00DA8072 /* _WKWebViewPrintFormatter.h in Headers */,
    7233                                 0FCB4E6018BBE3D9000FCFC9 /* FindIndicatorWindow.h in Headers */,
     7233                                0FCB4E6018BBE3D9000FCFC9 /* TextIndicatorWindow.h in Headers */,
    72347234                                BC14DF77120B5B7900826C0C /* InjectedBundleScriptWorld.h in Headers */,
    72357235                                BCB0B0DE12305A8C00B1341E /* InjectedBundleUserMessageCoders.h in Headers */,
    … …  
    88588858                                1A1E093318861D3800D2DC49 /* WebProgressTrackerClient.cpp in Sources */,
    88598859                                1A90C1F51264FD71003E44D4 /* FindController.cpp in Sources */,
    8860                                 1A910072126675C4001842F5 /* FindIndicator.cpp in Sources */,
     8860                                1A910072126675C4001842F5 /* TextIndicator.cpp in Sources */,
    88618861                                BCE81D8C1319F7EF00241910 /* FontInfo.cpp in Sources */,
    88628862                                378E1A4918208CD60031007A /* WKNSString.mm in Sources */,
    … …  
    93609360                                BCBAACF51452324F0053F82F /* WKBrowsingContextGroup.mm in Sources */,
    93619361                                51290992183ACEAF005522A6 /* WebIDBServerConnection.cpp in Sources */,
    9362                                 0FCB4E6118BBE3D9000FCFC9 /* FindIndicatorWindow.mm in Sources */,
     9362                                0FCB4E6118BBE3D9000FCFC9 /* TextIndicatorWindow.mm in Sources */,
    93639363                                BC204EEE11C83EC8008F3375 /* WKBundle.cpp in Sources */,
    93649364                                7C6E70FB18B2DC7A00F24E2E /* WebProcessCocoa.mm in Sources */,

  • branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/FindController.cpp

    r175296 r175570  
    369369    }           
    370370
    371     m_webPage->send(Messages::WebPageProxy::SetFindIndicator(selectionRectInWindowCoordinates, textRectsInSelectionRectCoordinates, m_webPage->corePage()->deviceScaleFactor(), handle, !isShowingOverlay, shouldAnimate));
     371    m_webPage->send(Messages::WebPageProxy::SetTextIndicator(selectionRectInWindowCoordinates, textRectsInSelectionRectCoordinates, m_webPage->corePage()->deviceScaleFactor(), handle, !isShowingOverlay, shouldAnimate));
    372372    m_findIndicatorRect = selectionRectInWindowCoordinates;
    373373    m_isShowingFindIndicator = true;
    … …  
    382382
    383383    ShareableBitmap::Handle handle;
    384     m_webPage->send(Messages::WebPageProxy::SetFindIndicator(FloatRect(), Vector<FloatRect>(), m_webPage->corePage()->deviceScaleFactor(), handle, false, true));
     384    m_webPage->send(Messages::WebPageProxy::SetTextIndicator(FloatRect(), Vector<FloatRect>(), m_webPage->corePage()->deviceScaleFactor(), handle, false, true));
    385385    m_isShowingFindIndicator = false;
    386386    m_foundStringMatchIndex = -1;
Note: See TracChangeset for help on using the changeset viewer.