Changeset 185601 in webkit


Ignore:
Timestamp:
Jun 16, 2015, 12:43:11 PM (10 years ago)
Author:
andersca@apple.com
Message:

Get rid of the application cache manager classes, they are no longer used
​https://bugs.webkit.org/show_bug.cgi?id=146024

Reviewed by Sam Weinig.

  • DerivedSources.make:
  • UIProcess/API/C/WKAPICast.h:
  • UIProcess/API/C/WKContext.cpp:
  • UIProcess/WebApplicationCacheManagerProxy.cpp: Removed.

(WebKit::WebApplicationCacheManagerProxy::supplementName): Deleted.
(WebKit::WebApplicationCacheManagerProxy::create): Deleted.
(WebKit::WebApplicationCacheManagerProxy::WebApplicationCacheManagerProxy): Deleted.
(WebKit::WebApplicationCacheManagerProxy::~WebApplicationCacheManagerProxy): Deleted.
(WebKit::WebApplicationCacheManagerProxy::processPoolDestroyed): Deleted.
(WebKit::WebApplicationCacheManagerProxy::processDidClose): Deleted.
(WebKit::WebApplicationCacheManagerProxy::shouldTerminate): Deleted.
(WebKit::WebApplicationCacheManagerProxy::refWebContextSupplement): Deleted.
(WebKit::WebApplicationCacheManagerProxy::derefWebContextSupplement): Deleted.
(WebKit::WebApplicationCacheManagerProxy::getApplicationCacheOrigins): Deleted.
(WebKit::WebApplicationCacheManagerProxy::didGetApplicationCacheOrigins): Deleted.
(WebKit::WebApplicationCacheManagerProxy::deleteEntriesForOrigin): Deleted.
(WebKit::WebApplicationCacheManagerProxy::deleteAllEntries): Deleted.

  • UIProcess/WebApplicationCacheManagerProxy.h: Removed.
  • UIProcess/WebApplicationCacheManagerProxy.messages.in: Removed.
  • UIProcess/WebProcessPool.cpp:
  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/ApplicationCache/WebApplicationCacheManager.cpp: Removed.

(WebKit::WebApplicationCacheManager::supplementName): Deleted.
(WebKit::WebApplicationCacheManager::WebApplicationCacheManager): Deleted.
(WebKit::WebApplicationCacheManager::getApplicationCacheOrigins): Deleted.
(WebKit::WebApplicationCacheManager::deleteEntriesForOrigin): Deleted.
(WebKit::WebApplicationCacheManager::deleteAllEntries): Deleted.
(WebKit::WebApplicationCacheManager::setAppCacheMaximumSize): Deleted.

  • WebProcess/ApplicationCache/WebApplicationCacheManager.h: Removed.
  • WebProcess/ApplicationCache/WebApplicationCacheManager.messages.in: Removed.
  • WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::clearApplicationCache):
(WebKit::InjectedBundle::setAppCacheMaximumSize):

  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::WebProcess): Deleted.

