Changeset 69878 in webkit


Ignore:
Timestamp:
Oct 15, 2010 2:31:13 PM (13 years ago)
Author:
andersca@apple.com
Message:

Move find indicator window logic to WKView
https://bugs.webkit.org/show_bug.cgi?id=47739

Reviewed by Sam Weinig.

  • UIProcess/API/mac/PageClientImpl.h:
  • UIProcess/API/mac/PageClientImpl.mm:

(WebKit::PageClientImpl::setFindIndicator):
Call -[WKView _setFindIndicator:fadeOut:].

  • UIProcess/API/mac/WKView.mm:

(-[WKView renewGState]):
Hide the find indicator.

(-[WKView _setFindIndicator:fadeOut:]):
Move the find indicator logic here.

Location:
trunk/WebKit2
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit2/ChangeLog

    r69877 r69878  
     12010-10-15  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        Move find indicator window logic to WKView
     6        https://bugs.webkit.org/show_bug.cgi?id=47739
     7
     8        * UIProcess/API/mac/PageClientImpl.h:
     9        * UIProcess/API/mac/PageClientImpl.mm:
     10        (WebKit::PageClientImpl::setFindIndicator):
     11        Call -[WKView _setFindIndicator:fadeOut:].
     12
     13        * UIProcess/API/mac/WKView.mm:
     14        (-[WKView renewGState]):
     15        Hide the find indicator.
     16
     17        (-[WKView _setFindIndicator:fadeOut:]):
     18        Move the find indicator logic here.
     19
    1202010-10-15  Anders Carlsson  <andersca@apple.com>
    221
  • trunk/WebKit2/UIProcess/API/mac/PageClientImpl.h

    r69871 r69878  
    7474    WKView* m_wkView;
    7575    RetainPtr<WebEditorUndoTargetObjC> m_undoTarget;
    76     OwnPtr<FindIndicatorWindow> m_findIndicatorWindow;
    7776};
    7877
  • trunk/WebKit2/UIProcess/API/mac/PageClientImpl.mm

    r69871 r69878  
    2727
    2828#import "FindIndicator.h"
    29 #import "FindIndicatorWindow.h"
    3029#import "WKAPICast.h"
    3130#import "WKStringCF.h"
     
    230229void PageClientImpl::setFindIndicator(PassRefPtr<FindIndicator> findIndicator, bool fadeOut)
    231230{
    232     if (!findIndicator) {
    233         m_findIndicatorWindow = 0;
    234         return;
    235     }
    236 
    237     if (!m_findIndicatorWindow)
    238         m_findIndicatorWindow = FindIndicatorWindow::create(m_wkView);
    239 
    240     m_findIndicatorWindow->setFindIndicator(findIndicator, fadeOut);
     231    [m_wkView _setFindIndicator:findIndicator fadeOut:fadeOut];
    241232}
    242233
  • trunk/WebKit2/UIProcess/API/mac/WKView.mm

    r69694 r69878  
    3131// Implementation
    3232#import "ChunkedUpdateDrawingAreaProxy.h"
     33#import "FindIndicator.h"
     34#import "FindIndicatorWindow.h"
    3335#import "LayerBackedDrawingAreaProxy.h"
    3436#import "NativeWebKeyboardEvent.h"
     
    8486   
    8587    HashMap<String, EditCommandState> _menuMap;
     88
     89    OwnPtr<FindIndicatorWindow> _findIndicatorWindow;
    8690}
    8791@end
     
    175179}
    176180
     181- (void)renewGState
     182{
     183    // Hide the find indicator.
     184    _data->_findIndicatorWindow = 0;
     185
     186    [super renewGState];
     187}
    177188typedef HashMap<SEL, String> SelectorNameMap;
    178189
     
    659670        [self _sendToolTipMouseEntered];
    660671    }
     672}
     673
     674- (void)_setFindIndicator:(PassRefPtr<FindIndicator>)findIndicator fadeOut:(BOOL)fadeOut
     675{
     676    if (!findIndicator) {
     677        _data->_findIndicatorWindow = 0;
     678        return;
     679    }
     680
     681    if (!_data->_findIndicatorWindow)
     682        _data->_findIndicatorWindow = FindIndicatorWindow::create(self);
     683
     684    _data->_findIndicatorWindow->setFindIndicator(findIndicator, fadeOut);
    661685}
    662686
  • trunk/WebKit2/UIProcess/API/mac/WKViewInternal.h

    r69508 r69878  
    2626#import "WKView.h"
    2727
     28namespace WebKit {
     29    class FindIndicator;
     30}
     31
    2832@interface WKView (Internal)
    2933- (void)_processDidExit;
     
    3741- (NSRect)_convertToUserSpace:(NSRect)rect;
    3842
     43- (void)_setFindIndicator:(PassRefPtr<WebKit::FindIndicator>)findIndicator fadeOut:(BOOL)fadeOut;
     44
    3945#if USE(ACCELERATED_COMPOSITING)
    4046- (void)_startAcceleratedCompositing:(CALayer *)rootLayer;
Note: See TracChangeset for help on using the changeset viewer.