Title: [174204] trunk/Source/WebKit2
- Revision
- 174204
- Author
- [email protected]
- Date
- 2014-10-02 01:01:08 -0700 (Thu, 02 Oct 2014)
Log Message
Minor bug in UIClient::exceededDatabaseQuota()
https://bugs.webkit.org/show_bug.cgi?id=137213
Patch by JinYoung Hur <[email protected]> on 2014-10-02
Reviewed by Anders Carlsson.
Make sure not to call the completion handler twice if exceededDatabaseQuota is null.
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageUIClient):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (174203 => 174204)
--- trunk/Source/WebKit2/ChangeLog 2014-10-02 07:58:47 UTC (rev 174203)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-02 08:01:08 UTC (rev 174204)
@@ -1,3 +1,15 @@
+2014-10-02 JinYoung Hur <[email protected]>
+
+ Minor bug in UIClient::exceededDatabaseQuota()
+ https://bugs.webkit.org/show_bug.cgi?id=137213
+
+ Reviewed by Anders Carlsson.
+
+ Make sure not to call the completion handler twice if exceededDatabaseQuota is null.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageUIClient):
+
2014-10-01 Mark Rowe <[email protected]>
<https://webkit.org/b/137308> WebKit should build on OS X Yosemite for external users
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (174203 => 174204)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-10-02 07:58:47 UTC (rev 174203)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-10-02 08:01:08 UTC (rev 174204)
@@ -1473,8 +1473,10 @@
virtual void exceededDatabaseQuota(WebPageProxy* page, WebFrameProxy* frame, WebSecurityOrigin* origin, const String& databaseName, const String& databaseDisplayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage, std::function<void (unsigned long long)> completionHandler) override
{
- if (!m_client.exceededDatabaseQuota)
+ if (!m_client.exceededDatabaseQuota) {
completionHandler(currentQuota);
+ return;
+ }
completionHandler(m_client.exceededDatabaseQuota(toAPI(page), toAPI(frame), toAPI(origin), toAPI(databaseName.impl()), toAPI(databaseDisplayName.impl()), currentQuota, currentOriginUsage, currentDatabaseUsage, expectedUsage, m_client.base.clientInfo));
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
