Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)

New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream

3 files changed, 9 insertions, 0 deletions

diff --git a/Source/WebCore/storage/StorageArea.h b/Source/WebCore/storage/StorageArea.h
index 3b2492a67..2ea911725 100644
--- a/Source/WebCore/storage/StorageArea.h
+++ b/Source/WebCore/storage/StorageArea.h
@@ -56,6 +56,8 @@ namespace WebCore {
 
         virtual bool disabledByPrivateBrowsingInFrame(const Frame* sourceFrame) const = 0;
 
+        virtual size_t memoryBytesUsedByCache() const = 0;
+
         virtual void incrementAccessCount() { }
         virtual void decrementAccessCount() { }
     };
diff --git a/Source/WebCore/storage/StorageAreaImpl.cpp b/Source/WebCore/storage/StorageAreaImpl.cpp
index 694a97a6b..37c4f596c 100644
--- a/Source/WebCore/storage/StorageAreaImpl.cpp
+++ b/Source/WebCore/storage/StorageAreaImpl.cpp
@@ -264,6 +264,11 @@ void StorageAreaImpl::blockUntilImportComplete() const
         m_storageAreaSync->blockUntilImportComplete();
 }
 
+size_t StorageAreaImpl::memoryBytesUsedByCache() const
+{
+    return 0;
+}
+
 void StorageAreaImpl::incrementAccessCount()
 {
     m_accessCount++;
diff --git a/Source/WebCore/storage/StorageAreaImpl.h b/Source/WebCore/storage/StorageAreaImpl.h
index 4c90e5bc0..1f2b7e080 100644
--- a/Source/WebCore/storage/StorageAreaImpl.h
+++ b/Source/WebCore/storage/StorageAreaImpl.h
@@ -54,6 +54,8 @@ namespace WebCore {
 
         virtual bool disabledByPrivateBrowsingInFrame(const Frame* sourceFrame) const;
 
+        virtual size_t memoryBytesUsedByCache() const;
+
         virtual void incrementAccessCount();
         virtual void decrementAccessCount();