Title: [139519] trunk/Source/WebKit/blackberry
- Revision
- 139519
- Author
- [email protected]
- Date
- 2013-01-11 16:14:58 -0800 (Fri, 11 Jan 2013)
Log Message
[BlackBerry] Modifying the databaseQuota call to WebPageClient
https://bugs.webkit.org/show_bug.cgi?id=106703
Patch by Otto Derek Cheung <[email protected]> on 2013-01-11
Reviewed by Yong Li.
The databaseQuota call in WebPageClientImpl is modified to take in
BP:Strings directly. Also, we want to use the origin URL from the security origin.
Not the database identifier.
* Api/WebPageClient.h:
* WebCoreSupport/ChromeClientBlackBerry.cpp:
(WebCore::ChromeClientBlackBerry::exceededDatabaseQuota):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPageClient.h (139518 => 139519)
--- trunk/Source/WebKit/blackberry/Api/WebPageClient.h 2013-01-12 00:12:55 UTC (rev 139518)
+++ trunk/Source/WebKit/blackberry/Api/WebPageClient.h 2013-01-12 00:14:58 UTC (rev 139519)
@@ -178,7 +178,7 @@
virtual void scheduleCloseWindow() = 0;
// Database interface.
- 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 unsigned long long databaseQuota(const BlackBerry::Platform::String& origin, const BlackBerry::Platform::String& databaseName, 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;
virtual void setFavicon(const BlackBerry::Platform::String& dataInBase64, const BlackBerry::Platform::String& url) = 0;
Modified: trunk/Source/WebKit/blackberry/ChangeLog (139518 => 139519)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-01-12 00:12:55 UTC (rev 139518)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-01-12 00:14:58 UTC (rev 139519)
@@ -1,3 +1,18 @@
+2013-01-11 Otto Derek Cheung <[email protected]>
+
+ [BlackBerry] Modifying the databaseQuota call to WebPageClient
+ https://bugs.webkit.org/show_bug.cgi?id=106703
+
+ Reviewed by Yong Li.
+
+ The databaseQuota call in WebPageClientImpl is modified to take in
+ BP:Strings directly. Also, we want to use the origin URL from the security origin.
+ Not the database identifier.
+
+ * Api/WebPageClient.h:
+ * WebCoreSupport/ChromeClientBlackBerry.cpp:
+ (WebCore::ChromeClientBlackBerry::exceededDatabaseQuota):
+
2013-01-10 Yongxin Dai <[email protected]>
[BlackBerry] Handle the case that start/end position is out of unclipped selection region
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp (139518 => 139519)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp 2013-01-12 00:12:55 UTC (rev 139518)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp 2013-01-12 00:14:58 UTC (rev 139519)
@@ -504,10 +504,9 @@
unsigned long long estimatedSize = details.expectedUsage();
const String& nameStr = details.displayName();
- String originStr = origin->databaseIdentifier();
+ String originStr = origin->toString();
- unsigned long long quota = m_webPagePrivate->m_client->databaseQuota(originStr.characters(), originStr.length(),
- nameStr.characters(), nameStr.length(), originUsage, currentQuota, estimatedSize);
+ unsigned long long quota = m_webPagePrivate->m_client->databaseQuota(originStr, nameStr, originUsage, currentQuota, estimatedSize);
manager.setQuota(origin, quota);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
