Changeset 197177 in webkit


Ignore:
Timestamp:
Feb 26, 2016 10:17:14 AM (8 years ago)
Author:
akling@apple.com
Message:

Remove unused CFNetwork disk cache mmap optimization in WebKit2.
<​https://webkit.org/b/154727>

Reviewed by Darin Adler.

Source/WebCore:

Remove some now-unused SPI.

  • platform/spi/cf/CFNetworkSPI.h:

Source/WebKit2:

Nuke all the code related to the mmap optimization we had for CFNetwork's disk cache.
This code has not been used since we moved to the WebKit2 network cache.

  • NetworkProcess/Downloads/PendingDownload.h:
  • NetworkProcess/NetworkLoadClient.h:
  • NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::sendBufferMaybeAborting): Deleted.

  • NetworkProcess/NetworkResourceLoader.h:
  • NetworkProcess/cache/NetworkCacheSpeculativeLoad.h:
  • NetworkProcess/cocoa/NetworkProcessCocoa.mm:

(WebKit::NetworkProcess::platformLowMemoryHandler): Deleted.
(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa): Deleted.

  • NetworkProcess/mac/NetworkDiskCacheMonitor.h: Removed.
  • NetworkProcess/mac/NetworkDiskCacheMonitor.mm: Removed.
  • NetworkProcess/mac/NetworkLoadMac.mm:

(WebKit::NetworkLoad::willCacheResponseAsync): Deleted.

  • NetworkProcess/mac/NetworkResourceLoaderMac.mm: Removed.
  • WebKit2.xcodeproj/project.pbxproj:
