<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[186225] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/186225">186225</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-02 06:00:35 -0700 (Thu, 02 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] WebSQL doesn't work because openDatabase always fails with DOM Exception 18
https://bugs.webkit.org/show_bug.cgi?id=146234
Reviewed by Sergio Villar Senin.
Source/WebKit2:
This is because we don't provide any quota, and 0 is used by
default, so there's never enough quota and openDatabase fails. We
should expose this in the API, but for now, we could use a default
quota of 5MB like WTR does.
* UIProcess/API/gtk/WebKitUIClient.cpp: Override
exceededDatabaseQuota and return always the default quota.
* UIProcess/gtk/WebInspectorProxyGtk.cpp:
(WebKit::exceededDatabaseQuota): Return the quota based on the
expected usage and current database usabe like mac does.
(WebKit::WebInspectorProxy::platformCreateInspectorPage): Add
custom UI client to implement exceededDatabaseQuota.
Tools:
Enable the WebSQL directory test that was disabled because of this bug.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
(testWebContextConfiguration):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitUIClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebContextcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (186224 => 186225)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-02 12:13:58 UTC (rev 186224)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-02 13:00:35 UTC (rev 186225)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-07-02 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] WebSQL doesn't work because openDatabase always fails with DOM Exception 18
+ https://bugs.webkit.org/show_bug.cgi?id=146234
+
+ Reviewed by Sergio Villar Senin.
+
+ This is because we don't provide any quota, and 0 is used by
+ default, so there's never enough quota and openDatabase fails. We
+ should expose this in the API, but for now, we could use a default
+ quota of 5MB like WTR does.
+
+ * UIProcess/API/gtk/WebKitUIClient.cpp: Override
+ exceededDatabaseQuota and return always the default quota.
+ * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+ (WebKit::exceededDatabaseQuota): Return the quota based on the
+ expected usage and current database usabe like mac does.
+ (WebKit::WebInspectorProxy::platformCreateInspectorPage): Add
+ custom UI client to implement exceededDatabaseQuota.
+
</ins><span class="cx"> 2015-07-02 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r185704.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitUIClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp (186224 => 186225)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2015-07-02 12:13:58 UTC (rev 186224)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2015-07-02 13:00:35 UTC (rev 186225)
</span><span class="lines">@@ -146,6 +146,13 @@
</span><span class="cx"> return WebCore::FloatRect(geometry);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ virtual void exceededDatabaseQuota(WebPageProxy*, WebFrameProxy*, API::SecurityOrigin*, const String&, const String&, unsigned long long /*currentQuota*/, unsigned long long /*currentOriginUsage*/, unsigned long long /*currentDatabaseUsage*/, unsigned long long /*expectedUsage*/, std::function<void (unsigned long long)> completionHandler) override
+ {
+ static const unsigned long long defaultQuota = 5 * 1024 * 1204; // 5 MB
+ // FIXME: Provide API for this.
+ completionHandler(defaultQuota);
+ }
+
</ins><span class="cx"> virtual bool runOpenPanel(WebPageProxy*, WebFrameProxy*, WebOpenPanelParameters* parameters, WebOpenPanelResultListenerProxy* listener) override
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<WebKitFileChooserRequest> request = adoptGRef(webkitFileChooserRequestCreate(parameters, listener));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp (186224 => 186225)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2015-07-02 12:13:58 UTC (rev 186224)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2015-07-02 13:00:35 UTC (rev 186225)
</span><span class="lines">@@ -52,6 +52,11 @@
</span><span class="cx"> inspectorProxy->close();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static unsigned long long exceededDatabaseQuota(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKStringRef, WKStringRef, unsigned long long, unsigned long long, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage, const void*)
+{
+ return std::max<unsigned long long>(expectedUsage, currentDatabaseUsage * 1.25);
+}
+
</ins><span class="cx"> void WebInspectorProxy::initializeInspectorClientGtk(const WKInspectorClientGtkBase* inspectorClient)
</span><span class="cx"> {
</span><span class="cx"> m_client.initialize(inspectorClient);
</span><span class="lines">@@ -75,7 +80,61 @@
</span><span class="cx"> m_inspectorView = GTK_WIDGET(webkitWebViewBaseCreate(&inspectorProcessPool(), preferences.get(), pageGroup.get(), nullptr, nullptr));
</span><span class="cx"> g_object_add_weak_pointer(G_OBJECT(m_inspectorView), reinterpret_cast<void**>(&m_inspectorView));
</span><span class="cx">
</span><del>- return webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(m_inspectorView));
</del><ins>+ WKPageUIClientV2 uiClient = {
+ { 2, this },
+ nullptr, // createNewPage_deprecatedForUseWithV0
+ nullptr, // showPage
+ nullptr, // closePage
+ nullptr, // takeFocus
+ nullptr, // focus
+ nullptr, // unfocus
+ nullptr, // runJavaScriptAlert
+ nullptr, // runJavaScriptConfirm
+ nullptr, // runJavaScriptPrompt
+ nullptr, // setStatusText
+ nullptr, // mouseDidMoveOverElement_deprecatedForUseWithV0
+ nullptr, // missingPluginButtonClicked_deprecatedForUseWithV0
+ nullptr, // didNotHandleKeyEvent
+ nullptr, // didNotHandleWheelEvent
+ nullptr, // areToolbarsVisible
+ nullptr, // setToolbarsVisible
+ nullptr, // isMenuBarVisible
+ nullptr, // setMenuBarVisible
+ nullptr, // isStatusBarVisible
+ nullptr, // setStatusBarVisible
+ nullptr, // isResizable
+ nullptr, // setResizable
+ nullptr, // getWindowFrame,
+ nullptr, // setWindowFrame,
+ nullptr, // runBeforeUnloadConfirmPanel
+ nullptr, // didDraw
+ nullptr, // pageDidScroll
+ exceededDatabaseQuota,
+ nullptr, // runOpenPanel,
+ nullptr, // decidePolicyForGeolocationPermissionRequest
+ nullptr, // headerHeight
+ nullptr, // footerHeight
+ nullptr, // drawHeader
+ nullptr, // drawFooter
+ nullptr, // printFrame
+ nullptr, // runModal
+ nullptr, // unused
+ nullptr, // saveDataToFileInDownloadsFolder
+ nullptr, // shouldInterruptJavaScript
+ nullptr, // createPage
+ nullptr, // mouseDidMoveOverElement
+ nullptr, // decidePolicyForNotificationPermissionRequest
+ nullptr, // unavailablePluginButtonClicked_deprecatedForUseWithV1
+ nullptr, // showColorPicker
+ nullptr, // hideColorPicker
+ nullptr, // unavailablePluginButtonClicked
+ };
+
+ WebPageProxy* inspectorPage = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(m_inspectorView));
+ ASSERT(inspectorPage);
+ WKPageSetPageUIClient(toAPI(inspectorPage), &uiClient.base);
+
+ return inspectorPage;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::createInspectorWindow()
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (186224 => 186225)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-07-02 12:13:58 UTC (rev 186224)
+++ trunk/Tools/ChangeLog 2015-07-02 13:00:35 UTC (rev 186225)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-07-02 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] WebSQL doesn't work because openDatabase always fails with DOM Exception 18
+ https://bugs.webkit.org/show_bug.cgi?id=146234
+
+ Reviewed by Sergio Villar Senin.
+
+ Enable the WebSQL directory test that was disabled because of this bug.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
+ (testWebContextConfiguration):
+
</ins><span class="cx"> 2015-07-01 Matthew Daiter <mdaiter@apple.com>
</span><span class="cx">
</span><span class="cx"> Enabled MEDIA_STREAM flag
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp (186224 => 186225)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2015-07-02 12:13:58 UTC (rev 186224)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2015-07-02 13:00:35 UTC (rev 186225)
</span><span class="lines">@@ -71,10 +71,8 @@
</span><span class="cx">
</span><span class="cx"> GUniquePtr<char> webSQLDirectory(g_build_filename(Test::dataDirectory(), "websql", nullptr));
</span><span class="cx"> g_assert_cmpstr(webSQLDirectory.get(), ==, webkit_website_data_manager_get_websql_directory(manager));
</span><del>-#if 0 // FIXME: We need API to set the database quota for an origin to be able to test this.
- test->runJavaScriptAndWaitUntilFinished("db = openDatabase(\"TestDatabase\", \"1.0\", \"TestDatabase\", 1);", &error);
</del><ins>+ test->runJavaScriptAndWaitUntilFinished("db = openDatabase(\"TestDatabase\", \"1.0\", \"TestDatabase\", 1);", nullptr);
</ins><span class="cx"> g_assert(g_file_test(webSQLDirectory.get(), G_FILE_TEST_IS_DIR));
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> GUniquePtr<char> diskCacheDirectory(g_build_filename(Test::dataDirectory(), "disk-cache", nullptr));
</span><span class="cx"> g_assert_cmpstr(diskCacheDirectory.get(), ==, webkit_website_data_manager_get_disk_cache_directory(manager));
</span></span></pre>
</div>
</div>
</body>
</html>