Changeset 160530 in webkit
- Timestamp:
- Dec 12, 2013 11:22:52 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 13 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r160529 r160530 1 2013-12-12 Yongjun Zhang <yongjun_zhang@apple.com> 2 3 Need ObjC APIs for some InjectedBundle classes. 4 https://bugs.webkit.org/show_bug.cgi?id=125600 5 6 Add ObjC API classes for WebFrame, InjectedBundleScriptWorld, InjectedBundleHitTestResult and InjectedBundleNodeHandle. 7 8 Reviewed by Dan Bernstein. 9 10 * Shared/Cocoa/APIObject.mm: creates API wrapper for WebFrame, InjectedBundleScriptWorld, InjectedBundleHitTestResult 11 and InjectedBundleNodeHandle. 12 (API::Object::newObject): 13 * WebKit2.xcodeproj/project.pbxproj: 14 * WebProcess/InjectedBundle/API/Cocoa: Added. 15 * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h: Added. 16 * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm: Added. 17 (-[WKWebProcessPlugInFrame dealloc]): 18 (-[WKWebProcessPlugInFrame jsContextForWorld:]): returns the JSContextRef for a ScriptWorld in frame. 19 (-[WKWebProcessPlugInFrame hitTest:]): returns hitTestResult (with API type) from a hitTest. 20 (-[WKWebProcessPlugInFrame jsWrapperForNodeHandle:inWorld:]): 21 (-[WKWebProcessPlugInFrame API::]): 22 * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrameInternal.h: Added. 23 (WebKit::wrapper): 24 * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.h: Added. 25 * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.mm: Added. 26 (-[WKWebProcessPlugInHitTestResult dealloc]): 27 (-[WKWebProcessPlugInHitTestResult nodeHandle]): 28 (-[WKWebProcessPlugInHitTestResult API::]): 29 * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResultInternal.h: Added. 30 (WebKit::wrapper): 31 * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.h: Added. 32 * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm: Added. 33 (-[WKWebProcessPlugInNodeHandle dealloc]): 34 (-[WKWebProcessPlugInNodeHandle API::]): 35 * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandleInternal.h: Added. 36 (WebKit::wrapper): 37 * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.h: Added. 38 * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.mm: Added. 39 (+[WKWebProcessPlugInScriptWorld world]): returns a new isolated world. 40 (+[WKWebProcessPlugInScriptWorld normalWorld]): returns the mainThread normal world. 41 (-[WKWebProcessPlugInScriptWorld dealloc]): 42 (-[WKWebProcessPlugInScriptWorld API::]): 43 * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorldInternal.h: Added. 44 (WebKit::wrapper): 45 1 46 2013-12-12 Benjamin Poulain <bpoulain@apple.com> 2 47 -
trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm
r160280 r160530 45 45 #import "WKProcessGroupInternal.h" 46 46 #import "WKWebProcessPlugInBrowserContextControllerInternal.h" 47 #import "WKWebProcessPlugInFrameInternal.h" 48 #import "WKWebProcessPlugInHitTestResultInternal.h" 47 49 #import "WKWebProcessPlugInInternal.h" 50 #import "WKWebProcessPlugInNodeHandleInternal.h" 51 #import "WKWebProcessPlugInScriptWorldInternal.h" 48 52 49 53 namespace API { … … 136 140 break; 137 141 142 case Type::BundleFrame: 143 wrapper = [WKWebProcessPlugInFrame alloc]; 144 break; 145 146 case Type::BundleHitTestResult: 147 wrapper = [WKWebProcessPlugInHitTestResult alloc]; 148 break; 149 150 case Type::BundleNodeHandle: 151 wrapper = [WKWebProcessPlugInNodeHandle alloc]; 152 break; 153 154 case Type::BundleScriptWorld: 155 wrapper = [WKWebProcessPlugInScriptWorld alloc]; 156 break; 157 138 158 default: 139 159 wrapper = NSAllocateObject([WKObject class], size, nullptr); -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r160520 r160530 333 333 1CB75C941701E880009F809F /* DockRight.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 1CB75C931701E880009F809F /* DockRight.pdf */; }; 334 334 1CBC945E16515ED200D68AAE /* DockBottom.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 1CBC945D16515ED200D68AAE /* DockBottom.pdf */; }; 335 1F7506AD1859161C00EC0FF7 /* WKWebProcessPlugInFrame.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F01816A1858DC1500F92884 /* WKWebProcessPlugInFrame.mm */; }; 336 1F7506AE1859162200EC0FF7 /* WKWebProcessPlugInHitTestResult.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F01816D1858DC1600F92884 /* WKWebProcessPlugInHitTestResult.mm */; }; 337 1F7506AF1859162800EC0FF7 /* WKWebProcessPlugInNodeHandle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F0181701858DC1600F92884 /* WKWebProcessPlugInNodeHandle.mm */; }; 338 1F7506B01859162C00EC0FF7 /* WKWebProcessPlugInScriptWorld.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F0181731858DC1600F92884 /* WKWebProcessPlugInScriptWorld.mm */; }; 339 1F7506B11859163700EC0FF7 /* WKWebProcessPlugInFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F0181691858DC1500F92884 /* WKWebProcessPlugInFrame.h */; settings = {ATTRIBUTES = (Public, ); }; }; 340 1F7506B21859163E00EC0FF7 /* WKWebProcessPlugInHitTestResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F01816C1858DC1500F92884 /* WKWebProcessPlugInHitTestResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; 341 1F7506B31859164500EC0FF7 /* WKWebProcessPlugInNodeHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F01816F1858DC1600F92884 /* WKWebProcessPlugInNodeHandle.h */; settings = {ATTRIBUTES = (Public, ); }; }; 342 1F7506B41859164C00EC0FF7 /* WKWebProcessPlugInScriptWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F0181721858DC1600F92884 /* WKWebProcessPlugInScriptWorld.h */; settings = {ATTRIBUTES = (Public, ); }; }; 343 1F7506B51859165400EC0FF7 /* WKWebProcessPlugInScriptWorldInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F0181741858DC1600F92884 /* WKWebProcessPlugInScriptWorldInternal.h */; }; 344 1F7506B61859165700EC0FF7 /* WKWebProcessPlugInNodeHandleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F0181711858DC1600F92884 /* WKWebProcessPlugInNodeHandleInternal.h */; }; 345 1F7506B71859165A00EC0FF7 /* WKWebProcessPlugInHitTestResultInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F01816E1858DC1600F92884 /* WKWebProcessPlugInHitTestResultInternal.h */; }; 346 1F7506B81859165D00EC0FF7 /* WKWebProcessPlugInFrameInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F01816B1858DC1500F92884 /* WKWebProcessPlugInFrameInternal.h */; }; 335 347 1QQ417CB12C00CCA002BE67B /* TextCheckerCompletion.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC417C912C00CCA002BE67B /* TextCheckerCompletion.h */; }; 336 348 1ZZ417EF12C00D87002BE67B /* TextCheckerCompletion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1BB417C912C00CCA002BE67B /* TextCheckerCompletion.cpp */; }; … … 1879 1891 1CBC945D16515ED200D68AAE /* DockBottom.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = DockBottom.pdf; path = Resources/DockBottom.pdf; sourceTree = "<group>"; }; 1880 1892 1CC417C912C00CCA002BE67B /* TextCheckerCompletion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCheckerCompletion.h; sourceTree = "<group>"; }; 1893 1F0181691858DC1500F92884 /* WKWebProcessPlugInFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInFrame.h; sourceTree = "<group>"; }; 1894 1F01816A1858DC1500F92884 /* WKWebProcessPlugInFrame.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebProcessPlugInFrame.mm; sourceTree = "<group>"; }; 1895 1F01816B1858DC1500F92884 /* WKWebProcessPlugInFrameInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInFrameInternal.h; sourceTree = "<group>"; }; 1896 1F01816C1858DC1500F92884 /* WKWebProcessPlugInHitTestResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInHitTestResult.h; sourceTree = "<group>"; }; 1897 1F01816D1858DC1600F92884 /* WKWebProcessPlugInHitTestResult.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebProcessPlugInHitTestResult.mm; sourceTree = "<group>"; }; 1898 1F01816E1858DC1600F92884 /* WKWebProcessPlugInHitTestResultInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInHitTestResultInternal.h; sourceTree = "<group>"; }; 1899 1F01816F1858DC1600F92884 /* WKWebProcessPlugInNodeHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInNodeHandle.h; sourceTree = "<group>"; }; 1900 1F0181701858DC1600F92884 /* WKWebProcessPlugInNodeHandle.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebProcessPlugInNodeHandle.mm; sourceTree = "<group>"; }; 1901 1F0181711858DC1600F92884 /* WKWebProcessPlugInNodeHandleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInNodeHandleInternal.h; sourceTree = "<group>"; }; 1902 1F0181721858DC1600F92884 /* WKWebProcessPlugInScriptWorld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInScriptWorld.h; sourceTree = "<group>"; }; 1903 1F0181731858DC1600F92884 /* WKWebProcessPlugInScriptWorld.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebProcessPlugInScriptWorld.mm; sourceTree = "<group>"; }; 1904 1F0181741858DC1600F92884 /* WKWebProcessPlugInScriptWorldInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInScriptWorldInternal.h; sourceTree = "<group>"; }; 1881 1905 290F4271172A0C7400939FF0 /* ChildProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildProcessSupplement.h; sourceTree = "<group>"; }; 1882 1906 293EBEA91627D9C9005F89F1 /* WKDOMText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDOMText.h; sourceTree = "<group>"; }; … … 3715 3739 sourceTree = "<group>"; 3716 3740 }; 3741 1F0181681858DC1500F92884 /* Cocoa */ = { 3742 isa = PBXGroup; 3743 children = ( 3744 1F0181691858DC1500F92884 /* WKWebProcessPlugInFrame.h */, 3745 1F01816A1858DC1500F92884 /* WKWebProcessPlugInFrame.mm */, 3746 1F01816B1858DC1500F92884 /* WKWebProcessPlugInFrameInternal.h */, 3747 1F01816C1858DC1500F92884 /* WKWebProcessPlugInHitTestResult.h */, 3748 1F01816D1858DC1600F92884 /* WKWebProcessPlugInHitTestResult.mm */, 3749 1F01816E1858DC1600F92884 /* WKWebProcessPlugInHitTestResultInternal.h */, 3750 1F01816F1858DC1600F92884 /* WKWebProcessPlugInNodeHandle.h */, 3751 1F0181701858DC1600F92884 /* WKWebProcessPlugInNodeHandle.mm */, 3752 1F0181711858DC1600F92884 /* WKWebProcessPlugInNodeHandleInternal.h */, 3753 1F0181721858DC1600F92884 /* WKWebProcessPlugInScriptWorld.h */, 3754 1F0181731858DC1600F92884 /* WKWebProcessPlugInScriptWorld.mm */, 3755 1F0181741858DC1600F92884 /* WKWebProcessPlugInScriptWorldInternal.h */, 3756 ); 3757 path = Cocoa; 3758 sourceTree = "<group>"; 3759 }; 3717 3760 2989A40E167D1813004F96D2 /* CustomProtocols */ = { 3718 3761 isa = PBXGroup; … … 4896 4939 isa = PBXGroup; 4897 4940 children = ( 4941 1F0181681858DC1500F92884 /* Cocoa */, 4898 4942 BC204EE811C83EB7008F3375 /* c */, 4899 4943 BC989D4516181691000D46D3 /* mac */, … … 5800 5844 1AB474E2184D44800051B622 /* WKBundlePageFormClient.h in Headers */, 5801 5845 1A2D82A5127F4EAB001EB962 /* NPObjectMessageReceiver.h in Headers */, 5846 1F7506B41859164C00EC0FF7 /* WKWebProcessPlugInScriptWorld.h in Headers */, 5802 5847 1A2D843A127F65D5001EB962 /* NPObjectMessageReceiverMessages.h in Headers */, 5803 5848 1A2D82A7127F4EAB001EB962 /* NPObjectProxy.h in Headers */, … … 5842 5887 1A2D90D21281C966001EB962 /* PluginProcessCreationParameters.h in Headers */, 5843 5888 1A0EC603124A9F2C007EF4A5 /* PluginProcessManager.h in Headers */, 5889 1F7506B31859164500EC0FF7 /* WKWebProcessPlugInNodeHandle.h in Headers */, 5844 5890 1A0EC6C0124BBD9B007EF4A5 /* PluginProcessMessages.h in Headers */, 5845 5891 1A0EC75E124BC7B2007EF4A5 /* PluginProcessProxy.h in Headers */, … … 5921 5967 BC4A6292147312BE006C681A /* WebConnectionClient.h in Headers */, 5922 5968 1A1FEC1D1627B45700700F6D /* WebConnectionMessages.h in Headers */, 5969 1F7506B21859163E00EC0FF7 /* WKWebProcessPlugInHitTestResult.h in Headers */, 5923 5970 BC4A62A814744EC7006C681A /* WebConnectionToWebProcess.h in Headers */, 5924 5971 BCB9E2431120DACA00A137E0 /* WebContext.h in Headers */, … … 5953 6000 F62A76B712B1B25F0005F1B6 /* WebDatabaseManagerMessages.h in Headers */, 5954 6001 F62A765D12B1ABC30005F1B6 /* WebDatabaseManagerProxy.h in Headers */, 6002 1F7506B11859163700EC0FF7 /* WKWebProcessPlugInFrame.h in Headers */, 5955 6003 1A445BA3184D5FCF004B3414 /* WKContextDownloadClient.h in Headers */, 5956 6004 BCAC111F12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h in Headers */, … … 5992 6040 511B24A7132E095700065A0C /* WebIconDatabaseProxy.h in Headers */, 5993 6041 1AB474EA184D45130051B622 /* WKBundlePagePolicyClient.h in Headers */, 6042 1F7506B71859165A00EC0FF7 /* WKWebProcessPlugInHitTestResultInternal.h in Headers */, 5994 6043 51D02F6C132EC73700BEAA96 /* WebIconDatabaseProxyMessages.h in Headers */, 5995 6044 BCCF6ABD12C91EF9008F9C35 /* WebImage.h in Headers */, … … 6230 6279 F634445D12A885E9000612D8 /* WKSecurityOrigin.h in Headers */, 6231 6280 BC407604124FF0270068F20A /* WKSerializedScriptValue.h in Headers */, 6281 1F7506B81859165D00EC0FF7 /* WKWebProcessPlugInFrameInternal.h in Headers */, 6232 6282 F67DD7BA125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h in Headers */, 6233 6283 BCDDB32B124EC2AB0048D13C /* WKSharedAPICast.h in Headers */, … … 6260 6310 BC8F2F2E16273ACC005FACB5 /* WKWebProcessPlugInBrowserContextControllerInternal.h in Headers */, 6261 6311 29501724162A4504004A9D71 /* WKWebProcessPlugInBrowserContextControllerPrivate.h in Headers */, 6312 1F7506B61859165700EC0FF7 /* WKWebProcessPlugInNodeHandleInternal.h in Headers */, 6313 1F7506B51859165400EC0FF7 /* WKWebProcessPlugInScriptWorldInternal.h in Headers */, 6262 6314 373CEAD6185417AE008C363D /* WKNSData.h in Headers */, 6263 6315 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, … … 6987 7039 B63403F914910D57001070B5 /* APIObject.cpp in Sources */, 6988 7040 1A3D610513A7F03A00F95D4E /* ArgumentCoders.cpp in Sources */, 7041 1F7506AE1859162200EC0FF7 /* WKWebProcessPlugInHitTestResult.mm in Sources */, 6989 7042 1AAF0C4B12B16334008E49E2 /* ArgumentCodersCF.cpp in Sources */, 6990 7043 E179FD9F134D38250015B883 /* ArgumentCodersMac.mm in Sources */, … … 7224 7277 1A6420E412DCE2FF00CAAE2C /* ShareableBitmap.cpp in Sources */, 7225 7278 C01A260112662F2100C9ED55 /* ShareableBitmapCG.cpp in Sources */, 7279 1F7506AF1859162800EC0FF7 /* WKWebProcessPlugInNodeHandle.mm in Sources */, 7226 7280 51217460164C20E30037A5C1 /* ShareableResource.cpp in Sources */, 7227 7281 1A24BF3A120896A600FBB059 /* SharedMemoryMac.cpp in Sources */, … … 7387 7441 BC111B0F112F5E4F00337BAB /* WebPageProxy.cpp in Sources */, 7388 7442 51B3005112529D0E000B5CA0 /* WebPageProxyCF.cpp in Sources */, 7443 1F7506AD1859161C00EC0FF7 /* WKWebProcessPlugInFrame.mm in Sources */, 7389 7444 BC857E8712B71EBB00EDEB2E /* WebPageProxyMac.mm in Sources */, 7390 7445 BCBD3914125BB1A800D2C29F /* WebPageProxyMessageReceiver.cpp in Sources */, … … 7408 7463 1A043F6912514D8B00FFBFB5 /* WebProcessConnectionMessageReceiver.cpp in Sources */, 7409 7464 BC306825125A6B9400E71278 /* WebProcessCreationParameters.cpp in Sources */, 7465 1F7506B01859162C00EC0FF7 /* WKWebProcessPlugInScriptWorld.mm in Sources */, 7410 7466 75E749EB180DBB9800088BA6 /* WebOriginDataManagerProxyMessageReceiver.cpp in Sources */, 7411 7467 BC3065C412592F8900E71278 /* WebProcessMac.mm in Sources */,
Note: See TracChangeset
for help on using the changeset viewer.