Changeset 138696 in webkit

Timestamp:

Jan 2, 2013 8:44:09 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Do not determine db quota limit using db file size
​https://bugs.webkit.org/show_bug.cgi?id=105991

PR 267191

Patch by Otto Derek Cheung <​otcheung@rim.com> on 2013-01-02
Reviewed by George Staikos.

Passing the current quota to WebPageClientImpl::databaseQuota so we can determine a better
quota limit without using the db file size.

• Api/WebPageClient.h:
• WebCoreSupport/ChromeClientBlackBerry.cpp:

(WebCore::ChromeClientBlackBerry::exceededDatabaseQuota):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPageClient.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/ChromeClientBlackBerry.cpp (modified) (2 diffs)

trunk/Source/WebKit/blackberry/Api/WebPageClient.h

@@ -179 +179 @@
 
     // Database interface.
-    virtual unsigned long long databaseQuota(const unsigned short* origin, unsigned originLength, const unsigned short* databaseName, unsigned databaseNameLength, unsigned long long totalUsage, unsigned long long originUsage, unsigned long long estimatedSize) = 0;
+    virtual unsigned long long databaseQuota(const unsigned short* origin, unsigned originLength, const unsigned short* databaseName, unsigned databaseNameLength, unsigned long long originUsage, unsigned long long currentQuota, unsigned long long estimatedSize) = 0;
 
     virtual void setIconForUrl(const BlackBerry::Platform::String& originalPageUrl, const BlackBerry::Platform::String& finalPageUrl, const BlackBerry::Platform::String& iconUrl) = 0;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-01-02  Otto Derek Cheung  <otcheung@rim.com>
+
+        [BlackBerry] Do not determine db quota limit using db file size
+        https://bugs.webkit.org/show_bug.cgi?id=105991
+
+        PR 267191
+
+        Reviewed by George Staikos.
+
+        Passing the current quota to WebPageClientImpl::databaseQuota so we can determine a better
+        quota limit without using the db file size.
+
+        * Api/WebPageClient.h:
+        * WebCoreSupport/ChromeClientBlackBerry.cpp:
+        (WebCore::ChromeClientBlackBerry::exceededDatabaseQuota):
+
 2013-01-02  Yong Li  <yoli@rim.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp

@@ -499 +499 @@
     DatabaseManager& manager = DatabaseManager::manager();
 
-    unsigned long long totalUsage = manager.totalDatabaseUsage();
-    unsigned long long originUsage = manager.usageForOrigin(origin);
+    unsigned long long totalUsage = tracker.totalDatabaseUsage();
+    unsigned long long originUsage = tracker.usageForOrigin(origin);
+    unsigned long long currentQuota = tracker.quotaForOrigin(origin);
 
     DatabaseDetails details = manager.detailsForNameAndOrigin(name, origin);
@@ -509 +510 @@
 
     unsigned long long quota = m_webPagePrivate->m_client->databaseQuota(originStr.characters(), originStr.length(),
-        nameStr.characters(), nameStr.length(), totalUsage, originUsage, estimatedSize);
+        nameStr.characters(), nameStr.length(), originUsage, currentQuota, estimatedSize);
 
     manager.setQuota(origin, quota);