Location:
trunk/Source/WebKit2
Files:
4 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r185599 r185601  
     12015-06-16  Anders Carlsson  <andersca@apple.com>
     2
     3        Get rid of the application cache manager classes, they are no longer used
     4        https://bugs.webkit.org/show_bug.cgi?id=146024
     5
     6        Reviewed by Sam Weinig.
     7
     8        * DerivedSources.make:
     9        * UIProcess/API/C/WKAPICast.h:
     10        * UIProcess/API/C/WKContext.cpp:
     11        * UIProcess/WebApplicationCacheManagerProxy.cpp: Removed.
     12        (WebKit::WebApplicationCacheManagerProxy::supplementName): Deleted.
     13        (WebKit::WebApplicationCacheManagerProxy::create): Deleted.
     14        (WebKit::WebApplicationCacheManagerProxy::WebApplicationCacheManagerProxy): Deleted.
     15        (WebKit::WebApplicationCacheManagerProxy::~WebApplicationCacheManagerProxy): Deleted.
     16        (WebKit::WebApplicationCacheManagerProxy::processPoolDestroyed): Deleted.
     17        (WebKit::WebApplicationCacheManagerProxy::processDidClose): Deleted.
     18        (WebKit::WebApplicationCacheManagerProxy::shouldTerminate): Deleted.
     19        (WebKit::WebApplicationCacheManagerProxy::refWebContextSupplement): Deleted.
     20        (WebKit::WebApplicationCacheManagerProxy::derefWebContextSupplement): Deleted.
     21        (WebKit::WebApplicationCacheManagerProxy::getApplicationCacheOrigins): Deleted.
     22        (WebKit::WebApplicationCacheManagerProxy::didGetApplicationCacheOrigins): Deleted.
     23        (WebKit::WebApplicationCacheManagerProxy::deleteEntriesForOrigin): Deleted.
     24        (WebKit::WebApplicationCacheManagerProxy::deleteAllEntries): Deleted.
     25        * UIProcess/WebApplicationCacheManagerProxy.h: Removed.
     26        * UIProcess/WebApplicationCacheManagerProxy.messages.in: Removed.
     27        * UIProcess/WebProcessPool.cpp:
     28        * WebKit2.xcodeproj/project.pbxproj:
     29        * WebProcess/ApplicationCache/WebApplicationCacheManager.cpp: Removed.
     30        (WebKit::WebApplicationCacheManager::supplementName): Deleted.
     31        (WebKit::WebApplicationCacheManager::WebApplicationCacheManager): Deleted.
     32        (WebKit::WebApplicationCacheManager::getApplicationCacheOrigins): Deleted.
     33        (WebKit::WebApplicationCacheManager::deleteEntriesForOrigin): Deleted.
     34        (WebKit::WebApplicationCacheManager::deleteAllEntries): Deleted.
     35        (WebKit::WebApplicationCacheManager::setAppCacheMaximumSize): Deleted.
     36        * WebProcess/ApplicationCache/WebApplicationCacheManager.h: Removed.
     37        * WebProcess/ApplicationCache/WebApplicationCacheManager.messages.in: Removed.
     38        * WebProcess/InjectedBundle/InjectedBundle.cpp:
     39        (WebKit::InjectedBundle::clearApplicationCache):
     40        (WebKit::InjectedBundle::setAppCacheMaximumSize):
     41        * WebProcess/WebProcess.cpp:
     42        (WebKit::WebProcess::WebProcess): Deleted.
     43
    1442015-06-16  Brady Eidson  <beidson@apple.com>
    245

  • trunk/Source/WebKit2/DerivedSources.make

    r185479 r185601  
    106106    VisitedLinkProvider \
    107107    VisitedLinkTableController \
    108     WebApplicationCacheManager \
    109     WebApplicationCacheManagerProxy \
    110108    WebConnection \
    111109    WebCookieManager \

  • trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h

    r185527 r185601  
    7575class NotificationPermissionRequest;
    7676class UserMediaPermissionRequestProxy;
    77 class WebApplicationCacheManagerProxy;
    7877class WebBackForwardList;
    7978class WebBackForwardListItem;

  • trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp

    r185529 r185601  
    4646
    4747// Supplements
    48 #include "WebApplicationCacheManagerProxy.h"
    4948#include "WebCookieManagerProxy.h"
    5049#include "WebDatabaseManagerProxy.h"

  • trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp

    r185479 r185601  
    3939#include "TextChecker.h"
    4040#include "WKContextPrivate.h"
    41 #include "WebApplicationCacheManagerProxy.h"
    4241#include "WebCertificateInfo.h"
    4342#include "WebContextSupplement.h"
    … …  
    194193    m_iconDatabase = WebIconDatabase::create(this);
    195194
    196     addSupplement<WebApplicationCacheManagerProxy>();
    197195    addSupplement<WebCookieManagerProxy>();
    198196    addSupplement<WebGeolocationManagerProxy>();

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

    r185479 r185601  
    909909                512E34E4130B4D0500ABD19A /* WKApplicationCacheManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517A33B3130B308C00F80CB5 /* WKApplicationCacheManager.cpp */; };
    910910                512E34E5130B4D0500ABD19A /* WKApplicationCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 517A33B4130B308C00F80CB5 /* WKApplicationCacheManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
    911                 512E3524130B550600ABD19A /* WebApplicationCacheManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512E3520130B550100ABD19A /* WebApplicationCacheManagerProxy.cpp */; };
    912                 512E3525130B550600ABD19A /* WebApplicationCacheManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 512E3521130B550100ABD19A /* WebApplicationCacheManagerProxy.h */; };
    913                 512E352E130B55AF00ABD19A /* WebApplicationCacheManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512E352B130B55AF00ABD19A /* WebApplicationCacheManager.cpp */; };
    914                 512E352F130B55AF00ABD19A /* WebApplicationCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 512E352C130B55AF00ABD19A /* WebApplicationCacheManager.h */; };
    915                 512E356A130B57F000ABD19A /* WebApplicationCacheManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512E3568130B57F000ABD19A /* WebApplicationCacheManagerMessageReceiver.cpp */; };
    916                 512E356B130B57F000ABD19A /* WebApplicationCacheManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 512E3569130B57F000ABD19A /* WebApplicationCacheManagerMessages.h */; };
    917                 512E35F8130B642E00ABD19A /* WebApplicationCacheManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512E35F6130B642E00ABD19A /* WebApplicationCacheManagerProxyMessageReceiver.cpp */; };
    918                 512E35F9130B642E00ABD19A /* WebApplicationCacheManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 512E35F7130B642E00ABD19A /* WebApplicationCacheManagerProxyMessages.h */; };
    919911                512F589612A8838800629530 /* AuthenticationChallengeProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512F588E12A8838800629530 /* AuthenticationChallengeProxy.cpp */; };
    920912                512F589712A8838800629530 /* AuthenticationChallengeProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F588F12A8838800629530 /* AuthenticationChallengeProxy.h */; };
    … …  
    31043096                512A9767180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseProcessProxyMessageReceiver.cpp; sourceTree = "<group>"; };
    31053097                512A9768180E09B80039A149 /* DatabaseProcessProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseProcessProxyMessages.h; sourceTree = "<group>"; };
    3106                 512E3520130B550100ABD19A /* WebApplicationCacheManagerProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebApplicationCacheManagerProxy.cpp; sourceTree = "<group>"; };
    3107                 512E3521130B550100ABD19A /* WebApplicationCacheManagerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebApplicationCacheManagerProxy.h; sourceTree = "<group>"; };
    3108                 512E352B130B55AF00ABD19A /* WebApplicationCacheManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebApplicationCacheManager.cpp; path = ApplicationCache/WebApplicationCacheManager.cpp; sourceTree = "<group>"; };
    3109                 512E352C130B55AF00ABD19A /* WebApplicationCacheManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebApplicationCacheManager.h; path = ApplicationCache/WebApplicationCacheManager.h; sourceTree = "<group>"; };
    3110                 512E352D130B55AF00ABD19A /* WebApplicationCacheManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebApplicationCacheManager.messages.in; path = ApplicationCache/WebApplicationCacheManager.messages.in; sourceTree = "<group>"; };
    3111                 512E3568130B57F000ABD19A /* WebApplicationCacheManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebApplicationCacheManagerMessageReceiver.cpp; sourceTree = "<group>"; };
    3112                 512E3569130B57F000ABD19A /* WebApplicationCacheManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebApplicationCacheManagerMessages.h; sourceTree = "<group>"; };
    3113                 512E35F0130B638C00ABD19A /* WebApplicationCacheManagerProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebApplicationCacheManagerProxy.messages.in; sourceTree = "<group>"; };
    3114                 512E35F6130B642E00ABD19A /* WebApplicationCacheManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebApplicationCacheManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
    3115                 512E35F7130B642E00ABD19A /* WebApplicationCacheManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebApplicationCacheManagerProxyMessages.h; sourceTree = "<group>"; };
    31163098                512F588E12A8838800629530 /* AuthenticationChallengeProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthenticationChallengeProxy.cpp; sourceTree = "<group>"; };
    31173099                512F588F12A8838800629530 /* AuthenticationChallengeProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallengeProxy.h; sourceTree = "<group>"; };
    … …  
    56535635                        sourceTree = "<group>";
    56545636                };
    5655                 512E352A130B559900ABD19A /* ApplicationCache */ = {
    5656                         isa = PBXGroup;
    5657                         children = (
    5658                                 512E352B130B55AF00ABD19A /* WebApplicationCacheManager.cpp */,
    5659                                 512E352C130B55AF00ABD19A /* WebApplicationCacheManager.h */,
    5660                                 512E352D130B55AF00ABD19A /* WebApplicationCacheManager.messages.in */,
    5661                         );
    5662                         name = ApplicationCache;
    5663                         sourceTree = "<group>";
    5664                 };
    56655637                512F588D12A8836F00629530 /* Authentication */ = {
    56665638                        isa = PBXGroup;
    … …  
    60025974                        isa = PBXGroup;
    60035975                        children = (
    6004                                 512E352A130B559900ABD19A /* ApplicationCache */,
    60055976                                7C6E70F818B2D47E00F24E2E /* cocoa */,
    60065977                                3309344B1315B93A0097A7BC /* Cookies */,
    … …  
    61946165                                1A0F29E2120B44420053D1B9 /* VisitedLinkProvider.h */,
    61956166                                1A60224918C16B0800C3E8C9 /* VisitedLinkProvider.messages.in */,
    6196                                 512E3520130B550100ABD19A /* WebApplicationCacheManagerProxy.cpp */,
    6197                                 512E3521130B550100ABD19A /* WebApplicationCacheManagerProxy.h */,
    6198                                 512E35F0130B638C00ABD19A /* WebApplicationCacheManagerProxy.messages.in */,
    61996167                                BC72BA1B11E64907001EB4EA /* WebBackForwardList.cpp */,
    62006168                                BC72BA1C11E64907001EB4EA /* WebBackForwardList.h */,
    … …  
    73017269                                1A8E7D3A18C15149005A702A /* VisitedLinkTableControllerMessageReceiver.cpp */,
    73027270                                1A8E7D3B18C15149005A702A /* VisitedLinkTableControllerMessages.h */,
    7303                                 512E3568130B57F000ABD19A /* WebApplicationCacheManagerMessageReceiver.cpp */,
    7304                                 512E3569130B57F000ABD19A /* WebApplicationCacheManagerMessages.h */,
    7305                                 512E35F6130B642E00ABD19A /* WebApplicationCacheManagerProxyMessageReceiver.cpp */,
    7306                                 512E35F7130B642E00ABD19A /* WebApplicationCacheManagerProxyMessages.h */,
    73077271                                1A1FEC1A1627B45600700F6D /* WebConnectionMessageReceiver.cpp */,
    73087272                                1A1FEC1B1627B45700700F6D /* WebConnectionMessages.h */,
    … …  
    79877951                                1AA9BAE1184FFAC7003B6BC6 /* WeakObjCPtr.h in Headers */,
    79887952                                CEDA12E3152CD1B300D9E08D /* WebAlternativeTextClient.h in Headers */,
    7989                                 512E352F130B55AF00ABD19A /* WebApplicationCacheManager.h in Headers */,
    7990                                 512E356B130B57F000ABD19A /* WebApplicationCacheManagerMessages.h in Headers */,
    7991                                 512E3525130B550600ABD19A /* WebApplicationCacheManagerProxy.h in Headers */,
    7992                                 512E35F9130B642E00ABD19A /* WebApplicationCacheManagerProxyMessages.h in Headers */,
    79937953                                BC72BA1E11E64907001EB4EA /* WebBackForwardList.h in Headers */,
    79947954                                518D2CAE12D5153B003BB93B /* WebBackForwardListItem.h in Headers */,
    … …  
    98099769                                1A8E7D3C18C15149005A702A /* VisitedLinkTableControllerMessageReceiver.cpp in Sources */,
    98109770                                CEDA12E2152CD1AE00D9E08D /* WebAlternativeTextClient.cpp in Sources */,
    9811                                 512E352E130B55AF00ABD19A /* WebApplicationCacheManager.cpp in Sources */,
    9812                                 512E356A130B57F000ABD19A /* WebApplicationCacheManagerMessageReceiver.cpp in Sources */,
    9813                                 512E3524130B550600ABD19A /* WebApplicationCacheManagerProxy.cpp in Sources */,
    9814                                 512E35F8130B642E00ABD19A /* WebApplicationCacheManagerProxyMessageReceiver.cpp in Sources */,
    98159771                                BC72BA1D11E64907001EB4EA /* WebBackForwardList.cpp in Sources */,
    98169772                                518D2CAD12D5153B003BB93B /* WebBackForwardListItem.cpp in Sources */,

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

    r185487 r185601  
    3636#include "WKAPICast.h"
    3737#include "WKBundleAPICast.h"
    38 #include "WebApplicationCacheManager.h"
    3938#include "WebConnectionToUIProcess.h"
    4039#include "WebCookieManager.h"
    … …  
    354353void InjectedBundle::clearApplicationCache()
    355354{
    356     WebProcess::singleton().supplement<WebApplicationCacheManager>()->deleteAllEntries();
     355    ApplicationCacheStorage::singleton().deleteAllEntries();
    357356}
    358357
    … …  
    364363void InjectedBundle::setAppCacheMaximumSize(uint64_t size)
    365364{
    366     WebProcess::singleton().supplement<WebApplicationCacheManager>()->setAppCacheMaximumSize(size);
     365    ApplicationCacheStorage::singleton().setMaximumSize(size);
    367366}
    368367

  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r185479 r185601  
    4141#include "StatisticsData.h"
    4242#include "UserData.h"
    43 #include "WebApplicationCacheManager.h"
    4443#include "WebConnectionToUIProcess.h"
    4544#include "WebCookieManager.h"
    … …  
    185184    // limited.
    186185    addSupplement<WebGeolocationManager>();
    187     addSupplement<WebApplicationCacheManager>();
    188186    addSupplement<WebResourceCacheManager>();
    189187    addSupplement<WebCookieManager>();
Note: See TracChangeset for help on using the changeset viewer.