Changeset 69878 in webkit
- Timestamp:
- Oct 15, 2010 2:31:13 PM (13 years ago)
- Location:
- trunk/WebKit2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r69877 r69878 1 2010-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 1 20 2010-10-15 Anders Carlsson <andersca@apple.com> 2 21 -
trunk/WebKit2/UIProcess/API/mac/PageClientImpl.h
r69871 r69878 74 74 WKView* m_wkView; 75 75 RetainPtr<WebEditorUndoTargetObjC> m_undoTarget; 76 OwnPtr<FindIndicatorWindow> m_findIndicatorWindow;77 76 }; 78 77 -
trunk/WebKit2/UIProcess/API/mac/PageClientImpl.mm
r69871 r69878 27 27 28 28 #import "FindIndicator.h" 29 #import "FindIndicatorWindow.h"30 29 #import "WKAPICast.h" 31 30 #import "WKStringCF.h" … … 230 229 void PageClientImpl::setFindIndicator(PassRefPtr<FindIndicator> findIndicator, bool fadeOut) 231 230 { 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]; 241 232 } 242 233 -
trunk/WebKit2/UIProcess/API/mac/WKView.mm
r69694 r69878 31 31 // Implementation 32 32 #import "ChunkedUpdateDrawingAreaProxy.h" 33 #import "FindIndicator.h" 34 #import "FindIndicatorWindow.h" 33 35 #import "LayerBackedDrawingAreaProxy.h" 34 36 #import "NativeWebKeyboardEvent.h" … … 84 86 85 87 HashMap<String, EditCommandState> _menuMap; 88 89 OwnPtr<FindIndicatorWindow> _findIndicatorWindow; 86 90 } 87 91 @end … … 175 179 } 176 180 181 - (void)renewGState 182 { 183 // Hide the find indicator. 184 _data->_findIndicatorWindow = 0; 185 186 [super renewGState]; 187 } 177 188 typedef HashMap<SEL, String> SelectorNameMap; 178 189 … … 659 670 [self _sendToolTipMouseEntered]; 660 671 } 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); 661 685 } 662 686 -
trunk/WebKit2/UIProcess/API/mac/WKViewInternal.h
r69508 r69878 26 26 #import "WKView.h" 27 27 28 namespace WebKit { 29 class FindIndicator; 30 } 31 28 32 @interface WKView (Internal) 29 33 - (void)_processDidExit; … … 37 41 - (NSRect)_convertToUserSpace:(NSRect)rect; 38 42 43 - (void)_setFindIndicator:(PassRefPtr<WebKit::FindIndicator>)findIndicator fadeOut:(BOOL)fadeOut; 44 39 45 #if USE(ACCELERATED_COMPOSITING) 40 46 - (void)_startAcceleratedCompositing:(CALayer *)rootLayer;
Note: See TracChangeset
for help on using the changeset viewer.