Changeset 184929 in webkit


Ignore:
Timestamp:
May 27, 2015 5:25:52 PM (9 years ago)
Author:
Antti Koivisto
Message:

Disable network cache for old clients
https://bugs.webkit.org/show_bug.cgi?id=145418
rdar://problem/21126587

Reviewed by Andy Estes.

Old clients might use NSURLCache API to clear the cache. New cache requires use of new APIs.

  • UIProcess/Cocoa/VersionChecks.h: Added.
  • UIProcess/Cocoa/VersionChecks.mm: Added.

Add linked-on-or-after check mechanism similar to WebKit1.

(WebKit::linkTimeVersion):
(WebKit::linkedOnOrAfter):

  • UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::WebProcessPool::platformInitializeNetworkProcess):

Use it when deciding whether to enable the cache.

  • WebKit2.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit2
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r184928 r184929  
     12015-05-27  Antti Koivisto  <antti@apple.com>
     2
     3        Disable network cache for old clients
     4        https://bugs.webkit.org/show_bug.cgi?id=145418
     5        rdar://problem/21126587
     6
     7        Reviewed by Andy Estes.
     8
     9        Old clients might use NSURLCache API to clear the cache. New cache requires use of new APIs.
     10
     11        * UIProcess/Cocoa/VersionChecks.h: Added.
     12        * UIProcess/Cocoa/VersionChecks.mm: Added.
     13
     14            Add linked-on-or-after check mechanism similar to WebKit1.
     15
     16        (WebKit::linkTimeVersion):
     17        (WebKit::linkedOnOrAfter):
     18        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
     19        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
     20
     21            Use it when deciding whether to enable the cache.
     22
     23        * WebKit2.xcodeproj/project.pbxproj:
     24
    1252015-05-27  Dean Jackson  <dino@apple.com>
    226
  • trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm

    r184686 r184929  
    3030#import "SandboxUtilities.h"
    3131#import "TextChecker.h"
     32#import "VersionChecks.h"
    3233#import "WKBrowsingContextControllerInternal.h"
    3334#import "WKBrowsingContextControllerInternal.h"
     
    256257
    257258#if ENABLE(NETWORK_CACHE)
    258     parameters.shouldEnableNetworkCache = [defaults boolForKey:WebKitNetworkCacheEnabledDefaultsKey] && ![defaults boolForKey:WebKitNetworkCacheTemporarilyDisabledForTestingKey];
     259    bool networkCacheEnabledByDefaults = [defaults boolForKey:WebKitNetworkCacheEnabledDefaultsKey] && ![defaults boolForKey:WebKitNetworkCacheTemporarilyDisabledForTestingKey];
     260    parameters.shouldEnableNetworkCache = networkCacheEnabledByDefaults && linkedOnOrAfter(LibraryVersion::FirstWithNetworkCache);
    259261    parameters.shouldEnableNetworkCacheEfficacyLogging = [defaults boolForKey:WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey];
    260262#endif
  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r184912 r184929  
    18041804                E49D40D71AD3FB170066B7B9 /* NetworkCacheBlobStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = E49D40D61AD3FB170066B7B9 /* NetworkCacheBlobStorage.h */; };
    18051805                E49D40D91AD3FB210066B7B9 /* NetworkCacheBlobStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E49D40D81AD3FB210066B7B9 /* NetworkCacheBlobStorage.cpp */; };
     1806                E4E864921B16750100C82F40 /* VersionChecks.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4E8648F1B1673FB00C82F40 /* VersionChecks.mm */; };
     1807                E4E864931B16750700C82F40 /* VersionChecks.h in Headers */ = {isa = PBXBuildFile; fileRef = E4E8648E1B1673FB00C82F40 /* VersionChecks.h */; };
    18061808                ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; };
    18071809                EDCA71B7128DDA8C00201B26 /* WKBundlePageOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A22F1001289FCD90085E74F /* WKBundlePageOverlay.cpp */; };
     
    40754077                E49D40D61AD3FB170066B7B9 /* NetworkCacheBlobStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheBlobStorage.h; sourceTree = "<group>"; };
    40764078                E49D40D81AD3FB210066B7B9 /* NetworkCacheBlobStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheBlobStorage.cpp; sourceTree = "<group>"; };
     4079                E4E8648E1B1673FB00C82F40 /* VersionChecks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VersionChecks.h; sourceTree = "<group>"; };
     4080                E4E8648F1B1673FB00C82F40 /* VersionChecks.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VersionChecks.mm; sourceTree = "<group>"; };
    40774081                F036978715F4BF0500C3A80E /* WebColorPicker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebColorPicker.cpp; sourceTree = "<group>"; };
    40784082                F6113E24126CE1820057D0A7 /* APIUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIUserContentURLPattern.h; sourceTree = "<group>"; };
     
    49634967                                1AFE436418B6C081009C7A48 /* UIDelegate.h */,
    49644968                                1AFE436318B6C081009C7A48 /* UIDelegate.mm */,
     4969                                E4E8648E1B1673FB00C82F40 /* VersionChecks.h */,
     4970                                E4E8648F1B1673FB00C82F40 /* VersionChecks.mm */,
    49654971                                1AC0273E196622D600C12B75 /* WebPageProxyCocoa.mm */,
    49664972                                7C4694CB1A4B510A00AD5845 /* WebPasteboardProxyCocoa.mm */,
     
    76757681                                BC33DD681238464600360F3F /* APINumber.h in Headers */,
    76767682                                7C89D2981A6753B2003A5FDE /* APIPageConfiguration.h in Headers */,
     7683                                E4E864931B16750700C82F40 /* VersionChecks.h in Headers */,
    76777684                                1AC1336C18565C7A00F3EC05 /* APIPageHandle.h in Headers */,
    76787685                                1AFDD3151891B54000153970 /* APIPolicyClient.h in Headers */,
     
    98909897                                1C891D6519B124FF00BA79DD /* WebInspectorUI.cpp in Sources */,
    98919898                                1CA8B954127C891500576C2B /* WebInspectorUIMac.mm in Sources */,
     9899                                E4E864921B16750100C82F40 /* VersionChecks.mm in Sources */,
    98929900                                1CBBE4A019B66C53006B7D81 /* WebInspectorUIMessageReceiver.cpp in Sources */,
    98939901                                2DA944A11884E4F000ED86DB /* WebIOSEventFactory.mm in Sources */,
Note: See TracChangeset for help on using the changeset viewer.