Diff
Modified: branches/safari-537.75-branch/LayoutTests/ChangeLog (163897 => 163898)
--- branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-02-11 20:32:09 UTC (rev 163897)
+++ branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-02-11 20:39:02 UTC (rev 163898)
@@ -1,3 +1,25 @@
+2014-01-11 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r158447.
+
+ 2013-10-31 Mark Lam <mark....@apple.com>
+
+ REGRESSION: Crashes in -[UIDelegate webView:frame:exceededDatabaseQuotaForSecurityOrigin:database:].
+ https://bugs.webkit.org/show_bug.cgi?id=123383.
+
+ Reviewed by Geoffrey Garen.
+
+ Removed an inappropriate assertion in DumpRenderTree/mac/UIDelegate.mm and
+ added 2 attributes (databaseDefaultQuota and databaseMaxQuota) to allow
+ tests to set appropriate quota settings to exercise quota expansion tests
+ when needed.
+
+ * storage/websql/open-database-expand-quota.html:
+ - Set databaseDefaultQuota and databaseMaxQuota as needed for this test.
+ * storage/websql/open-database-over-quota-expected.txt:
+ * storage/websql/open-database-over-quota.html:
+ - Revert the change from r157874 which is no longer needed for this test.
+
2014-02-10 Lucas Forschler <lforsch...@apple.com>
Merge r156082
Modified: branches/safari-537.75-branch/LayoutTests/storage/websql/open-database-over-quota-expected.txt (163897 => 163898)
--- branches/safari-537.75-branch/LayoutTests/storage/websql/open-database-over-quota-expected.txt 2014-02-11 20:32:09 UTC (rev 163897)
+++ branches/safari-537.75-branch/LayoutTests/storage/websql/open-database-over-quota-expected.txt 2014-02-11 20:39:02 UTC (rev 163898)
@@ -1,2 +1,2 @@
-This tests that calling openDatabase with a size over 5MB doesn't assert on debug builds.
+This tests that calling openDatabase with a size greater or equal to the test max quota limit of 5MB doesn't assert on debug builds.
PASS
Modified: branches/safari-537.75-branch/LayoutTests/storage/websql/open-database-over-quota.html (163897 => 163898)
--- branches/safari-537.75-branch/LayoutTests/storage/websql/open-database-over-quota.html 2014-02-11 20:32:09 UTC (rev 163897)
+++ branches/safari-537.75-branch/LayoutTests/storage/websql/open-database-over-quota.html 2014-02-11 20:39:02 UTC (rev 163898)
@@ -16,7 +16,8 @@
</script>
</head>
<body _onload_="runTest()">
-<div>This tests that calling openDatabase with a size over 5MB doesn't assert on debug builds.
+<div>This tests that calling openDatabase with a size greater or equal to the test max quota limit of 5MB
+doesn't assert on debug builds.
<div id="result">
FAIL: We shouldn't have been able to open the database.
</div>
Modified: branches/safari-537.75-branch/Tools/ChangeLog (163897 => 163898)
--- branches/safari-537.75-branch/Tools/ChangeLog 2014-02-11 20:32:09 UTC (rev 163897)
+++ branches/safari-537.75-branch/Tools/ChangeLog 2014-02-11 20:39:02 UTC (rev 163898)
@@ -1,3 +1,53 @@
+2014-02-11 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r158447.
+
+ 2013-10-31 Mark Lam <mark....@apple.com>
+
+ REGRESSION: Crashes in -[UIDelegate webView:frame:exceededDatabaseQuotaForSecurityOrigin:database:].
+ https://bugs.webkit.org/show_bug.cgi?id=123383.
+
+ Reviewed by Geoffrey Garen.
+
+ Removed an inappropriate assertion in DumpRenderTree/mac/UIDelegate.mm and
+ added 2 attributes (databaseDefaultQuota and databaseMaxQuota) to allow
+ tests to set appropriate quota settings to exercise quota expansion tests
+ when needed.
+
+ * DumpRenderTree/TestRunner.cpp:
+ (TestRunner::TestRunner):
+ (getDatabaseDefaultQuotaCallback):
+ (getDatabaseMaxQuotaCallback):
+ (setDatabaseDefaultQuotaCallback):
+ (setDatabaseMaxQuotaCallback):
+ (TestRunner::staticValues):
+ * DumpRenderTree/TestRunner.h:
+ (TestRunner::databaseDefaultQuota):
+ (TestRunner::setDatabaseDefaultQuota):
+ (TestRunner::databaseMaxQuota):
+ (TestRunner::setDatabaseMaxQuota):
+ * DumpRenderTree/blackberry/DumpRenderTree.cpp:
+ (BlackBerry::WebKit::DumpRenderTree::exceededDatabaseQuota):
+ * DumpRenderTree/efl/DumpRenderTreeView.cpp:
+ (onExceededDatabaseQuota):
+ * DumpRenderTree/mac/UIDelegate.mm:
+ (-[UIDelegate webView:frame:exceededDatabaseQuotaForSecurityOrigin:database:]):
+ * DumpRenderTree/win/UIDelegate.cpp:
+ (UIDelegate::exceededDatabaseQuota):
+ * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::didExceedDatabaseQuota):
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::TestRunner):
+ * WebKitTestRunner/InjectedBundle/TestRunner.h:
+ (WTR::TestRunner::databaseDefaultQuota):
+ (WTR::TestRunner::setDatabaseDefaultQuota):
+ (WTR::TestRunner::databaseMaxQuota):
+ (WTR::TestRunner::setDatabaseMaxQuota):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::createOtherPage):
+ (WTR::TestController::createWebViewWithOptions):
+
2014-01-22 Brent Fulgham <bfulg...@apple.com>
Merge r157882
Modified: branches/safari-537.75-branch/Tools/DumpRenderTree/TestRunner.cpp (163897 => 163898)
--- branches/safari-537.75-branch/Tools/DumpRenderTree/TestRunner.cpp 2014-02-11 20:32:09 UTC (rev 163897)
+++ branches/safari-537.75-branch/Tools/DumpRenderTree/TestRunner.cpp 2014-02-11 20:39:02 UTC (rev 163898)
@@ -105,6 +105,8 @@
, m_areLegacyWebNotificationPermissionRequestsIgnored(false)
, m_customFullScreenBehavior(false)
, m_hasPendingWebNotificationClick(false)
+ , m_databaseDefaultQuota(-1)
+ , m_databaseMaxQuota(-1)
, m_testPathOrURL(testPathOrURL)
, m_expectedPixelHash(expectedPixelHash)
, m_titleTextDirection("ltr")
@@ -1821,6 +1823,18 @@
return JSValueMakeBoolean(context, controller->globalFlag());
}
+static JSValueRef getDatabaseDefaultQuotaCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
+{
+ TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
+ return JSValueMakeNumber(context, controller->databaseDefaultQuota());
+}
+
+static JSValueRef getDatabaseMaxQuotaCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
+{
+ TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
+ return JSValueMakeNumber(context, controller->databaseMaxQuota());
+}
+
static JSValueRef getWebHistoryItemCountCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
{
TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
@@ -1861,6 +1875,22 @@
return true;
}
+static bool setDatabaseDefaultQuotaCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef value, JSValueRef* exception)
+{
+ TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
+ controller->setDatabaseDefaultQuota(JSValueToNumber(context, value, exception));
+ ASSERT(!*exception);
+ return true;
+}
+
+static bool setDatabaseMaxQuotaCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef value, JSValueRef* exception)
+{
+ TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
+ controller->setDatabaseMaxQuota(JSValueToNumber(context, value, exception));
+ ASSERT(!*exception);
+ return true;
+}
+
static JSValueRef ignoreLegacyWebNotificationPermissionRequestsCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
@@ -2016,6 +2046,8 @@
#endif
{ "secureEventInputIsEnabled", getSecureEventInputIsEnabledCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "titleTextDirection", getTitleTextDirectionCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "databaseDefaultQuota", getDatabaseDefaultQuotaCallback, setDatabaseDefaultQuotaCallback, kJSPropertyAttributeNone },
+ { "databaseMaxQuota", getDatabaseMaxQuotaCallback, setDatabaseMaxQuotaCallback, kJSPropertyAttributeNone },
{ 0, 0, 0, 0 }
};
return staticValues;
Modified: branches/safari-537.75-branch/Tools/DumpRenderTree/TestRunner.h (163897 => 163898)
--- branches/safari-537.75-branch/Tools/DumpRenderTree/TestRunner.h 2014-02-11 20:32:09 UTC (rev 163897)
+++ branches/safari-537.75-branch/Tools/DumpRenderTree/TestRunner.h 2014-02-11 20:39:02 UTC (rev 163898)
@@ -273,6 +273,12 @@
bool globalFlag() const { return m_globalFlag; }
void setGlobalFlag(bool globalFlag) { m_globalFlag = globalFlag; }
+ double databaseDefaultQuota() const { return m_databaseDefaultQuota; }
+ void setDatabaseDefaultQuota(double quota) { m_databaseDefaultQuota = quota; }
+
+ double databaseMaxQuota() const { return m_databaseMaxQuota; }
+ void setDatabaseMaxQuota(double quota) { m_databaseMaxQuota = quota; }
+
bool deferMainResourceDataLoad() const { return m_deferMainResourceDataLoad; }
void setDeferMainResourceDataLoad(bool flag) { m_deferMainResourceDataLoad = flag; }
@@ -407,6 +413,9 @@
bool m_customFullScreenBehavior;
bool m_hasPendingWebNotificationClick;
+ double m_databaseDefaultQuota;
+ double m_databaseMaxQuota;
+
std::string m_authenticationUsername;
std::string m_authenticationPassword;
std::string m_testPathOrURL;
Modified: branches/safari-537.75-branch/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp (163897 => 163898)
--- branches/safari-537.75-branch/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp 2014-02-11 20:32:09 UTC (rev 163897)
+++ branches/safari-537.75-branch/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp 2014-02-11 20:39:02 UTC (rev 163898)
@@ -771,7 +771,23 @@
if (!testDone && gTestRunner->dumpDatabaseCallbacks())
printf("UI DELEGATE DATABASE CALLBACK: exceededDatabaseQuotaForSecurityOrigin:{%s, %s, %i} database:%s\n", origin->protocol().utf8().data(), origin->host().utf8().data(), origin->port(), name.utf8().data());
- WebCore::DatabaseTracker::tracker().setQuota(mainFrame->document()->securityOrigin(), 5 * 1024 * 1024);
+ WebCore::DatabaseManager& manager = WebCore::DatabaseManager::manager();
+ WebCore::DatabaseDetails details = detailsForNameAndOrigin(name, origin);
+ unsigned long long defaultQuota = 5 * 1024 * 1024;
+ double testDefaultQuota = gTestRunner->databaseDefaultQuota();
+ if (testDefaultQuota >= 0)
+ defaultQuota = testDefaultQuota;
+
+ unsigned long long newQuota = defaultQuota;
+
+ double maxQuota = gTestRunner->databaseMaxQuota();
+ if (maxQuota >= 0) {
+ if (defaultQuota < expectedSize && expectedSize <= maxQuota) {
+ newQuota = expectedSize;
+ printf("UI DELEGATE DATABASE CALLBACK: increased quota to %llu\n", newQuota);
+ }
+ }
+ manager.setQuota(origin, newQuota);
}
bool DumpRenderTree::allowsOpeningWindow()
Modified: branches/safari-537.75-branch/Tools/DumpRenderTree/efl/DumpRenderTreeView.cpp (163897 => 163898)
--- branches/safari-537.75-branch/Tools/DumpRenderTree/efl/DumpRenderTreeView.cpp 2014-02-11 20:32:09 UTC (rev 163897)
+++ branches/safari-537.75-branch/Tools/DumpRenderTree/efl/DumpRenderTreeView.cpp 2014-02-11 20:39:02 UTC (rev 163898)
@@ -135,7 +135,21 @@
databaseName);
ewk_security_origin_free(origin);
- return 5 * 1024 * 1024;
+ uint64_t defaultQuota = 5 * 1024 * 1024;
+ double testDefaultQuota = gTestRunner->databaseDefaultQuota();
+ if (testDefaultQuota >= 0)
+ defaultQuota = testDefaultQuota;
+
+ uint64_t newQuota = defaultQuota;
+
+ double maxQuota = gTestRunner->databaseMaxQuota();
+ if (maxQuota >= 0) {
+ if (defaultQuota < expectedSize && expectedSize <= maxQuota) {
+ newQuota = expectedSize;
+ printf("UI DELEGATE DATABASE CALLBACK: increased quota to %" PRIu64 "\n", expectedSize);
+ }
+ }
+ return newQuota;
}
static int64_t onExceededApplicationCacheQuota(Ewk_View_Smart_Data*, Ewk_Security_Origin *origin, int64_t defaultOriginQuota, int64_t totalSpaceNeeded)
Modified: branches/safari-537.75-branch/Tools/DumpRenderTree/mac/UIDelegate.mm (163897 => 163898)
--- branches/safari-537.75-branch/Tools/DumpRenderTree/mac/UIDelegate.mm 2014-02-11 20:32:09 UTC (rev 163897)
+++ branches/safari-537.75-branch/Tools/DumpRenderTree/mac/UIDelegate.mm 2014-02-11 20:39:02 UTC (rev 163898)
@@ -35,6 +35,7 @@
#import "MockWebNotificationProvider.h"
#import "TestRunner.h"
#import <WebKit/WebApplicationCache.h>
+#import <WebKit/WebDatabaseManagerPrivate.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebHTMLViewPrivate.h>
#import <WebKit/WebQuotaManager.h>
@@ -169,8 +170,23 @@
[origin port], [databaseIdentifier UTF8String]);
}
- static const unsigned long long defaultQuota = 5 * 1024 * 1024;
- [[origin databaseQuotaManager] setQuota:defaultQuota];
+ NSDictionary *databaseDetails = [[WebDatabaseManager sharedWebDatabaseManager] detailsForDatabase:databaseIdentifier withOrigin:origin];
+ unsigned long long expectedSize = [[databaseDetails objectForKey:WebDatabaseExpectedSizeKey] unsignedLongLongValue];
+ unsigned long long defaultQuota = 5 * 1024 * 1024;
+ double testDefaultQuota = gTestRunner->databaseDefaultQuota();
+ if (testDefaultQuota >= 0)
+ defaultQuota = testDefaultQuota;
+
+ unsigned long long newQuota = defaultQuota;
+
+ double maxQuota = gTestRunner->databaseMaxQuota();
+ if (maxQuota >= 0) {
+ if (defaultQuota < expectedSize && expectedSize <= maxQuota) {
+ newQuota = expectedSize;
+ printf("UI DELEGATE DATABASE CALLBACK: increased quota to %llu\n", newQuota);
+ }
+ }
+ [[origin databaseQuotaManager] setQuota:newQuota];
}
- (void)webView:(WebView *)sender exceededApplicationCacheOriginQuotaForSecurityOrigin:(WebSecurityOrigin *)origin totalSpaceNeeded:(NSUInteger)totalSpaceNeeded
Modified: branches/safari-537.75-branch/Tools/DumpRenderTree/win/UIDelegate.cpp (163897 => 163898)
--- branches/safari-537.75-branch/Tools/DumpRenderTree/win/UIDelegate.cpp 2014-02-11 20:32:09 UTC (rev 163897)
+++ branches/safari-537.75-branch/Tools/DumpRenderTree/win/UIDelegate.cpp 2014-02-11 20:39:02 UTC (rev 163898)
@@ -594,9 +594,41 @@
SysFreeString(protocol);
SysFreeString(host);
- static const unsigned long long defaultQuota = 5 * 1024 * 1024;
- origin->setQuota(defaultQuota);
+ unsigned long long defaultQuota = 5 * 1024 * 1024;
+ double testDefaultQuota = gTestRunner->databaseDefaultQuota();
+ if (testDefaultQuota >= 0)
+ defaultQuota = testDefaultQuota;
+ COMPtr<IWebDatabaseManager> databaseManager;
+ COMPtr<IWebDatabaseManager> tmpDatabaseManager;
+
+ if (FAILED(WebKitCreateInstance(CLSID_WebDatabaseManager, 0, IID_IWebDatabaseManager, (void**)&tmpDatabaseManager))) {
+ origin->setQuota(defaultQuota);
+ return S_OK;
+ }
+ if (FAILED(tmpDatabaseManager->sharedWebDatabaseManager(&databaseManager))) {
+ origin->setQuota(defaultQuota);
+ return S_OK;
+ }
+ IPropertyBag* detailsBag;
+ if (FAILED(databaseManager->detailsForDatabase(databaseIdentifier, origin, &detailsBag))) {
+ origin->setQuota(defaultQuota);
+ return S_OK;
+ }
+ VARIANT var;
+ detailsBag->Read(WebDatabaseUsageKey, &var, 0);
+ unsigned long long expectedSize = V_UI8(&var);
+ unsigned long long newQuota = defaultQuota;
+
+ double maxQuota = gTestRunner->databaseMaxQuota();
+ if (maxQuota >= 0) {
+ if (defaultQuota < expectedSize && expectedSize <= maxQuota) {
+ newQuota = expectedSize;
+ printf("UI DELEGATE DATABASE CALLBACK: increased quota to %llu\n", newQuota);
+ }
+ }
+ origin->setQuota(newQuota);
+
return S_OK;
}
Modified: branches/safari-537.75-branch/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (163897 => 163898)
--- branches/safari-537.75-branch/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2014-02-11 20:32:09 UTC (rev 163897)
+++ branches/safari-537.75-branch/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2014-02-11 20:39:02 UTC (rev 163898)
@@ -103,6 +103,9 @@
void setDatabaseQuota(unsigned long long quota);
DOMString pathToLocalResource(DOMString url);
+ attribute double databaseDefaultQuota;
+ attribute double databaseMaxQuota;
+
// Application Cache API
void clearAllApplicationCaches();
void setAppCacheMaximumSize(unsigned long long size);
Modified: branches/safari-537.75-branch/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (163897 => 163898)
--- branches/safari-537.75-branch/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2014-02-11 20:32:09 UTC (rev 163897)
+++ branches/safari-537.75-branch/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2014-02-11 20:39:02 UTC (rev 163898)
@@ -1483,8 +1483,26 @@
InjectedBundle::shared().outputText(stringBuilder.toString());
}
- static const uint64_t defaultQuota = 5 * 1024 * 1024;
- return defaultQuota;
+ uint64_t defaultQuota = 5 * 1024 * 1024;
+ double testDefaultQuota = InjectedBundle::shared().testRunner()->databaseDefaultQuota();
+ if (testDefaultQuota >= 0)
+ defaultQuota = testDefaultQuota;
+
+ unsigned long long newQuota = defaultQuota;
+
+ double maxQuota = InjectedBundle::shared().testRunner()->databaseMaxQuota();
+ if (maxQuota >= 0) {
+ if (defaultQuota < expectedUsageBytes && expectedUsageBytes <= maxQuota) {
+ newQuota = expectedUsageBytes;
+
+ StringBuilder stringBuilder;
+ stringBuilder.appendLiteral("UI DELEGATE DATABASE CALLBACK: increased quota to ");
+ stringBuilder.appendNumber(newQuota);
+ stringBuilder.append('\n');
+ InjectedBundle::shared().outputText(stringBuilder.toString());
+ }
+ }
+ return newQuota;
}
// Editor Client Callbacks
Modified: branches/safari-537.75-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (163897 => 163898)
--- branches/safari-537.75-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2014-02-11 20:32:09 UTC (rev 163897)
+++ branches/safari-537.75-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2014-02-11 20:39:02 UTC (rev 163898)
@@ -93,6 +93,8 @@
, m_policyDelegatePermissive(false)
, m_globalFlag(false)
, m_customFullScreenBehavior(false)
+ , m_databaseDefaultQuota(-1)
+ , m_databaseMaxQuota(-1)
, m_userStyleSheetEnabled(false)
, m_userStyleSheetLocation(adoptWK(WKStringCreateWithUTF8CString("")))
{
Modified: branches/safari-537.75-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (163897 => 163898)
--- branches/safari-537.75-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2014-02-11 20:32:09 UTC (rev 163897)
+++ branches/safari-537.75-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2014-02-11 20:39:02 UTC (rev 163898)
@@ -223,6 +223,12 @@
bool globalFlag() const { return m_globalFlag; }
void setGlobalFlag(bool value) { m_globalFlag = value; }
+ double databaseDefaultQuota() const { return m_databaseDefaultQuota; }
+ void setDatabaseDefaultQuota(double quota) { m_databaseDefaultQuota = quota; }
+
+ double databaseMaxQuota() const { return m_databaseMaxQuota; }
+ void setDatabaseMaxQuota(double quota) { m_databaseMaxQuota = quota; }
+
void addChromeInputField(JSValueRef);
void removeChromeInputField(JSValueRef);
void focusWebView(JSValueRef);
@@ -321,6 +327,9 @@
int m_timeout;
+ double m_databaseDefaultQuota;
+ double m_databaseMaxQuota;
+
bool m_userStyleSheetEnabled;
WKRetainPtr<WKStringRef> m_userStyleSheetLocation;
Modified: branches/safari-537.75-branch/Tools/WebKitTestRunner/TestController.cpp (163897 => 163898)
--- branches/safari-537.75-branch/Tools/WebKitTestRunner/TestController.cpp 2014-02-11 20:32:09 UTC (rev 163897)
+++ branches/safari-537.75-branch/Tools/WebKitTestRunner/TestController.cpp 2014-02-11 20:39:02 UTC (rev 163898)
@@ -144,13 +144,6 @@
return TestController::shared().beforeUnloadReturnValue();
}
-static unsigned long long exceededDatabaseQuota(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKStringRef, WKStringRef, unsigned long long, unsigned long long, unsigned long long, unsigned long long, const void*)
-{
- static const unsigned long long defaultQuota = 5 * 1024 * 1024;
- return defaultQuota;
-}
-
-
void TestController::runModal(WKPageRef page, const void* clientInfo)
{
PlatformWebView* view = static_cast<PlatformWebView*>(const_cast<void*>(clientInfo));
@@ -228,7 +221,7 @@
runBeforeUnloadConfirmPanel,
0, // didDraw
0, // pageDidScroll
- exceededDatabaseQuota,
+ 0, // exceededDatabaseQuota
0, // runOpenPanel
decidePolicyForGeolocationPermissionRequest,
0, // headerHeight
@@ -427,7 +420,7 @@
runBeforeUnloadConfirmPanel,
0, // didDraw
0, // pageDidScroll
- exceededDatabaseQuota,
+ 0, // exceededDatabaseQuota,
0, // runOpenPanel
decidePolicyForGeolocationPermissionRequest,
0, // headerHeight
