Changeset 69871 in webkit
- Timestamp:
- Oct 15, 2010 12:16:43 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 6 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r69869 r69871 1 2010-10-15 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Sam Weinig. 4 5 Add FindIndicatorWindow class 6 https://bugs.webkit.org/show_bug.cgi?id=47731 7 8 Export symbols needed by the FindIndicator in WebKit2. 9 10 * WebCore.exp.in: 11 1 12 2010-10-15 Leandro Pereira <leandro@profusion.mobi> 2 13 -
trunk/WebCore/WebCore.exp.in
r69844 r69871 351 351 __ZN7WebCore15GraphicsContext22beginTransparencyLayerEf 352 352 __ZN7WebCore15GraphicsContext4clipERKNS_9FloatRectE 353 __ZN7WebCore15GraphicsContext5scaleERKNS_9FloatSizeE 354 __ZN7WebCore15GraphicsContext15setFillGradientEN3WTF10PassRefPtrINS_8GradientEEE 355 __ZN7WebCore4PathD1Ev 356 __ZN7WebCore8Gradient12addColorStopEfRKNS_5ColorE 357 __ZN7WebCore4PathC1Ev 358 __ZN7WebCore15GraphicsContext4clipERKNS_4PathE 359 __ZN7WebCore15GraphicsContext8fillPathEv 360 __ZN7WebCore4Path14addRoundedRectERKNS_9FloatRectERKNS_9FloatSizeE 361 __ZN7WebCore15GraphicsContext7addPathERKNS_4PathE 353 362 __ZN7WebCore15GraphicsContext4saveEv 354 363 __ZN7WebCore15GraphicsContext7restoreEv … … 708 717 __ZN7WebCore8FormData6createEPKvm 709 718 __ZN7WebCore8FormDataD1Ev 719 __ZN7WebCore8GradientC1ERKNS_10FloatPointES3_ 710 720 __ZN7WebCore8IntPointC1ERK8_NSPoint 711 721 __ZN7WebCore8PositionC1EN3WTF10PassRefPtrINS_4NodeEEEi -
trunk/WebKit2/ChangeLog
r69866 r69871 1 2010-10-15 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Sam Weinig. 4 5 Add FindIndicatorWindow class 6 https://bugs.webkit.org/show_bug.cgi?id=47731 7 8 * UIProcess/API/mac/FindIndicatorWindow.h: Added. 9 * UIProcess/API/mac/FindIndicatorWindow.mm: Added. 10 (-[WebFindIndicatorView _initWithFindIndicator:WebKit::]): 11 Initialize the find indicator view. 12 13 (-[WebFindIndicatorView drawRect:]): 14 Ask the find indicator to draw. 15 16 (-[WebFindIndicatorView isFlipped]): 17 Return YES. 18 19 (WebKit::FindIndicatorWindow::~FindIndicatorWindow): 20 Make sure to close the window. 21 22 (WebKit::FindIndicatorWindow::setFindIndicator): 23 Update the find indicator window. 24 25 (WebKit::FindIndicatorWindow::closeWindow): 26 Close and release the window. 27 28 * UIProcess/API/mac/PageClientImpl.h: 29 * UIProcess/API/mac/PageClientImpl.mm: 30 (WebKit::PageClientImpl::setFindIndicator): 31 Create a find indicator window. 32 33 * WebKit2.xcodeproj/project.pbxproj: 34 Add new files. 35 1 36 2010-10-15 Anders Carlsson <andersca@apple.com> 2 37 -
trunk/WebKit2/UIProcess/API/mac/FindIndicatorWindow.h
r69870 r69871 24 24 */ 25 25 26 #ifndef PageClientImpl_h27 #define PageClientImpl_h26 #ifndef FindIndicatorWindow_h 27 #define FindIndicatorWindow_h 28 28 29 #include "PageClient.h" 30 #include <wtf/RetainPtr.h> 29 #import <wtf/Noncopyable.h> 30 #import <wtf/PassOwnPtr.h> 31 #import <wtf/RefPtr.h> 32 #import <wtf/RetainPtr.h> 31 33 32 34 @class WKView; 33 @class WebEditorUndoTargetObjC;34 35 35 36 namespace WebKit { 36 37 37 // NOTE: This does not use String::operator NSString*() since that function 38 // expects to be called on the thread running WebCore. 39 NSString* nsStringFromWebCoreString(const String&); 38 class FindIndicator; 40 39 41 class PageClientImpl : public PageClient { 40 class FindIndicatorWindow { 41 WTF_MAKE_NONCOPYABLE(FindIndicatorWindow); 42 42 43 public: 43 static PassOwnPtr<PageClientImpl> create(WKView*); 44 virtual ~PageClientImpl(); 45 46 private: 47 PageClientImpl(WKView*); 48 49 virtual void processDidExit(); 50 virtual void processDidRevive(); 51 virtual void takeFocus(bool direction); 52 virtual void toolTipChanged(const String& oldToolTip, const String& newToolTip); 53 virtual void setCursor(const WebCore::Cursor&); 54 virtual void setViewportArguments(const WebCore::ViewportArguments&); 55 56 void registerEditCommand(PassRefPtr<WebEditCommandProxy>, WebPageProxy::UndoOrRedo); 57 void clearAllEditCommands(); 58 void setEditCommandState(const String& commandName, bool isEnabled, int state); 59 60 WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&); 61 WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&); 62 63 virtual void didNotHandleKeyEvent(const NativeWebKeyboardEvent&); 44 static PassOwnPtr<FindIndicatorWindow> create(WKView *); 45 ~FindIndicatorWindow(); 64 46 65 47 void setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut); 66 48 67 #if USE(ACCELERATED_COMPOSITING) 68 void pageDidEnterAcceleratedCompositing(); 69 void pageDidLeaveAcceleratedCompositing(); 70 #endif 49 private: 50 explicit FindIndicatorWindow(WKView *); 51 void closeWindow(); 71 52 72 53 WKView* m_wkView; 73 RetainPtr<WebEditorUndoTargetObjC> m_undoTarget; 54 RefPtr<FindIndicator> m_findIndicator; 55 RetainPtr<NSWindow> m_findIndicatorWindow; 74 56 }; 75 57 76 58 } // namespace WebKit 77 59 78 #endif // PageClientImpl_h60 #endif // FindIndicatorWindow_h -
trunk/WebKit2/UIProcess/API/mac/PageClientImpl.h
r69862 r69871 34 34 35 35 namespace WebKit { 36 37 class FindIndicatorWindow; 36 38 37 39 // NOTE: This does not use String::operator NSString*() since that function … … 72 74 WKView* m_wkView; 73 75 RetainPtr<WebEditorUndoTargetObjC> m_undoTarget; 76 OwnPtr<FindIndicatorWindow> m_findIndicatorWindow; 74 77 }; 75 78 -
trunk/WebKit2/UIProcess/API/mac/PageClientImpl.mm
r69862 r69871 26 26 #import "PageClientImpl.h" 27 27 28 #import "FindIndicator.h" 29 #import "FindIndicatorWindow.h" 28 30 #import "WKAPICast.h" 29 31 #import "WKStringCF.h" … … 226 228 } 227 229 228 void PageClientImpl::setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut) 229 { 230 // FIXME: Implement. 230 void PageClientImpl::setFindIndicator(PassRefPtr<FindIndicator> findIndicator, bool fadeOut) 231 { 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 241 } 232 242 -
trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj
r69862 r69871 129 129 1A910071126675C4001842F5 /* FindIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A91006F126675C3001842F5 /* FindIndicator.h */; }; 130 130 1A910072126675C4001842F5 /* FindIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A910070126675C4001842F5 /* FindIndicator.cpp */; }; 131 1A91010A1268C8CA001842F5 /* FindIndicatorWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9101081268C8CA001842F5 /* FindIndicatorWindow.h */; }; 132 1A91010B1268C8CA001842F5 /* FindIndicatorWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9101091268C8CA001842F5 /* FindIndicatorWindow.mm */; }; 131 133 1AA1CC5D100FA1A10078DEBC /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */; }; 132 134 1AA1CD07100FA1BA0078DEBC /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CD06100FA1BA0078DEBC /* Carbon.framework */; }; … … 596 598 1A91006F126675C3001842F5 /* FindIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FindIndicator.h; sourceTree = "<group>"; }; 597 599 1A910070126675C4001842F5 /* FindIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FindIndicator.cpp; sourceTree = "<group>"; }; 600 1A9101081268C8CA001842F5 /* FindIndicatorWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FindIndicatorWindow.h; sourceTree = "<group>"; }; 601 1A9101091268C8CA001842F5 /* FindIndicatorWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FindIndicatorWindow.mm; sourceTree = "<group>"; }; 598 602 1AA1C79A100E7FC50078DEBC /* WebCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 599 603 1AA1C7DE100E846E0078DEBC /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; … … 1500 1504 BC111B4B112F619200337BAB /* PageClientImpl.h */, 1501 1505 BC111B4C112F619200337BAB /* PageClientImpl.mm */, 1506 1A9101081268C8CA001842F5 /* FindIndicatorWindow.h */, 1507 1A9101091268C8CA001842F5 /* FindIndicatorWindow.mm */, 1502 1508 BC8699B2116AADAA002A925B /* WKView.h */, 1503 1509 BC8699B3116AADAA002A925B /* WKView.mm */, … … 2035 2041 1A90C2A312650C60003E44D4 /* FindPageOverlay.h in Headers */, 2036 2042 1A910071126675C4001842F5 /* FindIndicator.h in Headers */, 2043 1A91010A1268C8CA001842F5 /* FindIndicatorWindow.h in Headers */, 2037 2044 ); 2038 2045 runOnlyForDeploymentPostprocessing = 0; … … 2342 2349 C01A260112662F2100C9ED55 /* BackingStoreCG.cpp in Sources */, 2343 2350 1A910072126675C4001842F5 /* FindIndicator.cpp in Sources */, 2351 1A91010B1268C8CA001842F5 /* FindIndicatorWindow.mm in Sources */, 2344 2352 ); 2345 2353 runOnlyForDeploymentPostprocessing = 0;
Note: See TracChangeset
for help on using the changeset viewer.