Changeset 71499 in webkit


Ignore:
Timestamp:
Nov 7, 2010 10:46:03 PM (13 years ago)
Author:
abarth@webkit.org
Message:

2010-11-07 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Rename Cache to MemoryCache
​https://bugs.webkit.org/show_bug.cgi?id=49159

  • public/WebCache.h:
  • src/WebCache.cpp: (WebKit::ToResourceTypeStat): (WebKit::WebCache::setCapacities): (WebKit::WebCache::clear): (WebKit::WebCache::getUsageStats): (WebKit::WebCache::getResourceTypeStats):

2010-11-07 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Rename Cache to MemoryCache
​https://bugs.webkit.org/show_bug.cgi?id=49159

  • Api/qwebpage.cpp:
  • Api/qwebsettings.cpp:

2010-11-07 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Rename Cache to MemoryCache
​https://bugs.webkit.org/show_bug.cgi?id=49159

  • webkit/webkitwebview.cpp:

2010-11-07 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Rename Cache to MemoryCache
​https://bugs.webkit.org/show_bug.cgi?id=49159

  • WebCache.cpp: (WebCache::statistics):
  • WebFrame.cpp:
  • WebView.cpp:

2010-11-07 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Rename Cache to MemoryCache
​https://bugs.webkit.org/show_bug.cgi?id=49159

  • WebView.cpp: (wxWebView::SetCachePolicy):
  • WebView.h:

2010-11-07 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Rename Cache to MemoryCache
​https://bugs.webkit.org/show_bug.cgi?id=49159

  • Misc/WebCache.mm: (+[WebCache statistics]):
  • WebCoreSupport/WebDeviceOrientationClient.mm: (WebDeviceOrientationClient::setController):
  • WebView/WebView.mm:

2010-11-07 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Rename Cache to MemoryCache
​https://bugs.webkit.org/show_bug.cgi?id=49159

So sayeth the diagram.

  • Android.mk:
  • CMakeLists.txt:
  • GNUmakefile.am:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • css/CSSImageValue.cpp:
  • dom/ContainerNode.cpp:
  • history/PageCache.cpp:
  • inspector/InspectorCSSStore.h:
  • inspector/InspectorResourceAgent.cpp:
  • loader/FrameLoader.cpp:
  • loader/archive/cf/LegacyWebArchive.cpp:
  • loader/cache/Cache.cpp: Removed.
  • loader/cache/Cache.h: Removed.
  • loader/cache/CachedCSSStyleSheet.cpp: (WebCore::CachedCSSStyleSheet::allClientsRemoved):
  • loader/cache/CachedFont.cpp:
  • loader/cache/CachedFont.h:
  • loader/cache/CachedImage.cpp: (WebCore::CachedImage::destroyDecodedData):
  • loader/cache/CachedImage.h:
  • loader/cache/CachedResource.cpp:
  • loader/cache/CachedResource.h:
  • loader/cache/CachedResourceLoader.cpp:
  • loader/cache/CachedResourceLoader.h:
  • loader/cache/CachedScript.cpp: (WebCore::CachedScript::destroyDecodedData):
  • loader/cache/MemoryCache.cpp: Copied from WebCore/loader/cache/Cache.cpp. (WebCore::cache): (WebCore::MemoryCache::MemoryCache): (WebCore::MemoryCache::requestResource): (WebCore::MemoryCache::requestUserCSSStyleSheet): (WebCore::MemoryCache::revalidateResource): (WebCore::MemoryCache::revalidationSucceeded): (WebCore::MemoryCache::revalidationFailed): (WebCore::MemoryCache::resourceForURL): (WebCore::MemoryCache::deadCapacity): (WebCore::MemoryCache::liveCapacity): (WebCore::MemoryCache::pruneLiveResources): (WebCore::MemoryCache::pruneDeadResources): (WebCore::MemoryCache::setCapacities): (WebCore::MemoryCache::makeResourcePurgeable): (WebCore::MemoryCache::evict): (WebCore::MemoryCache::addCachedResourceLoader): (WebCore::MemoryCache::removeCachedResourceLoader): (WebCore::MemoryCache::lruListFor): (WebCore::MemoryCache::removeFromLRUList): (WebCore::MemoryCache::insertInLRUList): (WebCore::MemoryCache::resourceAccessed): (WebCore::MemoryCache::removeFromLiveDecodedResourcesList): (WebCore::MemoryCache::insertInLiveDecodedResourcesList): (WebCore::MemoryCache::addToLiveResourcesSize): (WebCore::MemoryCache::removeFromLiveResourcesSize): (WebCore::MemoryCache::adjustSize): (WebCore::MemoryCache::TypeStatistic::addResource): (WebCore::MemoryCache::getStatistics): (WebCore::MemoryCache::setDisabled): (WebCore::MemoryCache::dumpStats): (WebCore::MemoryCache::dumpLRULists):
  • loader/cache/MemoryCache.h: Copied from WebCore/loader/cache/Cache.h. (WebCore::MemoryCache::shouldMakeResourcePurgeableOnEviction):
  • loader/loader.cpp:
  • page/EventSource.cpp:
  • page/Settings.h:
  • xml/XMLHttpRequest.cpp: (WebCore::XMLHttpRequest::createRequest):

2010-11-07 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Rename Cache to MemoryCache
​https://bugs.webkit.org/show_bug.cgi?id=49159

  • WebProcess/WebProcess.cpp:
  • WebProcess/mac/WebProcessMac.mm:
  • WebProcess/win/WebProcessWin.cpp:
