Changeset 236930 in webkit


Ignore:
Timestamp:
Oct 8, 2018, 12:58:09 PM (6 years ago)
Author:
achristensen@apple.com
Message:

Remove WKBundleFileHandleRef
​https://bugs.webkit.org/show_bug.cgi?id=190360

Reviewed by Tim Horton.

Source/WebKit:

WKBundleFrameGetJavaScriptWrapperForFileForWorld and WKBundleFileHandleCreateWithPath were only used in Mail
and were removed in rdar://problem/44955158
I need to remove them for rdar://problem/24576194

  • Shared/API/APIObject.h:
  • Shared/API/c/WKDeprecated.h:
  • Shared/API/c/WKDeprecatedFunctions.cpp:

(WKBundleFrameGetJavaScriptWrapperForFileForWorld):
(WKBundleFileHandleCreateWithPath):

  • Sources.txt:
  • SourcesCocoa.txt:
  • WebKit.xcodeproj/project.pbxproj:
  • WebProcess/InjectedBundle/API/c/WKBundleAPICast.h:
  • WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.cpp: Removed.
  • WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h:
  • WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:

(WKBundleFrameGetJavaScriptWrapperForFileForWorld): Deleted.

  • WebProcess/InjectedBundle/API/c/WKBundleFrame.h:
  • WebProcess/InjectedBundle/DOM/InjectedBundleFileHandle.cpp: Removed.
  • WebProcess/InjectedBundle/DOM/InjectedBundleFileHandle.h: Removed.
  • WebProcess/WebPage/WebFrame.cpp:
  • WebProcess/WebPage/WebFrame.h:

Tools:

  • TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
  • TestWebKitAPI/Tests/WebKit/WKBundleFileHandle.cpp: Removed.
  • TestWebKitAPI/Tests/WebKit/WKBundleFileHandle_Bundle.cpp: Removed.
