Changeset 236930 in webkit
- Timestamp:
- Oct 8, 2018, 12:58:09 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 5 deleted
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/Source/WebKit/ChangeLog ¶
r236928 r236930 1 2018-10-08 Alex Christensen <achristensen@webkit.org> 2 3 Remove WKBundleFileHandleRef 4 https://bugs.webkit.org/show_bug.cgi?id=190360 5 6 Reviewed by Tim Horton. 7 8 WKBundleFrameGetJavaScriptWrapperForFileForWorld and WKBundleFileHandleCreateWithPath were only used in Mail 9 and were removed in rdar://problem/44955158 10 I need to remove them for rdar://problem/24576194 11 12 * Shared/API/APIObject.h: 13 * Shared/API/c/WKDeprecated.h: 14 * Shared/API/c/WKDeprecatedFunctions.cpp: 15 (WKBundleFrameGetJavaScriptWrapperForFileForWorld): 16 (WKBundleFileHandleCreateWithPath): 17 * Sources.txt: 18 * SourcesCocoa.txt: 19 * WebKit.xcodeproj/project.pbxproj: 20 * WebProcess/InjectedBundle/API/c/WKBundleAPICast.h: 21 * WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.cpp: Removed. 22 * WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h: 23 * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp: 24 (WKBundleFrameGetJavaScriptWrapperForFileForWorld): Deleted. 25 * WebProcess/InjectedBundle/API/c/WKBundleFrame.h: 26 * WebProcess/InjectedBundle/DOM/InjectedBundleFileHandle.cpp: Removed. 27 * WebProcess/InjectedBundle/DOM/InjectedBundleFileHandle.h: Removed. 28 * WebProcess/WebPage/WebFrame.cpp: 29 * WebProcess/WebPage/WebFrame.h: 30 1 31 2018-10-08 Konstantin Tokarev <annulen@yandex.ru> 2 32 -
TabularUnified trunk/Source/WebKit/Shared/API/APIObject.h ¶
r235921 r236930 178 178 BundleCSSStyleDeclarationHandle, 179 179 BundleDOMWindowExtension, 180 BundleFileHandle,181 180 BundleFrame, 182 181 BundleHitTestResult, -
TabularUnified trunk/Source/WebKit/Shared/API/c/WKDeprecated.h ¶
r236436 r236930 27 27 28 28 #ifdef _MSC_VER 29 #define WK_C_API_DEPRECATED(...) 29 30 #define WK_C_API_DEPRECATED_WITH_REPLACEMENT(...) 30 31 #else 32 #define WK_C_API_DEPRECATED(_message, ...) __attribute__((deprecated(_message))) 31 33 #define WK_C_API_DEPRECATED_WITH_REPLACEMENT(_replacement, ...) __attribute__((deprecated("use " #_replacement))) 32 34 #endif -
TabularUnified trunk/Source/WebKit/Shared/API/c/WKDeprecatedFunctions.cpp ¶
r227535 r236930 30 30 #include "WKAPICast.h" 31 31 #include "WKArray.h" 32 #include "WKBundleFileHandleRef.h" 33 #include "WKBundleFrame.h" 32 34 #include "WKContextPrivate.h" 33 35 #include "WKMutableDictionary.h" … … 37 39 #include "WebUserContentControllerProxy.h" 38 40 39 #if PLATFORM(MAC)40 #include "WKContextPrivateMac.h"41 #endif42 43 41 // Deprecated functions that should be removed from the framework once nobody uses them. 44 45 using namespace WebKit;46 42 47 43 void WKContextSetUsesNetworkProcess(WKContextRef, bool) … … 61 57 return false; 62 58 } 59 60 JSValueRef WKBundleFrameGetJavaScriptWrapperForFileForWorld(WKBundleFrameRef, WKBundleFileHandleRef, WKBundleScriptWorldRef) 61 { 62 return nullptr; 63 } 64 65 WKBundleFileHandleRef WKBundleFileHandleCreateWithPath(WKStringRef) 66 { 67 return nullptr; 68 } -
TabularUnified trunk/Source/WebKit/Sources.txt ¶
r236690 r236930 445 445 446 446 WebProcess/InjectedBundle/DOM/InjectedBundleCSSStyleDeclarationHandle.cpp 447 WebProcess/InjectedBundle/DOM/InjectedBundleFileHandle.cpp448 447 WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp @no-unify 449 448 WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp @no-unify -
TabularUnified trunk/Source/WebKit/SourcesCocoa.txt ¶
r236773 r236930 481 481 WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm 482 482 483 WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.cpp484 483 WebProcess/InjectedBundle/API/c/WKBundlePageBanner.cpp 485 484 -
TabularUnified trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj ¶
r236902 r236930 1142 1142 7CB365AD1D31DC10007158CA /* _WKUserInitiatedActionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CB365AC1D31DC10007158CA /* _WKUserInitiatedActionInternal.h */; }; 1143 1143 7CB365B11D31DD1E007158CA /* APIUserInitiatedAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CB365AF1D31DD1E007158CA /* APIUserInitiatedAction.h */; }; 1144 7CBB811D1AA0F8B1006B1942 /* InjectedBundleFileHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CBB811B1AA0F8B1006B1942 /* InjectedBundleFileHandle.h */; };1145 1144 7CBB81211AA0F970006B1942 /* WKBundleFileHandleRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CBB811F1AA0F970006B1942 /* WKBundleFileHandleRef.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1146 1145 7CC99A3618EF7CBC0048C8B4 /* WKScriptMessageInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CC99A3518EF7CBC0048C8B4 /* WKScriptMessageInternal.h */; }; … … 3573 3572 7CB365AC1D31DC10007158CA /* _WKUserInitiatedActionInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKUserInitiatedActionInternal.h; sourceTree = "<group>"; }; 3574 3573 7CB365AF1D31DD1E007158CA /* APIUserInitiatedAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIUserInitiatedAction.h; sourceTree = "<group>"; }; 3575 7CBB811A1AA0F8B1006B1942 /* InjectedBundleFileHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleFileHandle.cpp; sourceTree = "<group>"; };3576 7CBB811B1AA0F8B1006B1942 /* InjectedBundleFileHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleFileHandle.h; sourceTree = "<group>"; };3577 7CBB811E1AA0F970006B1942 /* WKBundleFileHandleRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBundleFileHandleRef.cpp; sourceTree = "<group>"; };3578 3574 7CBB811F1AA0F970006B1942 /* WKBundleFileHandleRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleFileHandleRef.h; sourceTree = "<group>"; }; 3579 3575 7CC99A3518EF7CBC0048C8B4 /* WKScriptMessageInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKScriptMessageInternal.h; sourceTree = "<group>"; }; … … 7753 7749 51FA2D7515212E1E00C1BA0B /* WKBundleDOMWindowExtension.cpp */, 7754 7750 51FA2D541521118600C1BA0B /* WKBundleDOMWindowExtension.h */, 7755 7CBB811E1AA0F970006B1942 /* WKBundleFileHandleRef.cpp */,7756 7751 7CBB811F1AA0F970006B1942 /* WKBundleFileHandleRef.h */, 7757 7752 BCD25F1611D6BDE100169B0E /* WKBundleFrame.cpp */, … … 7861 7856 7C4ED3261A3119D90079BD49 /* InjectedBundleCSSStyleDeclarationHandle.cpp */, 7862 7857 7C4ED3271A3119D90079BD49 /* InjectedBundleCSSStyleDeclarationHandle.h */, 7863 7CBB811A1AA0F8B1006B1942 /* InjectedBundleFileHandle.cpp */,7864 7CBB811B1AA0F8B1006B1942 /* InjectedBundleFileHandle.h */,7865 7858 BC4BEEAA120A0A5F00FBA0C7 /* InjectedBundleNodeHandle.cpp */, 7866 7859 BC4BEEA9120A0A5E00FBA0C7 /* InjectedBundleNodeHandle.h */, … … 8916 8909 935EEBA4127761D6003322B8 /* InjectedBundleBackForwardListItem.h in Headers */, 8917 8910 BCEE7DC5128B645D009827DA /* InjectedBundleClient.h in Headers */, 8918 7CBB811D1AA0F8B1006B1942 /* InjectedBundleFileHandle.h in Headers */,8919 8911 BC498618124D10E200D834E1 /* InjectedBundleHitTestResult.h in Headers */, 8920 8912 84477853176FCC0800CDC7BB /* InjectedBundleHitTestResultMediaType.h in Headers */, -
TabularUnified trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleAPICast.h ¶
r210109 r236930 40 40 class InjectedBundleCSSStyleDeclarationHandle; 41 41 class InjectedBundleDOMWindowExtension; 42 class InjectedBundleFileHandle;43 42 class InjectedBundleHitTestResult; 44 43 class InjectedBundleNavigationAction; … … 57 56 WK_ADD_API_MAPPING(WKBundleCSSStyleDeclarationRef, InjectedBundleCSSStyleDeclarationHandle) 58 57 WK_ADD_API_MAPPING(WKBundleDOMWindowExtensionRef, InjectedBundleDOMWindowExtension) 59 WK_ADD_API_MAPPING(WKBundleFileHandleRef, InjectedBundleFileHandle)60 58 WK_ADD_API_MAPPING(WKBundleFrameRef, WebFrame) 61 59 WK_ADD_API_MAPPING(WKBundleHitTestResultRef, InjectedBundleHitTestResult) -
TabularUnified trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h ¶
r236441 r236930 34 34 #endif 35 35 36 WK_EXPORT WKTypeID WKBundleFileHandleGetTypeID(); 37 38 WK_EXPORT WKBundleFileHandleRef WKBundleFileHandleCreateWithPath(WKStringRef path) WK_C_API_DEPRECATED_WITH_REPLACEMENT(WKBundleFileHandleCreateWithPathForPage); 39 WK_EXPORT WKBundleFileHandleRef WKBundleFileHandleCreateWithPathForPage(WKStringRef path, WKBundlePageRef page); 36 WK_EXPORT WKBundleFileHandleRef WKBundleFileHandleCreateWithPath(WKStringRef path) WK_C_API_DEPRECATED("No longer supported"); 40 37 41 38 #ifdef __cplusplus -
TabularUnified trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp ¶
r226189 r236930 30 30 #include "APIArray.h" 31 31 #include "APISecurityOrigin.h" 32 #include "InjectedBundleFileHandle.h"33 32 #include "InjectedBundleHitTestResult.h" 34 33 #include "InjectedBundleNodeHandle.h" … … 124 123 } 125 124 126 JSValueRef WKBundleFrameGetJavaScriptWrapperForFileForWorld(WKBundleFrameRef frameRef, WKBundleFileHandleRef fileHandleRef, WKBundleScriptWorldRef worldRef)127 {128 return toImpl(frameRef)->jsWrapperForWorld(toImpl(fileHandleRef), toImpl(worldRef));129 }130 131 125 WKStringRef WKBundleFrameCopyName(WKBundleFrameRef frameRef) 132 126 { -
TabularUnified trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.h ¶
r181251 r236930 29 29 #include <JavaScriptCore/JavaScript.h> 30 30 #include <WebKit/WKBase.h> 31 #include <WebKit/WKDeprecated.h> 31 32 #include <WebKit/WKFrame.h> 32 33 #include <WebKit/WKGeometry.h> … … 56 57 WK_EXPORT JSValueRef WKBundleFrameGetJavaScriptWrapperForNodeForWorld(WKBundleFrameRef frame, WKBundleNodeHandleRef nodeHandle, WKBundleScriptWorldRef world); 57 58 WK_EXPORT JSValueRef WKBundleFrameGetJavaScriptWrapperForRangeForWorld(WKBundleFrameRef frame, WKBundleRangeHandleRef rangeHandle, WKBundleScriptWorldRef world); 58 WK_EXPORT JSValueRef WKBundleFrameGetJavaScriptWrapperForFileForWorld(WKBundleFrameRef frame, WKBundleFileHandleRef fileHandle, WKBundleScriptWorldRef world) ;59 WK_EXPORT JSValueRef WKBundleFrameGetJavaScriptWrapperForFileForWorld(WKBundleFrameRef frame, WKBundleFileHandleRef fileHandle, WKBundleScriptWorldRef world) WK_C_API_DEPRECATED("No longer supported"); 59 60 60 61 WK_EXPORT WKBundlePageRef WKBundleFrameGetPage(WKBundleFrameRef frame); -
TabularUnified trunk/Source/WebKit/WebProcess/WebPage/WebFrame.cpp ¶
r236512 r236930 30 30 #include "DownloadManager.h" 31 31 #include "FrameInfoData.h" 32 #include "InjectedBundleFileHandle.h"33 32 #include "InjectedBundleHitTestResult.h" 34 33 #include "InjectedBundleNodeHandle.h" … … 736 735 } 737 736 738 JSValueRef WebFrame::jsWrapperForWorld(InjectedBundleFileHandle* fileHandle, InjectedBundleScriptWorld* world)739 {740 if (!m_coreFrame)741 return nullptr;742 743 JSDOMWindow* globalObject = m_coreFrame->script().globalObject(world->coreWorld());744 ExecState* exec = globalObject->globalExec();745 746 JSLockHolder lock(exec);747 return toRef(exec, toJS(exec, globalObject, fileHandle->coreFile()));748 }749 750 737 String WebFrame::counterValue(JSObjectRef element) 751 738 { -
TabularUnified trunk/Source/WebKit/WebProcess/WebPage/WebFrame.h ¶
r235562 r236930 59 59 namespace WebKit { 60 60 61 class InjectedBundleFileHandle;62 61 class InjectedBundleHitTestResult; 63 62 class InjectedBundleNodeHandle; … … 134 133 JSValueRef jsWrapperForWorld(InjectedBundleNodeHandle*, InjectedBundleScriptWorld*); 135 134 JSValueRef jsWrapperForWorld(InjectedBundleRangeHandle*, InjectedBundleScriptWorld*); 136 JSValueRef jsWrapperForWorld(InjectedBundleFileHandle*, InjectedBundleScriptWorld*);137 135 138 136 static String counterValue(JSObjectRef element); -
TabularUnified trunk/Tools/ChangeLog ¶
r236913 r236930 1 2018-10-08 Alex Christensen <achristensen@webkit.org> 2 3 Remove WKBundleFileHandleRef 4 https://bugs.webkit.org/show_bug.cgi?id=190360 5 6 Reviewed by Tim Horton. 7 8 * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: 9 * TestWebKitAPI/Tests/WebKit/WKBundleFileHandle.cpp: Removed. 10 * TestWebKitAPI/Tests/WebKit/WKBundleFileHandle_Bundle.cpp: Removed. 11 1 12 2018-10-08 Dan Bernstein <mitz@apple.com> 2 13 -
TabularUnified trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj ¶
r236913 r236930 346 346 7C417F331D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C417F311D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm */; }; 347 347 7C486BA11AA12567003F6F9B /* bundle-file.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 7C486BA01AA1254B003F6F9B /* bundle-file.html */; }; 348 7C54A4BE1AA11CCA00380F78 /* WKBundleFileHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C54A4BC1AA11CCA00380F78 /* WKBundleFileHandle.cpp */; };349 7C54A4C11AA11CE400380F78 /* WKBundleFileHandle_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C54A4BF1AA11CE400380F78 /* WKBundleFileHandle_Bundle.cpp */; };350 348 7C83DE991D0A590C00FEBCF3 /* AtomicString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F1B44215CA434F00D1E4BF /* AtomicString.cpp */; }; 351 349 7C83DE9C1D0A590C00FEBCF3 /* BloomFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E40019301ACE9B5C001B0A2A /* BloomFilter.cpp */; }; … … 1657 1655 7C417F311D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewDefaultNavigationDelegate.mm; sourceTree = "<group>"; }; 1658 1656 7C486BA01AA1254B003F6F9B /* bundle-file.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "bundle-file.html"; sourceTree = "<group>"; }; 1659 7C54A4BC1AA11CCA00380F78 /* WKBundleFileHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBundleFileHandle.cpp; sourceTree = "<group>"; };1660 7C54A4BF1AA11CE400380F78 /* WKBundleFileHandle_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBundleFileHandle_Bundle.cpp; sourceTree = "<group>"; };1661 1657 7C6BBD8A19CEA54300C1F5E0 /* Counters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Counters.h; sourceTree = "<group>"; }; 1662 1658 7C6BBD8B19CEA63000C1F5E0 /* Counters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Counters.cpp; sourceTree = "<group>"; }; … … 2990 2986 76E182D91547550100F1FADD /* WillSendSubmitEvent.cpp */, 2991 2987 76E182DC1547569100F1FADD /* WillSendSubmitEvent_Bundle.cpp */, 2992 7C54A4BC1AA11CCA00380F78 /* WKBundleFileHandle.cpp */,2993 7C54A4BF1AA11CE400380F78 /* WKBundleFileHandle_Bundle.cpp */,2994 2988 A1FDFD2E19C288BB005148A4 /* WKImageCreateCGImageCrash.cpp */, 2995 2989 7C89D2AA1A69B80D003A5FDE /* WKPageConfiguration.cpp */, … … 4078 4072 7CCE7F2E1A411B1000447C4C /* WKBrowsingContextGroupTest.mm in Sources */, 4079 4073 7CCE7F2F1A411B1000447C4C /* WKBrowsingContextLoadDelegateTest.mm in Sources */, 4080 7C54A4BE1AA11CCA00380F78 /* WKBundleFileHandle.cpp in Sources */,4081 4074 5CE354D91E70DA5C00BEFE3B /* WKContentExtensionStore.mm in Sources */, 4082 4075 2D838B1F1EEF3A5C009B980E /* WKContentViewEditingActions.mm in Sources */, … … 4209 4202 7CFBCAE51743238F00B2BFCF /* WillLoad_Bundle.cpp in Sources */, 4210 4203 76E182DD1547569100F1FADD /* WillSendSubmitEvent_Bundle.cpp in Sources */, 4211 7C54A4C11AA11CE400380F78 /* WKBundleFileHandle_Bundle.cpp in Sources */,4212 4204 ); 4213 4205 runOnlyForDeploymentPostprocessing = 0;
Note:
See TracChangeset
for help on using the changeset viewer.