Location:
trunk
Files:
53 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/Android.mk

    r71496 r71499  
    388388        loader/appcache/ManifestParser.cpp \
    389389        \
    390         loader/cache/Cache.cpp \
     390        loader/cache/MemoryCache.cpp \
    391391        \
    392392        loader/icon/IconDatabase.cpp \

  • trunk/WebCore/CMakeLists.txt

    r71496 r71499  
    11921192    loader/archive/ArchiveResourceCollection.cpp
    11931193
    1194     loader/cache/Cache.cpp
     1194    loader/cache/MemoryCache.cpp
    11951195
    11961196    loader/icon/IconDatabase.cpp

  • trunk/WebCore/ChangeLog

    r71497 r71499  
     12010-11-07  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename Cache to MemoryCache
     6        https://bugs.webkit.org/show_bug.cgi?id=49159
     7
     8        So sayeth the diagram.
     9
     10        * Android.mk:
     11        * CMakeLists.txt:
     12        * GNUmakefile.am:
     13        * WebCore.gypi:
     14        * WebCore.pro:
     15        * WebCore.vcproj/WebCore.vcproj:
     16        * WebCore.xcodeproj/project.pbxproj:
     17        * css/CSSImageValue.cpp:
     18        * dom/ContainerNode.cpp:
     19        * history/PageCache.cpp:
     20        * inspector/InspectorCSSStore.h:
     21        * inspector/InspectorResourceAgent.cpp:
     22        * loader/FrameLoader.cpp:
     23        * loader/archive/cf/LegacyWebArchive.cpp:
     24        * loader/cache/Cache.cpp: Removed.
     25        * loader/cache/Cache.h: Removed.
     26        * loader/cache/CachedCSSStyleSheet.cpp:
     27        (WebCore::CachedCSSStyleSheet::allClientsRemoved):
     28        * loader/cache/CachedFont.cpp:
     29        * loader/cache/CachedFont.h:
     30        * loader/cache/CachedImage.cpp:
     31        (WebCore::CachedImage::destroyDecodedData):
     32        * loader/cache/CachedImage.h:
     33        * loader/cache/CachedResource.cpp:
     34        * loader/cache/CachedResource.h:
     35        * loader/cache/CachedResourceLoader.cpp:
     36        * loader/cache/CachedResourceLoader.h:
     37        * loader/cache/CachedScript.cpp:
     38        (WebCore::CachedScript::destroyDecodedData):
     39        * loader/cache/MemoryCache.cpp: Copied from WebCore/loader/cache/Cache.cpp.
     40        (WebCore::cache):
     41        (WebCore::MemoryCache::MemoryCache):
     42        (WebCore::MemoryCache::requestResource):
     43        (WebCore::MemoryCache::requestUserCSSStyleSheet):
     44        (WebCore::MemoryCache::revalidateResource):
     45        (WebCore::MemoryCache::revalidationSucceeded):
     46        (WebCore::MemoryCache::revalidationFailed):
     47        (WebCore::MemoryCache::resourceForURL):
     48        (WebCore::MemoryCache::deadCapacity):
     49        (WebCore::MemoryCache::liveCapacity):
     50        (WebCore::MemoryCache::pruneLiveResources):
     51        (WebCore::MemoryCache::pruneDeadResources):
     52        (WebCore::MemoryCache::setCapacities):
     53        (WebCore::MemoryCache::makeResourcePurgeable):
     54        (WebCore::MemoryCache::evict):
     55        (WebCore::MemoryCache::addCachedResourceLoader):
     56        (WebCore::MemoryCache::removeCachedResourceLoader):
     57        (WebCore::MemoryCache::lruListFor):
     58        (WebCore::MemoryCache::removeFromLRUList):
     59        (WebCore::MemoryCache::insertInLRUList):
     60        (WebCore::MemoryCache::resourceAccessed):
     61        (WebCore::MemoryCache::removeFromLiveDecodedResourcesList):
     62        (WebCore::MemoryCache::insertInLiveDecodedResourcesList):
     63        (WebCore::MemoryCache::addToLiveResourcesSize):
     64        (WebCore::MemoryCache::removeFromLiveResourcesSize):
     65        (WebCore::MemoryCache::adjustSize):
     66        (WebCore::MemoryCache::TypeStatistic::addResource):
     67        (WebCore::MemoryCache::getStatistics):
     68        (WebCore::MemoryCache::setDisabled):
     69        (WebCore::MemoryCache::dumpStats):
     70        (WebCore::MemoryCache::dumpLRULists):
     71        * loader/cache/MemoryCache.h: Copied from WebCore/loader/cache/Cache.h.
     72        (WebCore::MemoryCache::shouldMakeResourcePurgeableOnEviction):
     73        * loader/loader.cpp:
     74        * page/EventSource.cpp:
     75        * page/Settings.h:
     76        * xml/XMLHttpRequest.cpp:
     77        (WebCore::XMLHttpRequest::createRequest):
     78
    1792010-11-07  Eric Seidel  <eric@webkit.org>
    280

  • trunk/WebCore/GNUmakefile.am

    r71496 r71499  
    19071907        WebCore/loader/archive/ArchiveResource.cpp \
    19081908        WebCore/loader/archive/ArchiveResource.h \
    1909         WebCore/loader/cache/Cache.cpp \
     1909        WebCore/loader/cache/MemoryCache.cpp \
    19101910        WebCore/loader/cache/CachedCSSStyleSheet.cpp \
    19111911        WebCore/loader/cache/CachedCSSStyleSheet.h \
    … …  
    19271927        WebCore/loader/cache/CachedXSLStyleSheet.cpp \
    19281928        WebCore/loader/cache/CachedXSLStyleSheet.h \
    1929         WebCore/loader/cache/Cache.h \
     1929        WebCore/loader/cache/MemoryCache.h \
    19301930        WebCore/loader/cache/CachePolicy.h \
    19311931        WebCore/loader/CachedMetadata.h \

  • trunk/WebCore/WebCore.exp.in

    r71451 r71499  
    201201__ZN7WebCore11HistoryItemC1Ev
    202202__ZN7WebCore11HistoryItemD1Ev
     203__ZN7WebCore11MemoryCache13getStatisticsEv
     204__ZN7WebCore11MemoryCache11setDisabledEb
     205__ZN7WebCore11MemoryCache13setCapacitiesEjjj
    203206__ZN7WebCore11RenderLayer19scrollRectToVisibleERKNS_7IntRectEbRKNS_15ScrollAlignmentES6_
    204207__ZN7WebCore11globalPointERK8_NSPointP8NSWindow
    … …  
    630633__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_5RangeE
    631634__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_8NodeListE
    632 __ZN7WebCore5Cache11setDisabledEb
    633 __ZN7WebCore5Cache13getStatisticsEv
    634 __ZN7WebCore5Cache13setCapacitiesEjjj
    635635__ZN7WebCore5Frame10createViewERKNS_7IntSizeERKNS_5ColorEbS3_bNS_13ScrollbarModeEbS7_b
    636636__ZN7WebCore5Frame14frameForWidgetEPKNS_6WidgetE

  • trunk/WebCore/WebCore.gypi

    r71496 r71499  
    20122012            'loader/archive/ArchiveResourceCollection.cpp',
    20132013            'loader/archive/ArchiveResourceCollection.h',
    2014             'loader/cache/Cache.cpp',
    2015             'loader/cache/Cache.h',
     2014            'loader/cache/MemoryCache.cpp',
     2015            'loader/cache/MemoryCache.h',
    20162016            'loader/cache/CachedCSSStyleSheet.cpp',
    20172017            'loader/cache/CachedCSSStyleSheet.h',

  • trunk/WebCore/WebCore.pro

    r71496 r71499  
    10331033    loader/archive/ArchiveResource.cpp \
    10341034    loader/archive/ArchiveResourceCollection.cpp \
    1035     loader/cache/Cache.cpp \
     1035    loader/cache/MemoryCache.cpp \
    10361036    loader/cache/CachedCSSStyleSheet.cpp \
    10371037    loader/cache/CachedFont.cpp \
    … …  
    19321932    loader/cache/CachedScript.h \
    19331933    loader/cache/CachedXSLStyleSheet.h \
    1934     loader/cache/Cache.h \
     1934    loader/cache/MemoryCache.h \
    19351935    loader/CrossOriginAccessControl.h \
    19361936    loader/CrossOriginPreflightResultCache.h \

  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r71496 r71499  
    2416424164                                >
    2416524165                                <File
    24166                                         RelativePath="..\loader\cache\Cache.cpp"
    24167                                         >
    24168                                 </File>
    24169                                 <File
    24170                                         RelativePath="..\loader\cache\Cache.h"
     24166                                        RelativePath="..\loader\cache\MemoryCache.cpp"
     24167                                        >
     24168                                </File>
     24169                                <File
     24170                                        RelativePath="..\loader\cache\MemoryCache.h"
    2417124171                                        >
    2417224172                                </File>

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r71496 r71499  
    50355035                BCACF3BD1072921A00C0C8A3 /* UserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = BCACF3BB1072921A00C0C8A3 /* UserContentURLPattern.h */; settings = {ATTRIBUTES = (Private, ); }; };
    50365036                BCAEFCAE1016CE4A0040D34E /* DOMRGBColor.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCAEFCAD1016CE4A0040D34E /* DOMRGBColor.mm */; };
    5037                 BCB16C170979C3BD00467741 /* Cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16BFE0979C3BD00467741 /* Cache.cpp */; };
    5038                 BCB16C180979C3BD00467741 /* Cache.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16BFF0979C3BD00467741 /* Cache.h */; settings = {ATTRIBUTES = (Private, ); }; };
     5037                BCB16C170979C3BD00467741 /* MemoryCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16BFE0979C3BD00467741 /* MemoryCache.cpp */; };
     5038                BCB16C180979C3BD00467741 /* MemoryCache.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16BFF0979C3BD00467741 /* MemoryCache.h */; settings = {ATTRIBUTES = (Private, ); }; };
    50395039                BCB16C190979C3BD00467741 /* CachedCSSStyleSheet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C000979C3BD00467741 /* CachedCSSStyleSheet.cpp */; };
    50405040                BCB16C1A0979C3BD00467741 /* CachedCSSStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C010979C3BD00467741 /* CachedCSSStyleSheet.h */; };
    … …  
    1107011070                BCACF3BB1072921A00C0C8A3 /* UserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserContentURLPattern.h; sourceTree = "<group>"; };
    1107111071                BCAEFCAD1016CE4A0040D34E /* DOMRGBColor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMRGBColor.mm; sourceTree = "<group>"; };
    11072                 BCB16BFE0979C3BD00467741 /* Cache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Cache.cpp; sourceTree = "<group>"; };
    11073                 BCB16BFF0979C3BD00467741 /* Cache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Cache.h; sourceTree = "<group>"; };
     11072                BCB16BFE0979C3BD00467741 /* MemoryCache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryCache.cpp; sourceTree = "<group>"; };
     11073                BCB16BFF0979C3BD00467741 /* MemoryCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MemoryCache.h; sourceTree = "<group>"; };
    1107411074                BCB16C000979C3BD00467741 /* CachedCSSStyleSheet.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedCSSStyleSheet.cpp; sourceTree = "<group>"; };
    1107511075                BCB16C010979C3BD00467741 /* CachedCSSStyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedCSSStyleSheet.h; sourceTree = "<group>"; };
    … …  
    1604416044                                BCB16C0F0979C3BD00467741 /* CachedXSLStyleSheet.h */,
    1604516045                                F587864902DE3A9A01EA4122 /* CachePolicy.h */,
    16046                                 BCB16BFE0979C3BD00467741 /* Cache.cpp */,
    16047                                 BCB16BFF0979C3BD00467741 /* Cache.h */,
     16046                                BCB16BFE0979C3BD00467741 /* MemoryCache.cpp */,
     16047                                BCB16BFF0979C3BD00467741 /* MemoryCache.h */,
    1604816048                        );
    1604916049                        path = cache;
    … …  
    1856518565                                1A569CFC0D7E2B82007C3983 /* c_runtime.h in Headers */,
    1856618566                                1A569CFE0D7E2B82007C3983 /* c_utility.h in Headers */,
    18567                                 BCB16C180979C3BD00467741 /* Cache.h in Headers */,
     18567                                BCB16C180979C3BD00467741 /* MemoryCache.h in Headers */,
    1856818568                                BCB16C1A0979C3BD00467741 /* CachedCSSStyleSheet.h in Headers */,
    1856918569                                BC64B4CC0CB4295D005F2B62 /* CachedFont.h in Headers */,
    … …  
    2171521715                                1A569CFB0D7E2B82007C3983 /* c_runtime.cpp in Sources */,
    2171621716                                1A569CFD0D7E2B82007C3983 /* c_utility.cpp in Sources */,
    21717                                 BCB16C170979C3BD00467741 /* Cache.cpp in Sources */,
     21717                                BCB16C170979C3BD00467741 /* MemoryCache.cpp in Sources */,
    2171821718                                BCB16C190979C3BD00467741 /* CachedCSSStyleSheet.cpp in Sources */,
    2171921719                                BC64B4CB0CB4295D005F2B62 /* CachedFont.cpp in Sources */,

  • trunk/WebCore/css/CSSImageValue.cpp

    r66963 r71499  
    2323
    2424#include "CSSValueKeywords.h"
    25 #include "Cache.h"
     25#include "MemoryCache.h"
    2626#include "CachedImage.h"
    2727#include "CachedResourceLoader.h"

  • trunk/WebCore/dom/ContainerNode.cpp

    r71278 r71499  
    2525
    2626#include "BeforeLoadEvent.h"
    27 #include "Cache.h"
     27#include "MemoryCache.h"
    2828#include "ContainerNodeAlgorithms.h"
    2929#include "DeleteButtonController.h"

  • trunk/WebCore/history/PageCache.cpp

    r70960 r71499  
    2929#include "ApplicationCacheHost.h"
    3030#include "BackForwardController.h"
    31 #include "Cache.h"
     31#include "MemoryCache.h"
    3232#include "CachedPage.h"
    3333#include "DOMWindow.h"

  • trunk/WebCore/inspector/InspectorCSSStore.h

    r69196 r71499  
    3131
    3232#include "CSSPropertySourceData.h"
    33 #include "Cache.h"
     33#include "MemoryCache.h"
    3434
    3535#include <wtf/Forward.h>

  • trunk/WebCore/inspector/InspectorResourceAgent.cpp

    r71215 r71499  
    3333
    3434#include "Base64.h"
    35 #include "Cache.h"
     35#include "MemoryCache.h"
    3636#include "CachedResource.h"
    3737#include "CachedResourceLoader.h"

  • trunk/WebCore/loader/FrameLoader.cpp

    r71256 r71499  
    3939#include "BackForwardController.h"
    4040#include "BeforeUnloadEvent.h"
    41 #include "Cache.h"
     41#include "MemoryCache.h"
    4242#include "CachedPage.h"
    4343#include "CachedResourceLoader.h"

  • trunk/WebCore/loader/archive/cf/LegacyWebArchive.cpp

    r71216 r71499  
    3030#include "LegacyWebArchive.h"
    3131
    32 #include "Cache.h"
     32#include "MemoryCache.h"
    3333#include "Document.h"
    3434#include "DocumentLoader.h"

  • trunk/WebCore/loader/cache/CachedCSSStyleSheet.cpp

    r71496 r71499  
    2828#include "CachedCSSStyleSheet.h"
    2929
    30 #include "Cache.h"
     30#include "MemoryCache.h"
    3131#include "CachedResourceClient.h"
    3232#include "CachedResourceClientWalker.h"
    … …  
    6060void CachedCSSStyleSheet::allClientsRemoved()
    6161{
    62     if (!Cache::shouldMakeResourcePurgeableOnEviction() && isSafeToMakePurgeable())
     62    if (!MemoryCache::shouldMakeResourcePurgeableOnEviction() && isSafeToMakePurgeable())
    6363        makePurgeable(true);
    6464}

  • trunk/WebCore/loader/cache/CachedFont.cpp

    r71496 r71499  
    3232#endif
    3333
    34 #include "Cache.h"
     34#include "MemoryCache.h"
    3535#include "CachedResourceClient.h"
    3636#include "CachedResourceClientWalker.h"

  • trunk/WebCore/loader/cache/CachedFont.h

    r71496 r71499  
    4040
    4141class CachedResourceLoader;
    42 class Cache;
     42class MemoryCache;
    4343class FontPlatformData;
    4444class SVGFontElement;
    … …  
    8282#endif
    8383
    84     friend class Cache;
     84    friend class MemoryCache;
    8585};
    8686

  • trunk/WebCore/loader/cache/CachedImage.cpp

    r71496 r71499  
    2626
    2727#include "BitmapImage.h"
    28 #include "Cache.h"
     28#include "MemoryCache.h"
    2929#include "CachedResourceClient.h"
    3030#include "CachedResourceClientWalker.h"
    … …  
    332332        m_image = 0;
    333333        setDecodedSize(0);
    334         if (!Cache::shouldMakeResourcePurgeableOnEviction())
     334        if (!MemoryCache::shouldMakeResourcePurgeableOnEviction())
    335335            makePurgeable(true);
    336336    } else if (m_image && !errorOccurred())

  • trunk/WebCore/loader/cache/CachedImage.h

    r71496 r71499  
    3333
    3434class CachedResourceLoader;
    35 class Cache;
     35class MemoryCache;
    3636
    3737class CachedImage : public CachedResource, public ImageObserver {
    38     friend class Cache;
     38    friend class MemoryCache;
    3939
    4040public:

  • trunk/WebCore/loader/cache/CachedResource.cpp

    r71496 r71499  
    2525#include "CachedResource.h"
    2626
    27 #include "Cache.h"
     27#include "MemoryCache.h"
    2828#include "CachedMetadata.h"
    2929#include "CachedResourceClient.h"

  • trunk/WebCore/loader/cache/CachedResource.h

    r71496 r71499  
    3737namespace WebCore {
    3838
    39 class Cache;
     39class MemoryCache;
    4040class CachedMetadata;
    4141class CachedResourceClient;
    … …  
    5151// This class also does the actual communication with the loader to obtain the resource from the network.
    5252class CachedResource : public Noncopyable {
    53     friend class Cache;
     53    friend class MemoryCache;
    5454    friend class InspectorResource;
    5555   
    … …  
    226226    void addClientToSet(CachedResourceClient*);
    227227                                       
    228     // These are called by the friendly Cache only
     228    // These are called by the friendly MemoryCache only
    229229    void setResourceToRevalidate(CachedResource*);
    230230    void switchClientsToRevalidatedResource();

  • trunk/WebCore/loader/cache/CachedResourceLoader.cpp

    r71496 r71499  
    2828#include "CachedResourceLoader.h"
    2929
    30 #include "loader.h"
    31 #include "Cache.h"
    3230#include "CachedCSSStyleSheet.h"
    3331#include "CachedFont.h"
    … …  
    3634#include "CachedXSLStyleSheet.h"
    3735#include "Console.h"
     36#include "DOMWindow.h"
    3837#include "Document.h"
    39 #include "DOMWindow.h"
    40 #include "HTMLElement.h"
    4138#include "Frame.h"
    4239#include "FrameLoader.h"
    4340#include "FrameLoaderClient.h"
     41#include "HTMLElement.h"
     42#include "MemoryCache.h"
    4443#include "PingLoader.h"
    4544#include "SecurityOrigin.h"
    4645#include "Settings.h"
     46#include "loader.h"
    4747#include <wtf/text/StringConcatenate.h>
    4848

  • trunk/WebCore/loader/cache/CachedResourceLoader.h

    r71496 r71499  
    4949// The CachedResourceLoader manages the loading of scripts/images/stylesheets for a single document.
    5050class CachedResourceLoader : public Noncopyable {
    51 friend class Cache;
     51friend class MemoryCache;
    5252friend class ImageLoader;
    5353
    … …  
    110110    bool canRequest(CachedResource::Type, const KURL&);
    111111   
    112     Cache* m_cache;
     112    MemoryCache* m_cache;
    113113    HashSet<String> m_reloadedURLs;
    114114    mutable DocumentResourceMap m_documentResources;

  • trunk/WebCore/loader/cache/CachedScript.cpp

    r71496 r71499  
    2828#include "CachedScript.h"
    2929
    30 #include "Cache.h"
     30#include "MemoryCache.h"
    3131#include "CachedResourceClient.h"
    3232#include "CachedResourceClientWalker.h"
    … …  
    112112    m_script = String();
    113113    setDecodedSize(0);
    114     if (!Cache::shouldMakeResourcePurgeableOnEviction() && isSafeToMakePurgeable())
     114    if (!MemoryCache::shouldMakeResourcePurgeableOnEviction() && isSafeToMakePurgeable())
    115115        makePurgeable(true);
    116116}

  • trunk/WebCore/loader/cache/MemoryCache.cpp

    r71496 r71499  
    2222
    2323#include "config.h"
    24 #include "Cache.h"
     24#include "MemoryCache.h"
    2525
    2626#include "CachedCSSStyleSheet.h"
    … …  
    5050static const double cDefaultDecodedDataDeletionInterval = 0;
    5151
    52 Cache* cache()
    53 {
    54     static Cache* staticCache = new Cache;
     52MemoryCache* cache()
     53{
     54    static MemoryCache* staticCache = new MemoryCache;
    5555    return staticCache;
    5656}
    5757
    58 Cache::Cache()
     58MemoryCache::MemoryCache()
    5959    : m_disabled(false)
    6060    , m_pruneEnabled(true)
    … …  
    9595}
    9696
    97 CachedResource* Cache::requestResource(CachedResourceLoader* cachedResourceLoader, CachedResource::Type type, const KURL& url, const String& charset, bool requestIsPreload)
    98 {
    99     LOG(ResourceLoading, "Cache::requestResource '%s', charset '%s', preload=%u", url.string().latin1().data(), charset.latin1().data(), requestIsPreload);
     97CachedResource* MemoryCache::requestResource(CachedResourceLoader* cachedResourceLoader, CachedResource::Type type, const KURL& url, const String& charset, bool requestIsPreload)
     98{
     99    LOG(ResourceLoading, "MemoryCache::requestResource '%s', charset '%s', preload=%u", url.string().latin1().data(), charset.latin1().data(), requestIsPreload);
    100100
    101101    // FIXME: Do we really need to special-case an empty URL?
    … …  
    108108
    109109    if (resource && requestIsPreload && !resource->isPreloaded()) {
    110         LOG(ResourceLoading, "Cache::requestResource already has a preload request for this request, and it hasn't been preloaded yet");
     110        LOG(ResourceLoading, "MemoryCache::requestResource already has a preload request for this request, and it hasn't been preloaded yet");
    111111        return 0;
    112112    }
    … …  
    150150
    151151    if (resource->type() != type) {
    152         LOG(ResourceLoading, "Cache::requestResource cannot use cached resource for '%s' due to type mismatch", url.string().latin1().data());
     152        LOG(ResourceLoading, "MemoryCache::requestResource cannot use cached resource for '%s' due to type mismatch", url.string().latin1().data());
    153153        return 0;
    154154    }
    … …  
    159159    }
    160160
    161     LOG(ResourceLoading, "Cache::requestResource for '%s' returning resource %p\n", url.string().latin1().data(), resource);
     161    LOG(ResourceLoading, "MemoryCache::requestResource for '%s' returning resource %p\n", url.string().latin1().data(), resource);
    162162
    163163    return resource;
    164164}
    165165   
    166 CachedCSSStyleSheet* Cache::requestUserCSSStyleSheet(CachedResourceLoader* cachedResourceLoader, const String& url, const String& charset)
     166CachedCSSStyleSheet* MemoryCache::requestUserCSSStyleSheet(CachedResourceLoader* cachedResourceLoader, const String& url, const String& charset)
    167167{
    168168    CachedCSSStyleSheet* userSheet;
    … …  
    193193}
    194194   
    195 void Cache::revalidateResource(CachedResource* resource, CachedResourceLoader* cachedResourceLoader)
     195void MemoryCache::revalidateResource(CachedResource* resource, CachedResourceLoader* cachedResourceLoader)
    196196{
    197197    ASSERT(resource);
    … …  
    216216}
    217217   
    218 void Cache::revalidationSucceeded(CachedResource* revalidatingResource, const ResourceResponse& response)
     218void MemoryCache::revalidationSucceeded(CachedResource* revalidatingResource, const ResourceResponse& response)
    219219{
    220220    CachedResource* resource = revalidatingResource->resourceToRevalidate();
    … …  
    242242}
    243243
    244 void Cache::revalidationFailed(CachedResource* revalidatingResource)
     244void MemoryCache::revalidationFailed(CachedResource* revalidatingResource)
    245245{
    246246    LOG(ResourceLoading, "Revalidation failed for %p", revalidatingResource);
    … …  
    249249}
    250250
    251 CachedResource* Cache::resourceForURL(const String& url)
     251CachedResource* MemoryCache::resourceForURL(const String& url)
    252252{
    253253    CachedResource* resource = m_resources.get(url);
    254     bool wasPurgeable = Cache::shouldMakeResourcePurgeableOnEviction() && resource && resource->isPurgeable();
     254    bool wasPurgeable = MemoryCache::shouldMakeResourcePurgeableOnEviction() && resource && resource->isPurgeable();
    255255    if (resource && !resource->makePurgeable(false)) {
    256256        ASSERT(!resource->hasClients());
    … …  
    264264}
    265265
    266 unsigned Cache::deadCapacity() const
     266unsigned MemoryCache::deadCapacity() const
    267267{
    268268    // Dead resource capacity is whatever space is not occupied by live resources, bounded by an independent minimum and maximum.
    … …  
    273273}
    274274
    275 unsigned Cache::liveCapacity() const
     275unsigned MemoryCache::liveCapacity() const
    276276{
    277277    // Live resource capacity is whatever is left over after calculating dead resource capacity.
    … …  
    279279}
    280280
    281 void Cache::pruneLiveResources()
     281void MemoryCache::pruneLiveResources()
    282282{
    283283    if (!m_pruneEnabled)
    … …  
    323323}
    324324
    325 void Cache::pruneDeadResources()
     325void MemoryCache::pruneDeadResources()
    326326{
    327327    if (!m_pruneEnabled)
    … …  
    407407}
    408408
    409 void Cache::setCapacities(unsigned minDeadBytes, unsigned maxDeadBytes, unsigned totalBytes)
     409void MemoryCache::setCapacities(unsigned minDeadBytes, unsigned maxDeadBytes, unsigned totalBytes)
    410410{
    411411    ASSERT(minDeadBytes <= maxDeadBytes);
    … …  
    417417}
    418418
    419 bool Cache::makeResourcePurgeable(CachedResource* resource)
    420 {
    421     if (!Cache::shouldMakeResourcePurgeableOnEviction())
     419bool MemoryCache::makeResourcePurgeable(CachedResource* resource)
     420{
     421    if (!MemoryCache::shouldMakeResourcePurgeableOnEviction())
    422422        return false;
    423423
    … …  
    439439}
    440440
    441 void Cache::evict(CachedResource* resource)
     441void MemoryCache::evict(CachedResource* resource)
    442442{
    443443    LOG(ResourceLoading, "Evicting resource %p for '%s' from cache", resource, resource->url().latin1().data());
    … …  
    456456        // resource purgeable in makeResourcePurgeable(). So adjust the size if we are evicting a
    457457        // resource that was not marked as purgeable.
    458         if (!Cache::shouldMakeResourcePurgeableOnEviction() || !resource->isPurgeable())
     458        if (!MemoryCache::shouldMakeResourcePurgeableOnEviction() || !resource->isPurgeable())
    459459            adjustSize(resource->hasClients(), -static_cast<int>(resource->size()));
    460460    } else
    … …  
    465465}
    466466
    467 void Cache::addCachedResourceLoader(CachedResourceLoader* cachedResourceLoader)
     467void MemoryCache::addCachedResourceLoader(CachedResourceLoader* cachedResourceLoader)
    468468{
    469469    m_cachedResourceLoaders.add(cachedResourceLoader);
    470470}
    471471
    472 void Cache::removeCachedResourceLoader(CachedResourceLoader* cachedResourceLoader)
     472void MemoryCache::removeCachedResourceLoader(CachedResourceLoader* cachedResourceLoader)
    473473{
    474474    m_cachedResourceLoaders.remove(cachedResourceLoader);
    … …  
    493493}
    494494
    495 Cache::LRUList* Cache::lruListFor(CachedResource* resource)
     495MemoryCache::LRUList* MemoryCache::lruListFor(CachedResource* resource)
    496496{
    497497    unsigned accessCount = max(resource->accessCount(), 1U);
    … …  
    505505}
    506506
    507 void Cache::removeFromLRUList(CachedResource* resource)
     507void MemoryCache::removeFromLRUList(CachedResource* resource)
    508508{
    509509    // If we've never been accessed, then we're brand new and not in any list.
    … …  
    552552}
    553553
    554 void Cache::insertInLRUList(CachedResource* resource)
     554void MemoryCache::insertInLRUList(CachedResource* resource)
    555555{
    556556    // Make sure we aren't in some list already.
    … …  
    584584}
    585585
    586 void Cache::resourceAccessed(CachedResource* resource)
     586void MemoryCache::resourceAccessed(CachedResource* resource)
    587587{
    588588    ASSERT(resource->inCache());
    … …  
    603603}
    604604
    605 void Cache::removeFromLiveDecodedResourcesList(CachedResource* resource)
     605void MemoryCache::removeFromLiveDecodedResourcesList(CachedResource* resource)
    606606{
    607607    // If we've never been accessed, then we're brand new and not in any list.
    … …  
    642642}
    643643
    644 void Cache::insertInLiveDecodedResourcesList(CachedResource* resource)
     644void MemoryCache::insertInLiveDecodedResourcesList(CachedResource* resource)
    645645{
    646646    // Make sure we aren't in the list already.
    … …  
    670670}
    671671
    672 void Cache::addToLiveResourcesSize(CachedResource* resource)
     672void MemoryCache::addToLiveResourcesSize(CachedResource* resource)
    673673{
    674674    m_liveSize += resource->size();
    … …  
    676676}
    677677
    678 void Cache::removeFromLiveResourcesSize(CachedResource* resource)
     678void MemoryCache::removeFromLiveResourcesSize(CachedResource* resource)
    679679{
    680680    m_liveSize -= resource->size();
    … …  
    682682}
    683683
    684 void Cache::adjustSize(bool live, int delta)
     684void MemoryCache::adjustSize(bool live, int delta)
    685685{
    686686    if (live) {
    … …  
    693693}
    694694
    695 void Cache::TypeStatistic::addResource(CachedResource* o)
     695void MemoryCache::TypeStatistic::addResource(CachedResource* o)
    696696{
    697697    bool purged = o->wasPurged();
    … …  
    706706}
    707707
    708 Cache::Statistics Cache::getStatistics()
     708MemoryCache::Statistics MemoryCache::getStatistics()
    709709{
    710710    Statistics stats;
    … …  
    737737}
    738738
    739 void Cache::setDisabled(bool disabled)
     739void MemoryCache::setDisabled(bool disabled)
    740740{
    741741    m_disabled = disabled;
    … …  
    752752
    753753#ifndef NDEBUG
    754 void Cache::dumpStats()
     754void MemoryCache::dumpStats()
    755755{
    756756    Statistics s = getStatistics();
    … …  
    767767}
    768768
    769 void Cache::dumpLRULists(bool includeLive) const
     769void MemoryCache::dumpLRULists(bool includeLive) const
    770770{
    771771    printf("LRU-SP lists in eviction order (Kilobytes decoded, Kilobytes encoded, Access count, Referenced, isPurgeable, wasPurged):\n");

  • trunk/WebCore/loader/cache/MemoryCache.h

    r71496 r71499  
    7272// more memory use due to this.
    7373
    74 class Cache : public Noncopyable {
     74class MemoryCache : public Noncopyable {
    7575public:
    76     friend Cache* cache();
     76    friend MemoryCache* cache();
    7777
    7878    typedef HashMap<String, CachedResource*> CachedResourceMap;
    … …  
    171171
    172172private:
    173     Cache();
    174     ~Cache(); // Not implemented to make sure nobody accidentally calls delete -- WebCore does not delete singletons.
     173    MemoryCache();
     174    ~MemoryCache(); // Not implemented to make sure nobody accidentally calls delete -- WebCore does not delete singletons.
    175175       
    176176    LRUList* lruListFor(CachedResource*);
    … …  
    219219};
    220220
    221 inline bool Cache::shouldMakeResourcePurgeableOnEviction()
     221inline bool MemoryCache::shouldMakeResourcePurgeableOnEviction()
    222222{
    223223#if PLATFORM(IOS)
    … …  
    229229
    230230// Function to obtain the global cache.
    231 Cache* cache();
     231MemoryCache* cache();
    232232
    233233}

  • trunk/WebCore/loader/loader.cpp

    r71494 r71499  
    2525#include "loader.h"
    2626
    27 #include "Cache.h"
     27#include "MemoryCache.h"
    2828#include "CachedImage.h"
    2929#include "CachedResource.h"

  • trunk/WebCore/page/EventSource.cpp

    r62696 r71499  
    3737#include "EventSource.h"
    3838
    39 #include "Cache.h"
     39#include "MemoryCache.h"
    4040#include "DOMWindow.h"
    4141#include "Event.h"

  • trunk/WebCore/page/Settings.h

    r71239 r71499  
    144144        //  - Icon Database
    145145        //  - Console Messages
    146         //  - Cache
     146        //  - MemoryCache
    147147        //  - Application Cache
    148148        //  - Back/Forward Page History

  • trunk/WebCore/xml/XMLHttpRequest.cpp

    r69688 r71499  
    2424
    2525#include "Blob.h"
    26 #include "Cache.h"
     26#include "MemoryCache.h"
    2727#include "CrossOriginAccessControl.h"
    2828#include "DOMFormData.h"
    … …  
    601601
    602602            // For now we should only balance the nonCached request count for main-thread XHRs and not
    603             // Worker XHRs, as the Cache is not thread-safe.
     603            // Worker XHRs, as the MemoryCache is not thread-safe.
    604604            // This will become irrelevant after https://bugs.webkit.org/show_bug.cgi?id=27165 is resolved.
    605605            if (!scriptExecutionContext()->isWorkerContext()) {

  • trunk/WebKit/chromium/ChangeLog

    r71480 r71499  
     12010-11-07  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename Cache to MemoryCache
     6        https://bugs.webkit.org/show_bug.cgi?id=49159
     7
     8        * public/WebCache.h:
     9        * src/WebCache.cpp:
     10        (WebKit::ToResourceTypeStat):
     11        (WebKit::WebCache::setCapacities):
     12        (WebKit::WebCache::clear):
     13        (WebKit::WebCache::getUsageStats):
     14        (WebKit::WebCache::getResourceTypeStats):
     15
    1162010-11-07  Jay Civelli  <jcivelli@chromium.org>
    217

  • trunk/WebKit/chromium/public/WebCache.h

    r50668 r71499  
    4949    };
    5050
    51     // A struct mirroring WebCore::Cache::TypeStatistic.
     51    // A struct mirroring WebCore::MemoryCache::TypeStatistic.
    5252    struct ResourceTypeStat {
    5353        size_t count;
    … …  
    5757    };
    5858
    59     // A struct mirroring WebCore::Cache::Statistics.
     59    // A struct mirroring WebCore::MemoryCache::Statistics.
    6060    struct ResourceTypeStats {
    6161        ResourceTypeStat images;

  • trunk/WebKit/chromium/src/WebCache.cpp

    r69084 r71499  
    3232#include "WebCache.h"
    3333
    34 // Instead of providing accessors, we make all members of Cache public.
    35 // This will make it easier to track WebCore changes to the Cache class.
    36 // FIXME: We should introduce public getters on the Cache class.
     34// Instead of providing accessors, we make all members of MemoryCache public.
     35// This will make it easier to track WebCore changes to the MemoryCache class.
     36// FIXME: We should introduce public getters on the MemoryCache class.
    3737#define private public
    38 #include "Cache.h"
     38#include "MemoryCache.h"
    3939#undef private
    4040
    … …  
    4343namespace WebKit {
    4444
    45 // A helper method for coverting a Cache::TypeStatistic to a
     45// A helper method for coverting a MemoryCache::TypeStatistic to a
    4646// WebCache::ResourceTypeStat.
    47 static void ToResourceTypeStat(const Cache::TypeStatistic& from,
     47static void ToResourceTypeStat(const MemoryCache::TypeStatistic& from,
    4848                               WebCache::ResourceTypeStat& to)
    4949{
    … …  
    5757    size_t minDeadCapacity, size_t maxDeadCapacity, size_t capacity)
    5858{
    59     Cache* cache = WebCore::cache();
     59    MemoryCache* cache = WebCore::cache();
    6060    if (cache)
    6161        cache->setCapacities(static_cast<unsigned int>(minDeadCapacity),
    … …  
    6666void WebCache::clear()
    6767{
    68     Cache* cache = WebCore::cache();
     68    MemoryCache* cache = WebCore::cache();
    6969    if (cache && !cache->disabled()) {
    7070        cache->setDisabled(true);
    … …  
    7777    ASSERT(result);
    7878
    79     Cache* cache = WebCore::cache();
     79    MemoryCache* cache = WebCore::cache();
    8080    if (cache) {
    8181        result->minDeadCapacity = cache->m_minDeadCapacity;
    … …  
    9090void WebCache::getResourceTypeStats(ResourceTypeStats* result)
    9191{
    92     Cache* cache = WebCore::cache();
     92    MemoryCache* cache = WebCore::cache();
    9393    if (cache) {
    94         Cache::Statistics stats = cache->getStatistics();
     94        MemoryCache::Statistics stats = cache->getStatistics();
    9595        ToResourceTypeStat(stats.images, result->images);
    9696        ToResourceTypeStat(stats.cssStyleSheets, result->cssStyleSheets);

  • trunk/WebKit/gtk/ChangeLog

    r71466 r71499  
     12010-11-07  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename Cache to MemoryCache
     6        https://bugs.webkit.org/show_bug.cgi?id=49159
     7
     8        * webkit/webkitwebview.cpp:
     9
    1102010-11-05  Nicolas Dufresne  <nicolas.dufresne@collabora.co.uk>
    211

  • trunk/WebKit/gtk/webkit/webkitwebview.cpp

    r71466 r71499  
    4444#include "AbstractDatabase.h"
    4545#include "BackForwardListImpl.h"
    46 #include "Cache.h"
     46#include "MemoryCache.h"
    4747#include "ChromeClientGtk.h"
    4848#include "ClipboardUtilitiesGtk.h"

  • trunk/WebKit/mac/ChangeLog

    r71467 r71499  
     12010-11-07  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename Cache to MemoryCache
     6        https://bugs.webkit.org/show_bug.cgi?id=49159
     7
     8        * Misc/WebCache.mm:
     9        (+[WebCache statistics]):
     10        * WebCoreSupport/WebDeviceOrientationClient.mm:
     11        (WebDeviceOrientationClient::setController):
     12        * WebView/WebView.mm:
     13
    1142010-11-05  Alexey Proskuryakov  <ap@apple.com>
    215

  • trunk/WebKit/mac/Misc/WebCache.mm

    r62872 r71499  
    3232#import "WebViewInternal.h"
    3333#import <WebCore/ApplicationCacheStorage.h>
    34 #import <WebCore/Cache.h>
     34#import <WebCore/MemoryCache.h>
    3535#import <WebCore/CrossOriginPreflightResultCache.h>
    3636
    … …  
    4444+ (NSArray *)statistics
    4545{
    46     WebCore::Cache::Statistics s = WebCore::cache()->getStatistics();
     46    WebCore::MemoryCache::Statistics s = WebCore::cache()->getStatistics();
    4747
    4848    return [NSArray arrayWithObjects:

  • trunk/WebKit/mac/WebCoreSupport/WebDeviceOrientationClient.mm

    r67949 r71499  
    4242{
    4343    // This is called by the Page constructor before our WebView has the provider set up.
    44     // Cache the controller for later use.
     44    // MemoryCache the controller for later use.
    4545    m_controller = controller;
    4646}

  • trunk/WebKit/mac/WebView/WebView.mm

    r71451 r71499  
    112112#import <WebCore/ApplicationCacheStorage.h>
    113113#import <WebCore/BackForwardListImpl.h>
    114 #import <WebCore/Cache.h>
     114#import <WebCore/MemoryCache.h>
    115115#import <WebCore/ColorMac.h>
    116116#import <WebCore/CSSComputedStyleDeclaration.h>

  • trunk/WebKit/qt/Api/qwebpage.cpp

    r71393 r71499  
    3939#include "ApplicationCacheStorage.h"
    4040#include "BackForwardListImpl.h"
    41 #include "Cache.h"
     41#include "MemoryCache.h"
    4242#include "Chrome.h"
    4343#include "ChromeClientQt.h"

  • trunk/WebKit/qt/Api/qwebsettings.cpp

    r69856 r71499  
    2626
    2727#include "AbstractDatabase.h"
    28 #include "Cache.h"
     28#include "MemoryCache.h"
    2929#include "CrossOriginPreflightResultCache.h"
    3030#include "FontCache.h"

  • trunk/WebKit/qt/ChangeLog

    r71479 r71499  
     12010-11-07  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename Cache to MemoryCache
     6        https://bugs.webkit.org/show_bug.cgi?id=49159
     7
     8        * Api/qwebpage.cpp:
     9        * Api/qwebsettings.cpp:
     10
    1112010-11-07  Chang Shu  <chang.shu@nokia.com>
    212

  • trunk/WebKit/win/ChangeLog

    r71451 r71499  
     12010-11-07  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename Cache to MemoryCache
     6        https://bugs.webkit.org/show_bug.cgi?id=49159
     7
     8        * WebCache.cpp:
     9        (WebCache::statistics):
     10        * WebFrame.cpp:
     11        * WebView.cpp:
     12
    1132010-11-05  Chris Marrin  <cmarrin@apple.com>
    214

  • trunk/WebKit/win/WebCache.cpp

    r50567 r71499  
    3232#pragma warning(push, 0)
    3333#include <WebCore/ApplicationCacheStorage.h>
    34 #include <WebCore/Cache.h>
     34#include <WebCore/MemoryCache.h>
    3535#include <WebCore/CrossOriginPreflightResultCache.h>
    3636#pragma warning(pop)
    … …  
    101101        return S_OK;
    102102
    103     WebCore::Cache::Statistics stat = WebCore::cache()->getStatistics();
     103    WebCore::MemoryCache::Statistics stat = WebCore::cache()->getStatistics();
    104104
    105105    static CFStringRef imagesKey = CFSTR("images");

  • trunk/WebKit/win/WebFrame.cpp

    r71451 r71499  
    5656#pragma warning( push, 0 )
    5757#include <WebCore/BString.h>
    58 #include <WebCore/Cache.h>
     58#include <WebCore/MemoryCache.h>
    5959#include <WebCore/Document.h>
    6060#include <WebCore/DocumentLoader.h>

  • trunk/WebKit/win/WebView.cpp

    r71401 r71499  
    7070#include <WebCore/BackForwardListImpl.h>
    7171#include <WebCore/BitmapInfo.h>
    72 #include <WebCore/Cache.h>
     72#include <WebCore/MemoryCache.h>
    7373#include <WebCore/Chrome.h>
    7474#include <WebCore/ContextMenu.h>

  • trunk/WebKit/wx/ChangeLog

    r71041 r71499  
     12010-11-07  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename Cache to MemoryCache
     6        https://bugs.webkit.org/show_bug.cgi?id=49159
     7
     8        * WebView.cpp:
     9        (wxWebView::SetCachePolicy):
     10        * WebView.h:
     11
    1122010-11-01  Brady Eidson  <beidson@apple.com>
    213

  • trunk/WebKit/wx/WebView.cpp

    r66577 r71499  
    2525
    2626#include "config.h"
    27 #include "Cache.h"
     27#include "WebView.h"
     28
    2829#include "ContextMenu.h"
     30#include "ContextMenuController.h"
    2931#include "ContextMenuItem.h"
    30 #include "ContextMenuController.h"
    3132#include "Document.h"
     33#include "Editor.h"
    3234#include "Element.h"
    33 #include "Editor.h"
    3435#include "EmptyClients.h"
    3536#include "EventHandler.h"
    … …  
    4243#include "HTMLFormElement.h"
    4344#include "Logging.h"
    44 #include "markup.h"
     45#include "MemoryCache.h"
    4546#include "Page.h"
    4647#include "PlatformKeyboardEvent.h"
    … …  
    5758#include "SubstituteData.h"
    5859#include "Threading.h"
     60#include "markup.h"
    5961#if __WXMSW__
    6062#include "WebCoreInstanceHandle.h"
    … …  
    8890
    8991#include "WebFrame.h"
    90 #include "WebView.h"
    9192#include "WebViewPrivate.h"
    9293
    … …  
    270271void wxWebView::SetCachePolicy(const wxWebViewCachePolicy& cachePolicy)
    271272{
    272     WebCore::Cache* globalCache = WebCore::cache();
     273    WebCore::MemoryCache* globalCache = WebCore::cache();
    273274    globalCache->setCapacities(cachePolicy.GetMinDeadCapacity(),
    274275                               cachePolicy.GetMaxDeadCapacity(),
    275276                               cachePolicy.GetCapacity());
    276277
    277     // store a copy since there is no getter for Cache values
     278    // store a copy since there is no getter for MemoryCache values
    278279    gs_cachePolicy = cachePolicy;
    279280}

  • trunk/WebKit/wx/WebView.h

    r66314 r71499  
    5555#endif
    5656
    57 static const int defaultCacheCapacity = 8192 * 1024; // mirrors Cache.cpp
     57static const int defaultCacheCapacity = 8192 * 1024; // mirrors MemoryCache.cpp
    5858
    5959class WXDLLIMPEXP_WEBKIT wxWebViewCachePolicy

  • trunk/WebKit2/ChangeLog

    r71471 r71499  
     12010-11-07  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename Cache to MemoryCache
     6        https://bugs.webkit.org/show_bug.cgi?id=49159
     7
     8        * WebProcess/WebProcess.cpp:
     9        * WebProcess/mac/WebProcessMac.mm:
     10        * WebProcess/win/WebProcessWin.cpp:
     11
    1122010-11-06  Balazs Kelemen  <kbalazs@webkit.org>
    213

  • trunk/WebKit2/WebProcess/WebProcess.cpp

    r71423 r71499  
    5050
    5151#ifndef NDEBUG
    52 #include <WebCore/Cache.h>
     52#include <WebCore/MemoryCache.h>
    5353#include <WebCore/GCController.h>
    5454#endif

  • trunk/WebKit2/WebProcess/mac/WebProcessMac.mm

    r69021 r71499  
    2626#include "WebProcess.h"
    2727
    28 #include <WebCore/Cache.h>
     28#include <WebCore/MemoryCache.h>
    2929#include <WebCore/PageCache.h>
    3030#include <WebKitSystemInterface.h>

  • trunk/WebKit2/WebProcess/win/WebProcessWin.cpp

    r70966 r71499  
    2626#include "WebProcess.h"
    2727
    28 #include <WebCore/Cache.h>
     28#include <WebCore/MemoryCache.h>
    2929#include <WebCore/FileSystem.h>
    3030#include <WebCore/PageCache.h>
Note: See TracChangeset for help on using the changeset viewer.