Location:
trunk
Files:
5 deleted
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r236928 r236930  
     12018-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
    1312018-10-08  Konstantin Tokarev  <annulen@yandex.ru>
    232

  • trunk/Source/WebKit/Shared/API/APIObject.h

    r235921 r236930  
    178178        BundleCSSStyleDeclarationHandle,
    179179        BundleDOMWindowExtension,
    180         BundleFileHandle,
    181180        BundleFrame,
    182181        BundleHitTestResult,

  • trunk/Source/WebKit/Shared/API/c/WKDeprecated.h

    r236436 r236930  
    2727
    2828#ifdef _MSC_VER
     29#define WK_C_API_DEPRECATED(...)
    2930#define WK_C_API_DEPRECATED_WITH_REPLACEMENT(...)
    3031#else
     32#define WK_C_API_DEPRECATED(_message, ...) __attribute__((deprecated(_message)))
    3133#define WK_C_API_DEPRECATED_WITH_REPLACEMENT(_replacement, ...) __attribute__((deprecated("use " #_replacement)))
    3234#endif

  • trunk/Source/WebKit/Shared/API/c/WKDeprecatedFunctions.cpp

    r227535 r236930  
    3030#include "WKAPICast.h"
    3131#include "WKArray.h"
     32#include "WKBundleFileHandleRef.h"
     33#include "WKBundleFrame.h"
    3234#include "WKContextPrivate.h"
    3335#include "WKMutableDictionary.h"
    … …  
    3739#include "WebUserContentControllerProxy.h"
    3840
    39 #if PLATFORM(MAC)
    40 #include "WKContextPrivateMac.h"
    41 #endif
    42 
    4341// Deprecated functions that should be removed from the framework once nobody uses them.
    44 
    45 using namespace WebKit;
    4642
    4743void WKContextSetUsesNetworkProcess(WKContextRef, bool)
    … …  
    6157    return false;
    6258}
     59
     60JSValueRef WKBundleFrameGetJavaScriptWrapperForFileForWorld(WKBundleFrameRef, WKBundleFileHandleRef, WKBundleScriptWorldRef)
     61{
     62    return nullptr;
     63}
     64
     65WKBundleFileHandleRef WKBundleFileHandleCreateWithPath(WKStringRef)
     66{
     67    return nullptr;
     68}

  • trunk/Source/WebKit/Sources.txt

    r236690 r236930  
    445445
    446446WebProcess/InjectedBundle/DOM/InjectedBundleCSSStyleDeclarationHandle.cpp
    447 WebProcess/InjectedBundle/DOM/InjectedBundleFileHandle.cpp
    448447WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp @no-unify
    449448WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp @no-unify

  • trunk/Source/WebKit/SourcesCocoa.txt

    r236773 r236930  
    481481WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm
    482482
    483 WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.cpp
    484483WebProcess/InjectedBundle/API/c/WKBundlePageBanner.cpp
    485484

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r236902 r236930  
    11421142                7CB365AD1D31DC10007158CA /* _WKUserInitiatedActionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CB365AC1D31DC10007158CA /* _WKUserInitiatedActionInternal.h */; };
    11431143                7CB365B11D31DD1E007158CA /* APIUserInitiatedAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CB365AF1D31DD1E007158CA /* APIUserInitiatedAction.h */; };
    1144                 7CBB811D1AA0F8B1006B1942 /* InjectedBundleFileHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CBB811B1AA0F8B1006B1942 /* InjectedBundleFileHandle.h */; };
    11451144                7CBB81211AA0F970006B1942 /* WKBundleFileHandleRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CBB811F1AA0F970006B1942 /* WKBundleFileHandleRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
    11461145                7CC99A3618EF7CBC0048C8B4 /* WKScriptMessageInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CC99A3518EF7CBC0048C8B4 /* WKScriptMessageInternal.h */; };
    … …  
    35733572                7CB365AC1D31DC10007158CA /* _WKUserInitiatedActionInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKUserInitiatedActionInternal.h; sourceTree = "<group>"; };
    35743573                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>"; };
    35783574                7CBB811F1AA0F970006B1942 /* WKBundleFileHandleRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleFileHandleRef.h; sourceTree = "<group>"; };
    35793575                7CC99A3518EF7CBC0048C8B4 /* WKScriptMessageInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKScriptMessageInternal.h; sourceTree = "<group>"; };
    … …  
    77537749                                51FA2D7515212E1E00C1BA0B /* WKBundleDOMWindowExtension.cpp */,
    77547750                                51FA2D541521118600C1BA0B /* WKBundleDOMWindowExtension.h */,
    7755                                 7CBB811E1AA0F970006B1942 /* WKBundleFileHandleRef.cpp */,
    77567751                                7CBB811F1AA0F970006B1942 /* WKBundleFileHandleRef.h */,
    77577752                                BCD25F1611D6BDE100169B0E /* WKBundleFrame.cpp */,
    … …  
    78617856                                7C4ED3261A3119D90079BD49 /* InjectedBundleCSSStyleDeclarationHandle.cpp */,
    78627857                                7C4ED3271A3119D90079BD49 /* InjectedBundleCSSStyleDeclarationHandle.h */,
    7863                                 7CBB811A1AA0F8B1006B1942 /* InjectedBundleFileHandle.cpp */,
    7864                                 7CBB811B1AA0F8B1006B1942 /* InjectedBundleFileHandle.h */,
    78657858                                BC4BEEAA120A0A5F00FBA0C7 /* InjectedBundleNodeHandle.cpp */,
    78667859                                BC4BEEA9120A0A5E00FBA0C7 /* InjectedBundleNodeHandle.h */,
    … …  
    89168909                                935EEBA4127761D6003322B8 /* InjectedBundleBackForwardListItem.h in Headers */,
    89178910                                BCEE7DC5128B645D009827DA /* InjectedBundleClient.h in Headers */,
    8918                                 7CBB811D1AA0F8B1006B1942 /* InjectedBundleFileHandle.h in Headers */,
    89198911                                BC498618124D10E200D834E1 /* InjectedBundleHitTestResult.h in Headers */,
    89208912                                84477853176FCC0800CDC7BB /* InjectedBundleHitTestResultMediaType.h in Headers */,

  • trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleAPICast.h

    r210109 r236930  
    4040class InjectedBundleCSSStyleDeclarationHandle;
    4141class InjectedBundleDOMWindowExtension;
    42 class InjectedBundleFileHandle;
    4342class InjectedBundleHitTestResult;
    4443class InjectedBundleNavigationAction;
    … …  
    5756WK_ADD_API_MAPPING(WKBundleCSSStyleDeclarationRef, InjectedBundleCSSStyleDeclarationHandle)
    5857WK_ADD_API_MAPPING(WKBundleDOMWindowExtensionRef, InjectedBundleDOMWindowExtension)
    59 WK_ADD_API_MAPPING(WKBundleFileHandleRef, InjectedBundleFileHandle)
    6058WK_ADD_API_MAPPING(WKBundleFrameRef, WebFrame)
    6159WK_ADD_API_MAPPING(WKBundleHitTestResultRef, InjectedBundleHitTestResult)

  • trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h

    r236441 r236930  
    3434#endif
    3535
    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);
     36WK_EXPORT WKBundleFileHandleRef WKBundleFileHandleCreateWithPath(WKStringRef path) WK_C_API_DEPRECATED("No longer supported");
    4037
    4138#ifdef __cplusplus

  • trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp

    r226189 r236930  
    3030#include "APIArray.h"
    3131#include "APISecurityOrigin.h"
    32 #include "InjectedBundleFileHandle.h"
    3332#include "InjectedBundleHitTestResult.h"
    3433#include "InjectedBundleNodeHandle.h"
    … …  
    124123}
    125124
    126 JSValueRef WKBundleFrameGetJavaScriptWrapperForFileForWorld(WKBundleFrameRef frameRef, WKBundleFileHandleRef fileHandleRef, WKBundleScriptWorldRef worldRef)
    127 {
    128     return toImpl(frameRef)->jsWrapperForWorld(toImpl(fileHandleRef), toImpl(worldRef));
    129 }
    130 
    131125WKStringRef WKBundleFrameCopyName(WKBundleFrameRef frameRef)
    132126{

  • trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.h

    r181251 r236930  
    2929#include <JavaScriptCore/JavaScript.h>
    3030#include <WebKit/WKBase.h>
     31#include <WebKit/WKDeprecated.h>
    3132#include <WebKit/WKFrame.h>
    3233#include <WebKit/WKGeometry.h>
    … …  
    5657WK_EXPORT JSValueRef WKBundleFrameGetJavaScriptWrapperForNodeForWorld(WKBundleFrameRef frame, WKBundleNodeHandleRef nodeHandle, WKBundleScriptWorldRef world);
    5758WK_EXPORT JSValueRef WKBundleFrameGetJavaScriptWrapperForRangeForWorld(WKBundleFrameRef frame, WKBundleRangeHandleRef rangeHandle, WKBundleScriptWorldRef world);
    58 WK_EXPORT JSValueRef WKBundleFrameGetJavaScriptWrapperForFileForWorld(WKBundleFrameRef frame, WKBundleFileHandleRef fileHandle, WKBundleScriptWorldRef world);
     59WK_EXPORT JSValueRef WKBundleFrameGetJavaScriptWrapperForFileForWorld(WKBundleFrameRef frame, WKBundleFileHandleRef fileHandle, WKBundleScriptWorldRef world) WK_C_API_DEPRECATED("No longer supported");
    5960
    6061WK_EXPORT WKBundlePageRef WKBundleFrameGetPage(WKBundleFrameRef frame);

  • trunk/Source/WebKit/WebProcess/WebPage/WebFrame.cpp

    r236512 r236930  
    3030#include "DownloadManager.h"
    3131#include "FrameInfoData.h"
    32 #include "InjectedBundleFileHandle.h"
    3332#include "InjectedBundleHitTestResult.h"
    3433#include "InjectedBundleNodeHandle.h"
    … …  
    736735}
    737736
    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 
    750737String WebFrame::counterValue(JSObjectRef element)
    751738{

  • trunk/Source/WebKit/WebProcess/WebPage/WebFrame.h

    r235562 r236930  
    5959namespace WebKit {
    6060
    61 class InjectedBundleFileHandle;
    6261class InjectedBundleHitTestResult;
    6362class InjectedBundleNodeHandle;
    … …  
    134133    JSValueRef jsWrapperForWorld(InjectedBundleNodeHandle*, InjectedBundleScriptWorld*);
    135134    JSValueRef jsWrapperForWorld(InjectedBundleRangeHandle*, InjectedBundleScriptWorld*);
    136     JSValueRef jsWrapperForWorld(InjectedBundleFileHandle*, InjectedBundleScriptWorld*);
    137135
    138136    static String counterValue(JSObjectRef element);

  • trunk/Tools/ChangeLog

    r236913 r236930  
     12018-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
    1122018-10-08  Dan Bernstein  <mitz@apple.com>
    213

  • trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

    r236913 r236930  
    346346                7C417F331D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C417F311D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm */; };
    347347                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 */; };
    350348                7C83DE991D0A590C00FEBCF3 /* AtomicString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F1B44215CA434F00D1E4BF /* AtomicString.cpp */; };
    351349                7C83DE9C1D0A590C00FEBCF3 /* BloomFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E40019301ACE9B5C001B0A2A /* BloomFilter.cpp */; };
    … …  
    16571655                7C417F311D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewDefaultNavigationDelegate.mm; sourceTree = "<group>"; };
    16581656                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>"; };
    16611657                7C6BBD8A19CEA54300C1F5E0 /* Counters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Counters.h; sourceTree = "<group>"; };
    16621658                7C6BBD8B19CEA63000C1F5E0 /* Counters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Counters.cpp; sourceTree = "<group>"; };
    … …  
    29902986                                76E182D91547550100F1FADD /* WillSendSubmitEvent.cpp */,
    29912987                                76E182DC1547569100F1FADD /* WillSendSubmitEvent_Bundle.cpp */,
    2992                                 7C54A4BC1AA11CCA00380F78 /* WKBundleFileHandle.cpp */,
    2993                                 7C54A4BF1AA11CE400380F78 /* WKBundleFileHandle_Bundle.cpp */,
    29942988                                A1FDFD2E19C288BB005148A4 /* WKImageCreateCGImageCrash.cpp */,
    29952989                                7C89D2AA1A69B80D003A5FDE /* WKPageConfiguration.cpp */,
    … …  
    40784072                                7CCE7F2E1A411B1000447C4C /* WKBrowsingContextGroupTest.mm in Sources */,
    40794073                                7CCE7F2F1A411B1000447C4C /* WKBrowsingContextLoadDelegateTest.mm in Sources */,
    4080                                 7C54A4BE1AA11CCA00380F78 /* WKBundleFileHandle.cpp in Sources */,
    40814074                                5CE354D91E70DA5C00BEFE3B /* WKContentExtensionStore.mm in Sources */,
    40824075                                2D838B1F1EEF3A5C009B980E /* WKContentViewEditingActions.mm in Sources */,
    … …  
    42094202                                7CFBCAE51743238F00B2BFCF /* WillLoad_Bundle.cpp in Sources */,
    42104203                                76E182DD1547569100F1FADD /* WillSendSubmitEvent_Bundle.cpp in Sources */,
    4211                                 7C54A4C11AA11CE400380F78 /* WKBundleFileHandle_Bundle.cpp in Sources */,
    42124204                        );
    42134205                        runOnlyForDeploymentPostprocessing = 0;
Note: See TracChangeset for help on using the changeset viewer.