Location:
trunk/Source
Files:
3 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r197176 r197177  
     12016-02-26  Andreas Kling  <akling@apple.com>
     2
     3        Remove unused CFNetwork disk cache mmap optimization in WebKit2.
     4        <https://webkit.org/b/154727>
     5
     6        Reviewed by Darin Adler.
     7
     8        Remove some now-unused SPI.
     9
     10        * platform/spi/cf/CFNetworkSPI.h:
     11
    1122016-02-26  Commit Queue  <commit-queue@webkit.org>
    213

  • trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h

    r196503 r197177  
    112112EXTERN_C CFURLCacheRef CFURLCacheCopySharedURLCache();
    113113EXTERN_C void CFURLCacheSetMemoryCapacity(CFURLCacheRef, CFIndex memoryCapacity);
    114 EXTERN_C void _CFURLCachePurgeMemoryCache(CFURLCacheRef);
    115114#if PLATFORM(COCOA)
    116 EXTERN_C CFBooleanRef _CFURLCacheIsResponseDataMemMapped(CFURLCacheRef, CFDataRef);
    117 EXTERN_C void _CFURLCacheSetMinSizeForVMCachedResource(CFURLCacheRef, CFIndex);
    118 
    119115EXTERN_C Boolean _CFNetworkIsKnownHSTSHostWithSession(CFURLRef, CFURLStorageSessionRef);
    120116EXTERN_C void _CFNetworkResetHSTSHostsWithSession(CFURLStorageSessionRef);

  • trunk/Source/WebKit2/ChangeLog

    r197173 r197177  
     12016-02-26  Andreas Kling  <akling@apple.com>
     2
     3        Remove unused CFNetwork disk cache mmap optimization in WebKit2.
     4        <https://webkit.org/b/154727>
     5
     6        Reviewed by Darin Adler.
     7
     8        Nuke all the code related to the mmap optimization we had for CFNetwork's disk cache.
     9        This code has not been used since we moved to the WebKit2 network cache.
     10
     11        * NetworkProcess/Downloads/PendingDownload.h:
     12        * NetworkProcess/NetworkLoadClient.h:
     13        * NetworkProcess/NetworkResourceLoader.cpp:
     14        (WebKit::NetworkResourceLoader::sendBufferMaybeAborting): Deleted.
     15        * NetworkProcess/NetworkResourceLoader.h:
     16        * NetworkProcess/cache/NetworkCacheSpeculativeLoad.h:
     17        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
     18        (WebKit::NetworkProcess::platformLowMemoryHandler): Deleted.
     19        (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa): Deleted.
     20        * NetworkProcess/mac/NetworkDiskCacheMonitor.h: Removed.
     21        * NetworkProcess/mac/NetworkDiskCacheMonitor.mm: Removed.
     22        * NetworkProcess/mac/NetworkLoadMac.mm:
     23        (WebKit::NetworkLoad::willCacheResponseAsync): Deleted.
     24        * NetworkProcess/mac/NetworkResourceLoaderMac.mm: Removed.
     25        * WebKit2.xcodeproj/project.pbxproj:
     26
    1272016-02-26  Commit Queue  <commit-queue@webkit.org>
    228

  • trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h

    r197050 r197177  
    6060    virtual void didFailLoading(const WebCore::ResourceError&) override;
    6161    virtual void didBecomeDownload() override;
    62 #if PLATFORM(COCOA)
    63     virtual void willCacheResponseAsync(CFCachedURLResponseRef) override { }
    64 #endif
    6562   
    6663    // MessageSender.

  • trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h

    r197050 r197177  
    6060    virtual void didBecomeDownload() = 0;
    6161#endif
    62 
    63 #if PLATFORM(COCOA)
    64     virtual void willCacheResponseAsync(CFCachedURLResponseRef) = 0;
    65 #endif
    6662};
    6763

  • trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

    r197050 r197177  
    480480    ASSERT(!isSynchronous());
    481481
    482 #if PLATFORM(COCOA)
    483     ShareableResource::Handle shareableResourceHandle;
    484     NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer(shareableResourceHandle, buffer);
    485     if (!shareableResourceHandle.isNull()) {
    486         send(Messages::WebResourceLoader::DidReceiveResource(shareableResourceHandle, currentTime()));
    487         abort();
    488         return false;
    489     }
    490 #endif
    491 
    492482    IPC::SharedBufferDataReference dataReference(&buffer);
    493483    return sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveData(dataReference, encodedDataLength));

  • trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h

    r197050 r197177  
    6767    void setDefersLoading(bool);
    6868
    69 #if PLATFORM(COCOA)
    70     static size_t fileBackedResourceMinimumSize();
    71     virtual void willCacheResponseAsync(CFCachedURLResponseRef) override;
    72 #endif
    73 
    7469    // Message handlers.
    7570    void didReceiveNetworkResourceLoaderMessage(IPC::Connection&, IPC::MessageDecoder&);
    76 
    77 #if PLATFORM(COCOA)
    78     static void tryGetShareableHandleFromCFURLCachedResponse(ShareableResource::Handle&, CFCachedURLResponseRef);
    79     static void tryGetShareableHandleFromSharedBuffer(ShareableResource::Handle&, WebCore::SharedBuffer&);
    80 #endif
    8171
    8272#if USE(PROTECTION_SPACE_AUTH_CALLBACK)

  • trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h

    r197050 r197177  
    6363    virtual void didBecomeDownload() override { ASSERT_NOT_REACHED(); }
    6464#endif
    65 #if PLATFORM(COCOA)
    66     virtual void willCacheResponseAsync(CFCachedURLResponseRef) override { }
    67 #endif
    6865
    6966    void didComplete();

  • trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm

    r194378 r197177  
    4545{
    4646    CFURLConnectionInvalidateConnectionCache();
    47     _CFURLCachePurgeMemoryCache(adoptCF(CFURLCacheCopySharedURLCache()).get());
    4847}
    4948
    … …  
    121120            diskPath:nsURLCacheDirectory]).get()];
    122121    }
    123 
    124     RetainPtr<CFURLCacheRef> cache = adoptCF(CFURLCacheCopySharedURLCache());
    125     if (!cache)
    126         return;
    127 
    128     _CFURLCacheSetMinSizeForVMCachedResource(cache.get(), NetworkResourceLoader::fileBackedResourceMinimumSize());
    129122}
    130123

  • trunk/Source/WebKit2/NetworkProcess/mac/NetworkLoadMac.mm

    r196428 r197177  
    4141    ASSERT_UNUSED(handle, handle == m_handle);
    4242
    43     m_client.willCacheResponseAsync(cfResponse);
    44 
    4543    m_handle->continueWillCacheResponse(cfResponse);
    4644}
    … …  
    5250    ASSERT_UNUSED(handle, handle == m_handle);
    5351
    54     m_client.willCacheResponseAsync([nsResponse _CFCachedURLResponse]);
    55 
    5652    m_handle->continueWillCacheResponse(nsResponse);
    5753}

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

    r197172 r197177  
    918918                5163199416289A6000E22F00 /* NetworkProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ACC9341628064800342550 /* NetworkProcessMessageReceiver.cpp */; };
    919919                5163199516289A6300E22F00 /* NetworkProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACC9351628064800342550 /* NetworkProcessMessages.h */; };
    920                 5167EEA0170377BF007681CA /* NetworkDiskCacheMonitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5167EE9E170377BF007681CA /* NetworkDiskCacheMonitor.h */; };
    921                 5167EEA1170377BF007681CA /* NetworkDiskCacheMonitor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5167EE9F170377BF007681CA /* NetworkDiskCacheMonitor.mm */; };
    922920                516A4A5D120A2CCD00C05B7F /* APIError.h in Headers */ = {isa = PBXBuildFile; fileRef = 516A4A5B120A2CCD00C05B7F /* APIError.h */; };
    923921                51795567162876CB00FA43B6 /* NetworkProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51A8A6151627F3F9000D90E9 /* NetworkProcessMac.mm */; };
    … …  
    982980                51E35202180F5D1E00E53BE9 /* DatabaseProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E35201180F5D1E00E53BE9 /* DatabaseProcessMac.mm */; };
    983981                51E35209180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E35208180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm */; };
    984                 51E3B67F16F266B3009968DC /* NetworkResourceLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E3B67E16F266B3009968DC /* NetworkResourceLoaderMac.mm */; };
    985982                51EFC1CF1524E62500C9A938 /* WKBundleDOMWindowExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FA2D541521118600C1BA0B /* WKBundleDOMWindowExtension.h */; settings = {ATTRIBUTES = (Private, ); }; };
    986983                51F060E01654317F00F3281B /* WebResourceLoaderMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F060DE1654317500F3281B /* WebResourceLoaderMessages.h */; };
    … …  
    29022899                516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessProxyMac.mm; path = mac/NetworkProcessProxyMac.mm; sourceTree = "<group>"; };
    29032900                5164C0941B05B757004F102A /* ChildProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChildProcess.messages.in; sourceTree = "<group>"; };
    2904                 5167EE9E170377BF007681CA /* NetworkDiskCacheMonitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkDiskCacheMonitor.h; sourceTree = "<group>"; };
    2905                 5167EE9F170377BF007681CA /* NetworkDiskCacheMonitor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkDiskCacheMonitor.mm; sourceTree = "<group>"; };
    29062901                516A4A5B120A2CCD00C05B7F /* APIError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIError.h; sourceTree = "<group>"; };
    29072902                517A33B3130B308C00F80CB5 /* WKApplicationCacheManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKApplicationCacheManager.cpp; sourceTree = "<group>"; };
    … …  
    29772972                51E35207180F5D6100E53BE9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
    29782973                51E35208180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DatabaseServiceEntryPoint.mm; sourceTree = "<group>"; };
    2979                 51E3B67E16F266B3009968DC /* NetworkResourceLoaderMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkResourceLoaderMac.mm; sourceTree = "<group>"; };
    29802974                51F060DD1654317500F3281B /* WebResourceLoaderMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebResourceLoaderMessageReceiver.cpp; sourceTree = "<group>"; };
    29812975                51F060DE1654317500F3281B /* WebResourceLoaderMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebResourceLoaderMessages.h; sourceTree = "<group>"; };
    … …  
    52225216                        children = (
    52235217                                E17AE2C116B9C139001C42F1 /* com.apple.WebKit.NetworkProcess.sb.in */,
    5224                                 5167EE9E170377BF007681CA /* NetworkDiskCacheMonitor.h */,
    5225                                 5167EE9F170377BF007681CA /* NetworkDiskCacheMonitor.mm */,
    52265218                                836EEB7F1BE9EC9E006B4B82 /* NetworkLoadMac.mm */,
    52275219                                51A8A6151627F3F9000D90E9 /* NetworkProcessMac.mm */,
    5228                                 51E3B67E16F266B3009968DC /* NetworkResourceLoaderMac.mm */,
    52295220                                E1B78472163F253E0007B692 /* RemoteNetworkingContext.mm */,
    52305221                        );
    … …  
    73697360                                513A164D1630A9BF005D7D22 /* NetworkConnectionToWebProcess.h in Headers */,
    73707361                                51DD9F2916367DA2001578E9 /* NetworkConnectionToWebProcessMessages.h in Headers */,
    7371                                 5167EEA0170377BF007681CA /* NetworkDiskCacheMonitor.h in Headers */,
    73727362                                839902031BE9A02B000F3653 /* NetworkLoad.h in Headers */,
    73737363                                83D454D71BE9D3C4006C93BD /* NetworkLoadClient.h in Headers */,
    … …  
    88098799                                513A164C1630A9BF005D7D22 /* NetworkConnectionToWebProcess.cpp in Sources */,
    88108800                                51DD9F2816367DA2001578E9 /* NetworkConnectionToWebProcessMessageReceiver.cpp in Sources */,
    8811                                 5167EEA1170377BF007681CA /* NetworkDiskCacheMonitor.mm in Sources */,
    88128801                                839902021BE9A02B000F3653 /* NetworkLoad.cpp in Sources */,
    88138802                                836EEB801BE9EC9E006B4B82 /* NetworkLoadMac.mm in Sources */,
    … …  
    88268815                                51FD18B51651FBAD00DBE1CE /* NetworkResourceLoader.cpp in Sources */,
    88278816                                1A781AE71C5714DA00FB96DD /* WebKitAdditions.mm in Sources */,
    8828                                 51E3B67F16F266B3009968DC /* NetworkResourceLoaderMac.mm in Sources */,
    88298817                                E152551A17011819003D7ADB /* NetworkResourceLoaderMessageReceiver.cpp in Sources */,
    88308818                                BC8283AC16B4BF3F00A278FE /* NetworkServiceEntryPoint.mm in Sources */,
Note: See TracChangeset for help on using the changeset viewer.