<!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>[200289] trunk/Source</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/200289">200289</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-04-29 22:40:57 -0700 (Fri, 29 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Web IDL] Specify default parameter values for callback parameters
https://bugs.webkit.org/show_bug.cgi?id=157188
Reviewed by Darin Adler.
Specify default parameter values for callback parameters.
* Modules/geolocation/Geolocation.idl:
* Modules/notifications/Notification.cpp:
(WebCore::Notification::requestPermission):
* Modules/notifications/Notification.h:
* Modules/notifications/Notification.idl:
* Modules/notifications/NotificationCenter.idl:
* Modules/quota/StorageInfo.cpp:
(WebCore::StorageInfo::queryUsageAndQuota):
(WebCore::StorageInfo::requestQuota):
* Modules/quota/StorageInfo.h:
* Modules/quota/StorageInfo.idl:
* Modules/quota/StorageQuota.h:
* Modules/quota/StorageQuota.idl:
* Modules/webaudio/AudioContext.idl:
* Modules/webdatabase/DOMWindowWebDatabase.cpp:
(WebCore::DOMWindowWebDatabase::openDatabase):
* Modules/webdatabase/DOMWindowWebDatabase.h:
(WebCore::DOMWindowWebDatabase::DOMWindowWebDatabase):
(WebCore::DOMWindowWebDatabase::~DOMWindowWebDatabase):
* Modules/webdatabase/DOMWindowWebDatabase.idl:
* Modules/webdatabase/Database.cpp:
(WebCore::Database::runTransaction):
(WebCore::Database::changeVersion):
(WebCore::Database::transaction):
(WebCore::Database::readTransaction):
* Modules/webdatabase/Database.h:
* Modules/webdatabase/Database.idl:
* Modules/webdatabase/SQLTransaction.idl:
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateParametersCheck):
(CanUseWTFOptionalForParameter): Deleted.
* bindings/scripts/test/TestObj.idl:
* dom/DataTransferItem.h:
* dom/DataTransferItem.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesgeolocationGeolocationidl">trunk/Source/WebCore/Modules/geolocation/Geolocation.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesnotificationsNotificationcpp">trunk/Source/WebCore/Modules/notifications/Notification.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesnotificationsNotificationh">trunk/Source/WebCore/Modules/notifications/Notification.h</a></li>
<li><a href="#trunkSourceWebCoreModulesnotificationsNotificationidl">trunk/Source/WebCore/Modules/notifications/Notification.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesnotificationsNotificationCenteridl">trunk/Source/WebCore/Modules/notifications/NotificationCenter.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesnotificationsNotificationClienth">trunk/Source/WebCore/Modules/notifications/NotificationClient.h</a></li>
<li><a href="#trunkSourceWebCoreModulesquotaStorageInfocpp">trunk/Source/WebCore/Modules/quota/StorageInfo.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesquotaStorageInfoh">trunk/Source/WebCore/Modules/quota/StorageInfo.h</a></li>
<li><a href="#trunkSourceWebCoreModulesquotaStorageInfoidl">trunk/Source/WebCore/Modules/quota/StorageInfo.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesquotaStorageQuotah">trunk/Source/WebCore/Modules/quota/StorageQuota.h</a></li>
<li><a href="#trunkSourceWebCoreModulesquotaStorageQuotaidl">trunk/Source/WebCore/Modules/quota/StorageQuota.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDOMWindowWebDatabasecpp">trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDOMWindowWebDatabaseh">trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDOMWindowWebDatabaseidl">trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabasecpp">trunk/Source/WebCore/Modules/webdatabase/Database.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseh">trunk/Source/WebCore/Modules/webdatabase/Database.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseidl">trunk/Source/WebCore/Modules/webdatabase/Database.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionidl">trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.idl</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestTestObjidl">trunk/Source/WebCore/bindings/scripts/test/TestObj.idl</a></li>
<li><a href="#trunkSourceWebCoredomDataTransferItemh">trunk/Source/WebCore/dom/DataTransferItem.h</a></li>
<li><a href="#trunkSourceWebCoredomDataTransferItemidl">trunk/Source/WebCore/dom/DataTransferItem.idl</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebNotificationClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebNotificationClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebNotificationClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebNotificationClient.mm</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebDesktopNotificationsDelegatecpp">trunk/Source/WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebDesktopNotificationsDelegateh">trunk/Source/WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNotificationsNotificationPermissionRequestManagercpp">trunk/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNotificationsNotificationPermissionRequestManagerh">trunk/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebNotificationClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebNotificationClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/ChangeLog 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2016-04-29 Chris Dumez <cdumez@apple.com>
+
+ [Web IDL] Specify default parameter values for callback parameters
+ https://bugs.webkit.org/show_bug.cgi?id=157188
+
+ Reviewed by Darin Adler.
+
+ Specify default parameter values for callback parameters.
+
+ * Modules/geolocation/Geolocation.idl:
+ * Modules/notifications/Notification.cpp:
+ (WebCore::Notification::requestPermission):
+ * Modules/notifications/Notification.h:
+ * Modules/notifications/Notification.idl:
+ * Modules/notifications/NotificationCenter.idl:
+ * Modules/quota/StorageInfo.cpp:
+ (WebCore::StorageInfo::queryUsageAndQuota):
+ (WebCore::StorageInfo::requestQuota):
+ * Modules/quota/StorageInfo.h:
+ * Modules/quota/StorageInfo.idl:
+ * Modules/quota/StorageQuota.h:
+ * Modules/quota/StorageQuota.idl:
+ * Modules/webaudio/AudioContext.idl:
+ * Modules/webdatabase/DOMWindowWebDatabase.cpp:
+ (WebCore::DOMWindowWebDatabase::openDatabase):
+ * Modules/webdatabase/DOMWindowWebDatabase.h:
+ (WebCore::DOMWindowWebDatabase::DOMWindowWebDatabase):
+ (WebCore::DOMWindowWebDatabase::~DOMWindowWebDatabase):
+ * Modules/webdatabase/DOMWindowWebDatabase.idl:
+ * Modules/webdatabase/Database.cpp:
+ (WebCore::Database::runTransaction):
+ (WebCore::Database::changeVersion):
+ (WebCore::Database::transaction):
+ (WebCore::Database::readTransaction):
+ * Modules/webdatabase/Database.h:
+ * Modules/webdatabase/Database.idl:
+ * Modules/webdatabase/SQLTransaction.idl:
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateParametersCheck):
+ (CanUseWTFOptionalForParameter): Deleted.
+ * bindings/scripts/test/TestObj.idl:
+ * dom/DataTransferItem.h:
+ * dom/DataTransferItem.idl:
+
</ins><span class="cx"> 2016-04-28 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> First step in using "enum class" instead of "String" for enumerations in DOM
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgeolocationGeolocationidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/geolocation/Geolocation.idl (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/geolocation/Geolocation.idl 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/geolocation/Geolocation.idl 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -30,11 +30,11 @@
</span><span class="cx"> GenerateIsReachable=ImplFrame,
</span><span class="cx"> ] interface Geolocation {
</span><span class="cx"> [Custom] void getCurrentPosition(PositionCallback successCallback,
</span><del>- optional PositionErrorCallback errorCallback,
</del><ins>+ optional PositionErrorCallback? errorCallback,
</ins><span class="cx"> optional PositionOptions options);
</span><span class="cx">
</span><span class="cx"> [Custom] long watchPosition(PositionCallback successCallback,
</span><del>- optional PositionErrorCallback errorCallback,
</del><ins>+ optional PositionErrorCallback? errorCallback,
</ins><span class="cx"> optional PositionOptions options);
</span><span class="cx">
</span><span class="cx"> void clearWatch(long watchID);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnotificationsNotificationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/notifications/Notification.cpp (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/notifications/Notification.cpp 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/notifications/Notification.cpp 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -241,9 +241,9 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Notification::requestPermission(Document& document, PassRefPtr<NotificationPermissionCallback> callback)
</del><ins>+void Notification::requestPermission(Document& document, RefPtr<NotificationPermissionCallback>&& callback)
</ins><span class="cx"> {
</span><del>- NotificationController::from(document.page())->client()->requestPermission(&document, callback);
</del><ins>+ NotificationController::from(document.page())->client()->requestPermission(&document, WTFMove(callback));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnotificationsNotificationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/notifications/Notification.h (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/notifications/Notification.h 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/notifications/Notification.h 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> #if ENABLE(NOTIFICATIONS)
</span><span class="cx"> static const String permission(Document&);
</span><span class="cx"> WEBCORE_EXPORT static const String permissionString(NotificationClient::Permission);
</span><del>- static void requestPermission(Document&, PassRefPtr<NotificationPermissionCallback> = nullptr);
</del><ins>+ static void requestPermission(Document&, RefPtr<NotificationPermissionCallback>&&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnotificationsNotificationidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/notifications/Notification.idl (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/notifications/Notification.idl 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/notifications/Notification.idl 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> [Conditional=NOTIFICATIONS] void close();
</span><span class="cx">
</span><span class="cx"> [Conditional=NOTIFICATIONS, CallWith=Document] static readonly attribute DOMString permission;
</span><del>- [Conditional=NOTIFICATIONS, CallWith=Document] static void requestPermission(optional NotificationPermissionCallback callback);
</del><ins>+ [Conditional=NOTIFICATIONS, CallWith=Document] static void requestPermission(optional NotificationPermissionCallback? callback);
</ins><span class="cx">
</span><span class="cx"> attribute EventHandler onclick;
</span><span class="cx"> attribute EventHandler onclose;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnotificationsNotificationCenteridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/notifications/NotificationCenter.idl (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/notifications/NotificationCenter.idl 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/notifications/NotificationCenter.idl 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -37,6 +37,6 @@
</span><span class="cx"> [RaisesException] Notification createNotification(DOMString iconUrl, DOMString title, DOMString body);
</span><span class="cx">
</span><span class="cx"> int checkPermission();
</span><del>- void requestPermission(optional VoidCallback callback);
</del><ins>+ void requestPermission(optional VoidCallback? callback);
</ins><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnotificationsNotificationClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/notifications/NotificationClient.h (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/notifications/NotificationClient.h 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/notifications/NotificationClient.h 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -75,10 +75,10 @@
</span><span class="cx"> // Requests user permission to show desktop notifications from a particular
</span><span class="cx"> // script context. The callback parameter should be run when the user has
</span><span class="cx"> // made a decision.
</span><del>- virtual void requestPermission(ScriptExecutionContext*, PassRefPtr<VoidCallback>) = 0;
</del><ins>+ virtual void requestPermission(ScriptExecutionContext*, RefPtr<VoidCallback>&&) = 0;
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(NOTIFICATIONS)
</span><del>- virtual void requestPermission(ScriptExecutionContext*, PassRefPtr<NotificationPermissionCallback>) = 0;
</del><ins>+ virtual void requestPermission(ScriptExecutionContext*, RefPtr<NotificationPermissionCallback>&&) = 0;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual bool hasPendingPermissionRequests(ScriptExecutionContext*) const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesquotaStorageInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/quota/StorageInfo.cpp (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/quota/StorageInfo.cpp 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/quota/StorageInfo.cpp 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -52,28 +52,28 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageInfo::queryUsageAndQuota(ScriptExecutionContext& scriptExecutionContext, int storageType, PassRefPtr<StorageUsageCallback> successCallback, PassRefPtr<StorageErrorCallback> errorCallback)
</del><ins>+void StorageInfo::queryUsageAndQuota(ScriptExecutionContext& scriptExecutionContext, int storageType, RefPtr<StorageUsageCallback>&& successCallback, RefPtr<StorageErrorCallback>&& errorCallback)
</ins><span class="cx"> {
</span><span class="cx"> // Dispatching the request to StorageQuota, as this interface is deprecated in favor of StorageQuota.
</span><span class="cx"> StorageQuota* storageQuota = getStorageQuota(storageType);
</span><span class="cx"> if (!storageQuota) {
</span><span class="cx"> // Unknown storage type is requested.
</span><del>- scriptExecutionContext->postTask(StorageErrorCallback::CallbackTask::create(errorCallback, NOT_SUPPORTED_ERR));
</del><ins>+ scriptExecutionContext->postTask(StorageErrorCallback::CallbackTask::create(WTFMove(errorCallback), NOT_SUPPORTED_ERR));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- storageQuota->queryUsageAndQuota(scriptExecutionContext, successCallback, errorCallback);
</del><ins>+ storageQuota->queryUsageAndQuota(scriptExecutionContext, WTFMove(successCallback), WTFMove(errorCallback));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageInfo::requestQuota(ScriptExecutionContext& scriptExecutionContext, int storageType, unsigned long long newQuotaInBytes, PassRefPtr<StorageQuotaCallback> successCallback, PassRefPtr<StorageErrorCallback> errorCallback)
</del><ins>+void StorageInfo::requestQuota(ScriptExecutionContext& scriptExecutionContext, int storageType, unsigned long long newQuotaInBytes, RefPtr<StorageQuotaCallback>&& successCallback, RefPtr<StorageErrorCallback>&& errorCallback)
</ins><span class="cx"> {
</span><span class="cx"> // Dispatching the request to StorageQuota, as this interface is deprecated in favor of StorageQuota.
</span><span class="cx"> StorageQuota* storageQuota = getStorageQuota(storageType);
</span><span class="cx"> if (!storageQuota) {
</span><span class="cx"> // Unknown storage type is requested.
</span><del>- scriptExecutionContext->postTask(StorageErrorCallback::CallbackTask::create(errorCallback, NOT_SUPPORTED_ERR));
</del><ins>+ scriptExecutionContext->postTask(StorageErrorCallback::CallbackTask::create(WTFMove(errorCallback), NOT_SUPPORTED_ERR));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- storageQuota->requestQuota(scriptExecutionContext, newQuotaInBytes, successCallback, errorCallback);
</del><ins>+ storageQuota->requestQuota(scriptExecutionContext, newQuotaInBytes, WTFMove(successCallback), WTFMove(errorCallback));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StorageQuota* StorageInfo::getStorageQuota(int storageType)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesquotaStorageInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/quota/StorageInfo.h (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/quota/StorageInfo.h 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/quota/StorageInfo.h 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -57,9 +57,9 @@
</span><span class="cx"> return adoptRef(*new StorageInfo());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void queryUsageAndQuota(ScriptExecutionContext&, int storageType, PassRefPtr<StorageUsageCallback>, PassRefPtr<StorageErrorCallback>);
</del><ins>+ void queryUsageAndQuota(ScriptExecutionContext&, int storageType, RefPtr<StorageUsageCallback>&&, RefPtr<StorageErrorCallback>&&);
</ins><span class="cx">
</span><del>- void requestQuota(ScriptExecutionContext&, int storageType, unsigned long long newQuotaInBytes, PassRefPtr<StorageQuotaCallback>, PassRefPtr<StorageErrorCallback>);
</del><ins>+ void requestQuota(ScriptExecutionContext&, int storageType, unsigned long long newQuotaInBytes, RefPtr<StorageQuotaCallback>&&, RefPtr<StorageErrorCallback>&&);
</ins><span class="cx">
</span><span class="cx"> ~StorageInfo();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesquotaStorageInfoidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/quota/StorageInfo.idl (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/quota/StorageInfo.idl 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/quota/StorageInfo.idl 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -31,6 +31,6 @@
</span><span class="cx"> const unsigned short TEMPORARY = 0;
</span><span class="cx"> const unsigned short PERSISTENT = 1;
</span><span class="cx">
</span><del>- [CallWith=ScriptExecutionContext] void queryUsageAndQuota(unsigned short storageType, optional StorageUsageCallback usageCallback, optional StorageErrorCallback errorCallback);
- [CallWith=ScriptExecutionContext] void requestQuota(unsigned short storageType, unsigned long long newQuotaInBytes, optional StorageQuotaCallback quotaCallback, optional StorageErrorCallback errorCallback);
</del><ins>+ [CallWith=ScriptExecutionContext] void queryUsageAndQuota(unsigned short storageType, optional StorageUsageCallback? usageCallback, optional StorageErrorCallback? errorCallback);
+ [CallWith=ScriptExecutionContext] void requestQuota(unsigned short storageType, unsigned long long newQuotaInBytes, optional StorageQuotaCallback? quotaCallback, optional StorageErrorCallback? errorCallback);
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesquotaStorageQuotah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/quota/StorageQuota.h (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/quota/StorageQuota.h 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/quota/StorageQuota.h 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -55,9 +55,9 @@
</span><span class="cx"> return adoptRef(*new StorageQuota(type));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void queryUsageAndQuota(ScriptExecutionContext&, PassRefPtr<StorageUsageCallback>, PassRefPtr<StorageErrorCallback>);
</del><ins>+ void queryUsageAndQuota(ScriptExecutionContext&, RefPtr<StorageUsageCallback>&&, RefPtr<StorageErrorCallback>&&);
</ins><span class="cx">
</span><del>- void requestQuota(ScriptExecutionContext&, unsigned long long newQuotaInBytes, PassRefPtr<StorageQuotaCallback>, PassRefPtr<StorageErrorCallback>);
</del><ins>+ void requestQuota(ScriptExecutionContext&, unsigned long long newQuotaInBytes, RefPtr<StorageQuotaCallback>&&, RefPtr<StorageErrorCallback>&&);
</ins><span class="cx">
</span><span class="cx"> ~StorageQuota();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesquotaStorageQuotaidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/quota/StorageQuota.idl (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/quota/StorageQuota.idl 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/quota/StorageQuota.idl 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -28,6 +28,6 @@
</span><span class="cx"> Conditional=QUOTA,
</span><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> ] interface StorageQuota {
</span><del>- [CallWith=ScriptExecutionContext] void queryUsageAndQuota(StorageUsageCallback usageCallback, optional StorageErrorCallback errorCallback);
- [CallWith=ScriptExecutionContext] void requestQuota(unsigned long long newQuotaInBytes, optional StorageQuotaCallback quotaCallback, optional StorageErrorCallback errorCallback);
</del><ins>+ [CallWith=ScriptExecutionContext] void queryUsageAndQuota(StorageUsageCallback usageCallback, optional StorageErrorCallback? errorCallback);
+ [CallWith=ScriptExecutionContext] void requestQuota(unsigned long long newQuotaInBytes, optional StorageQuotaCallback? quotaCallback, optional StorageErrorCallback? errorCallback);
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDOMWindowWebDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.cpp (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.cpp 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.cpp 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -37,16 +37,16 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RefPtr<Database> DOMWindowWebDatabase::openDatabase(DOMWindow& window, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
</del><ins>+RefPtr<Database> DOMWindowWebDatabase::openDatabase(DOMWindow& window, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, RefPtr<DatabaseCallback>&& creationCallback, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> if (!window.isCurrentlyDisplayedInFrame())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- RefPtr<Database> database = nullptr;
</del><ins>+ RefPtr<Database> database;
</ins><span class="cx"> DatabaseManager& dbManager = DatabaseManager::singleton();
</span><span class="cx"> DatabaseError error = DatabaseError::None;
</span><span class="cx"> if (dbManager.isAvailable() && window.document()->securityOrigin()->canAccessDatabase(window.document()->topOrigin())) {
</span><del>- database = dbManager.openDatabase(window.document(), name, version, displayName, estimatedSize, creationCallback, error);
</del><ins>+ database = dbManager.openDatabase(window.document(), name, version, displayName, estimatedSize, WTFMove(creationCallback), error);
</ins><span class="cx"> ASSERT(database || error != DatabaseError::None);
</span><span class="cx"> ec = DatabaseManager::exceptionCodeForDatabaseError(error);
</span><span class="cx"> } else
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDOMWindowWebDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.h (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.h 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.h 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -42,11 +42,10 @@
</span><span class="cx">
</span><span class="cx"> class DOMWindowWebDatabase {
</span><span class="cx"> public:
</span><del>- static RefPtr<Database> openDatabase(DOMWindow&, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&);
</del><ins>+ static RefPtr<Database> openDatabase(DOMWindow&, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, RefPtr<DatabaseCallback>&& creationCallback, ExceptionCode&);
</ins><span class="cx">
</span><del>-private:
- DOMWindowWebDatabase() { };
- ~DOMWindowWebDatabase() { };
</del><ins>+ DOMWindowWebDatabase() = delete;
+ ~DOMWindowWebDatabase() = delete;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDOMWindowWebDatabaseidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.idl (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.idl 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.idl 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -26,6 +26,6 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> ] partial interface DOMWindow {
</span><del>- [RaisesException] Database openDatabase(DOMString name, DOMString version, DOMString displayName, unsigned long estimatedSize, optional DatabaseCallback creationCallback);
</del><ins>+ [RaisesException] Database openDatabase(DOMString name, DOMString version, DOMString displayName, unsigned long estimatedSize, optional DatabaseCallback? creationCallback);
</ins><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.cpp (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -554,17 +554,17 @@
</span><span class="cx"> m_transactionInProgress = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SQLTransactionBackend> Database::runTransaction(PassRefPtr<SQLTransaction> transaction, bool readOnly, const ChangeVersionData* data)
</del><ins>+RefPtr<SQLTransactionBackend> Database::runTransaction(Ref<SQLTransaction>&& transaction, bool readOnly, const ChangeVersionData* data)
</ins><span class="cx"> {
</span><span class="cx"> LockHolder locker(m_transactionInProgressMutex);
</span><span class="cx"> if (!m_isTransactionQueueEnabled)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> RefPtr<SQLTransactionWrapper> wrapper;
</span><span class="cx"> if (data)
</span><span class="cx"> wrapper = ChangeVersionWrapper::create(data->oldVersion(), data->newVersion());
</span><span class="cx">
</span><del>- RefPtr<SQLTransactionBackend> transactionBackend = SQLTransactionBackend::create(this, transaction, wrapper, readOnly);
</del><ins>+ RefPtr<SQLTransactionBackend> transactionBackend = SQLTransactionBackend::create(this, WTFMove(transaction), wrapper, readOnly);
</ins><span class="cx"> m_transactionQueue.append(transactionBackend);
</span><span class="cx"> if (!m_transactionInProgress)
</span><span class="cx"> scheduleTransaction();
</span><span class="lines">@@ -635,22 +635,20 @@
</span><span class="cx"> synchronizer.waitForTaskCompletion();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Database::changeVersion(const String& oldVersion, const String& newVersion,
- PassRefPtr<SQLTransactionCallback> callback, PassRefPtr<SQLTransactionErrorCallback> errorCallback,
- PassRefPtr<VoidCallback> successCallback)
</del><ins>+void Database::changeVersion(const String& oldVersion, const String& newVersion, RefPtr<SQLTransactionCallback>&& callback, RefPtr<SQLTransactionErrorCallback>&& errorCallback, RefPtr<VoidCallback>&& successCallback)
</ins><span class="cx"> {
</span><span class="cx"> ChangeVersionData data(oldVersion, newVersion);
</span><del>- runTransaction(callback, errorCallback, successCallback, false, &data);
</del><ins>+ runTransaction(WTFMove(callback), WTFMove(errorCallback), WTFMove(successCallback), false, &data);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Database::transaction(PassRefPtr<SQLTransactionCallback> callback, PassRefPtr<SQLTransactionErrorCallback> errorCallback, PassRefPtr<VoidCallback> successCallback)
</del><ins>+void Database::transaction(RefPtr<SQLTransactionCallback>&& callback, RefPtr<SQLTransactionErrorCallback>&& errorCallback, RefPtr<VoidCallback>&& successCallback)
</ins><span class="cx"> {
</span><del>- runTransaction(callback, errorCallback, successCallback, false);
</del><ins>+ runTransaction(WTFMove(callback), WTFMove(errorCallback), WTFMove(successCallback), false);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Database::readTransaction(PassRefPtr<SQLTransactionCallback> callback, PassRefPtr<SQLTransactionErrorCallback> errorCallback, PassRefPtr<VoidCallback> successCallback)
</del><ins>+void Database::readTransaction(RefPtr<SQLTransactionCallback>&& callback, RefPtr<SQLTransactionErrorCallback>&& errorCallback, RefPtr<VoidCallback>&& successCallback)
</ins><span class="cx"> {
</span><del>- runTransaction(callback, errorCallback, successCallback, true);
</del><ins>+ runTransaction(WTFMove(callback), WTFMove(errorCallback), WTFMove(successCallback), true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String Database::stringIdentifier() const
</span><span class="lines">@@ -732,11 +730,11 @@
</span><span class="cx">
</span><span class="cx"> void Database::runTransaction(RefPtr<SQLTransactionCallback>&& callback, RefPtr<SQLTransactionErrorCallback>&& errorCallback, RefPtr<VoidCallback>&& successCallback, bool readOnly, const ChangeVersionData* changeVersionData)
</span><span class="cx"> {
</span><del>- RefPtr<SQLTransaction> transaction = SQLTransaction::create(*this, WTFMove(callback), WTFMove(successCallback), errorCallback.copyRef(), readOnly);
</del><ins>+ Ref<SQLTransaction> transaction = SQLTransaction::create(*this, WTFMove(callback), WTFMove(successCallback), errorCallback.copyRef(), readOnly);
</ins><span class="cx">
</span><del>- RefPtr<SQLTransactionBackend> transactionBackend = runTransaction(transaction.release(), readOnly, changeVersionData);
</del><ins>+ RefPtr<SQLTransactionBackend> transactionBackend = runTransaction(WTFMove(transaction), readOnly, changeVersionData);
</ins><span class="cx"> if (!transactionBackend && errorCallback) {
</span><del>- WTF::RefPtr<SQLTransactionErrorCallback> errorCallbackProtector = WTFMove(errorCallback);
</del><ins>+ RefPtr<SQLTransactionErrorCallback> errorCallbackProtector = WTFMove(errorCallback);
</ins><span class="cx"> m_scriptExecutionContext->postTask([errorCallbackProtector](ScriptExecutionContext&) {
</span><span class="cx"> errorCallbackProtector->handleEvent(SQLError::create(SQLError::UNKNOWN_ERR, "database has been closed").ptr());
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.h (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.h 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.h 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned long long maximumSize() const;
</span><span class="cx">
</span><del>- PassRefPtr<SQLTransactionBackend> runTransaction(PassRefPtr<SQLTransaction>, bool readOnly, const ChangeVersionData*);
</del><ins>+ RefPtr<SQLTransactionBackend> runTransaction(Ref<SQLTransaction>&&, bool readOnly, const ChangeVersionData*);
</ins><span class="cx"> void scheduleTransactionStep(SQLTransactionBackend*);
</span><span class="cx"> void inProgressTransactionCompleted();
</span><span class="cx">
</span><span class="lines">@@ -78,10 +78,9 @@
</span><span class="cx">
</span><span class="cx"> // Direct support for the DOM API
</span><span class="cx"> String version() const;
</span><del>- void changeVersion(const String& oldVersion, const String& newVersion, PassRefPtr<SQLTransactionCallback>,
- PassRefPtr<SQLTransactionErrorCallback>, PassRefPtr<VoidCallback> successCallback);
- void transaction(PassRefPtr<SQLTransactionCallback>, PassRefPtr<SQLTransactionErrorCallback>, PassRefPtr<VoidCallback> successCallback);
- void readTransaction(PassRefPtr<SQLTransactionCallback>, PassRefPtr<SQLTransactionErrorCallback>, PassRefPtr<VoidCallback> successCallback);
</del><ins>+ void changeVersion(const String& oldVersion, const String& newVersion, RefPtr<SQLTransactionCallback>&&, RefPtr<SQLTransactionErrorCallback>&&, RefPtr<VoidCallback>&& successCallback);
+ void transaction(RefPtr<SQLTransactionCallback>&&, RefPtr<SQLTransactionErrorCallback>&&, RefPtr<VoidCallback>&& successCallback);
+ void readTransaction(RefPtr<SQLTransactionCallback>&&, RefPtr<SQLTransactionErrorCallback>&&, RefPtr<VoidCallback>&& successCallback);
</ins><span class="cx">
</span><span class="cx"> // Internal engine support
</span><span class="cx"> String stringIdentifier() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.idl (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.idl 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.idl 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx">
</span><span class="cx"> interface Database {
</span><span class="cx"> readonly attribute DOMString version;
</span><del>- void changeVersion(DOMString oldVersion, DOMString newVersion, optional SQLTransactionCallback callback, optional SQLTransactionErrorCallback errorCallback, optional VoidCallback successCallback);
- void transaction(SQLTransactionCallback callback, optional SQLTransactionErrorCallback errorCallback, optional VoidCallback successCallback);
- void readTransaction(SQLTransactionCallback callback, optional SQLTransactionErrorCallback errorCallback, optional VoidCallback successCallback);
</del><ins>+ void changeVersion(DOMString oldVersion, DOMString newVersion, optional SQLTransactionCallback? callback, optional SQLTransactionErrorCallback? errorCallback, optional VoidCallback? successCallback);
+ void transaction(SQLTransactionCallback callback, optional SQLTransactionErrorCallback? errorCallback, optional VoidCallback? successCallback);
+ void readTransaction(SQLTransactionCallback callback, optional SQLTransactionErrorCallback? errorCallback, optional VoidCallback? successCallback);
</ins><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.idl (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.idl 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.idl 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -31,6 +31,6 @@
</span><span class="cx"> ] interface SQLTransaction {
</span><span class="cx"> [Custom] void executeSql(DOMString sqlStatement,
</span><span class="cx"> ObjectArray arguments,
</span><del>- optional SQLStatementCallback callback,
- optional SQLStatementErrorCallback errorCallback);
</del><ins>+ optional SQLStatementCallback? callback,
+ optional SQLStatementErrorCallback? errorCallback);
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -3444,7 +3444,6 @@
</span><span class="cx"> # FIXME: We should progressively stop blacklisting each type below
</span><span class="cx"> # and eventually get rid of this function entirely.
</span><span class="cx"> return 0 if $parameter->isVariadic;
</span><del>- return 0 if $codeGenerator->IsCallbackInterface($type);
</del><span class="cx"> return 0 if $codeGenerator->IsEnumType($type);
</span><span class="cx">
</span><span class="cx"> return 1;
</span><span class="lines">@@ -3536,7 +3535,7 @@
</span><span class="cx"> my $argType = $parameter->type;
</span><span class="cx"> my $optional = $parameter->isOptional;
</span><span class="cx">
</span><del>- die "Optional parameters of non-nullable wrapper types are not supported" if $optional && !$parameter->isNullable && $codeGenerator->IsWrapperType($argType) && !$codeGenerator->IsCallbackInterface($argType);
</del><ins>+ die "Optional parameters of non-nullable wrapper types are not supported" if $optional && !$parameter->isNullable && $codeGenerator->IsWrapperType($argType);
</ins><span class="cx">
</span><span class="cx"> if ($optional && !defined($parameter->default)) {
</span><span class="cx"> # As per Web IDL, optional dictionary parameters are always considered to have a default value of an empty dictionary, unless otherwise specified.
</span><span class="lines">@@ -3551,10 +3550,13 @@
</span><span class="cx"> # As per Web IDL, passing undefined for a nullable parameter is treated as null. Therefore, use null as
</span><span class="cx"> # default value for nullable parameters unless otherwise specified.
</span><span class="cx"> $parameter->default("null") if $parameter->isNullable;
</span><ins>+
+ # For callback parameters, the generated bindings treat undefined as null, so use null as implicit default value.
+ $parameter->default("null") if $codeGenerator->IsCallbackInterface($argType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # FIXME: We should eventually stop generating any early calls, and instead use either default parameter values or WTF::Optional<>.
</span><del>- if ($optional && !defined($parameter->default) && !CanUseWTFOptionalForParameter($parameter) && !$codeGenerator->IsCallbackInterface($argType)) {
</del><ins>+ if ($optional && !defined($parameter->default) && !CanUseWTFOptionalForParameter($parameter)) {
</ins><span class="cx"> # Generate early call if there are enough parameters.
</span><span class="cx"> if (!$hasOptionalArguments) {
</span><span class="cx"> push(@$outputArray, "\n size_t argsCount = state->argumentCount();\n");
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestObjidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -208,15 +208,15 @@
</span><span class="cx"> // Callback interface parameters.
</span><span class="cx"> void methodWithCallbackArg(TestCallback callback);
</span><span class="cx"> void methodWithNonCallbackArgAndCallbackArg(long nonCallback, TestCallback callback);
</span><del>- void methodWithCallbackAndOptionalArg(optional TestCallback callback);
</del><ins>+ void methodWithCallbackAndOptionalArg(optional TestCallback? callback);
</ins><span class="cx">
</span><span class="cx"> // Callback function parameters.
</span><span class="cx"> void methodWithCallbackFunctionArg(TestCallbackFunction callback);
</span><span class="cx"> void methodWithNonCallbackArgAndCallbackFunctionArg(long nonCallback, TestCallbackFunction callback);
</span><del>- void methodWithCallbackFunctionAndOptionalArg(optional TestCallbackFunction callback);
</del><ins>+ void methodWithCallbackFunctionAndOptionalArg(optional TestCallbackFunction? callback);
</ins><span class="cx">
</span><span class="cx"> // static methods with 'Callback' extended attribute
</span><del>- static void staticMethodWithCallbackAndOptionalArg(optional TestCallback callback);
</del><ins>+ static void staticMethodWithCallbackAndOptionalArg(optional TestCallback? callback);
</ins><span class="cx"> static void staticMethodWithCallbackArg(TestCallback callback);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDataTransferItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DataTransferItem.h (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransferItem.h 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/dom/DataTransferItem.h 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> virtual String kind() const = 0;
</span><span class="cx"> virtual String type() const = 0;
</span><span class="cx">
</span><del>- virtual void getAsString(PassRefPtr<StringCallback>) const = 0;
</del><ins>+ virtual void getAsString(RefPtr<StringCallback>&&) const = 0;
</ins><span class="cx"> virtual PassRefPtr<Blob> getAsFile() const = 0;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDataTransferItemidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DataTransferItem.idl (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransferItem.idl 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebCore/dom/DataTransferItem.idl 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> readonly attribute DOMString kind;
</span><span class="cx"> readonly attribute DOMString type;
</span><span class="cx">
</span><del>- void getAsString(optional StringCallback callback);
</del><ins>+ void getAsString(optional StringCallback? callback);
</ins><span class="cx"> Blob getAsFile();
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebNotificationClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebNotificationClient.h (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebNotificationClient.h 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebNotificationClient.h 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -60,10 +60,10 @@
</span><span class="cx"> void notificationObjectDestroyed(WebCore::Notification*) override;
</span><span class="cx"> void notificationControllerDestroyed() override;
</span><span class="cx"> #if ENABLE(LEGACY_NOTIFICATIONS)
</span><del>- void requestPermission(WebCore::ScriptExecutionContext*, PassRefPtr<WebCore::VoidCallback>) override;
</del><ins>+ void requestPermission(WebCore::ScriptExecutionContext*, RefPtr<WebCore::VoidCallback>&&) override;
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(NOTIFICATIONS)
</span><del>- void requestPermission(WebCore::ScriptExecutionContext*, PassRefPtr<WebCore::NotificationPermissionCallback>) override;
</del><ins>+ void requestPermission(WebCore::ScriptExecutionContext*, RefPtr<WebCore::NotificationPermissionCallback>&&) override;
</ins><span class="cx"> #endif
</span><span class="cx"> void cancelRequestsForPermission(WebCore::ScriptExecutionContext*) override { }
</span><span class="cx"> bool hasPendingPermissionRequests(WebCore::ScriptExecutionContext*) const override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebNotificationClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebNotificationClient.mm (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebNotificationClient.mm 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebNotificationClient.mm 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(LEGACY_NOTIFICATIONS)
</span><del>-void WebNotificationClient::requestPermission(ScriptExecutionContext* context, PassRefPtr<VoidCallback> callback)
</del><ins>+void WebNotificationClient::requestPermission(ScriptExecutionContext* context, RefPtr<VoidCallback>&& callback)
</ins><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> WebNotificationPolicyListener *listener = [[WebNotificationPolicyListener alloc] initWithVoidCallback:callback];
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NOTIFICATIONS)
</span><del>-void WebNotificationClient::requestPermission(ScriptExecutionContext* context, PassRefPtr<NotificationPermissionCallback> callback)
</del><ins>+void WebNotificationClient::requestPermission(ScriptExecutionContext* context, RefPtr<NotificationPermissionCallback>&& callback)
</ins><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> WebNotificationPolicyListener *listener = [[WebNotificationPolicyListener alloc] initWithCallback:callback];
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebDesktopNotificationsDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.cpp (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.cpp 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.cpp 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -170,14 +170,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebDesktopNotificationsDelegate::requestPermission(SecurityOrigin* origin, PassRefPtr<VoidCallback>)
</del><ins>+void WebDesktopNotificationsDelegate::requestPermission(SecurityOrigin* origin, RefPtr<VoidCallback>&&)
</ins><span class="cx"> {
</span><span class="cx"> BString org(origin->toString());
</span><span class="cx"> if (hasNotificationDelegate())
</span><span class="cx"> notificationDelegate()->requestNotificationPermission(org);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebDesktopNotificationsDelegate::requestPermission(SecurityOrigin*, PassRefPtr<NotificationPermissionCallback>)
</del><ins>+void WebDesktopNotificationsDelegate::requestPermission(SecurityOrigin*, RefPtr<NotificationPermissionCallback>&&)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebDesktopNotificationsDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.h (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.h 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.h 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -51,10 +51,10 @@
</span><span class="cx"> virtual void notificationObjectDestroyed(WebCore::Notification* object);
</span><span class="cx"> virtual void notificationControllerDestroyed();
</span><span class="cx"> #if ENABLE(LEGACY_NOTIFICATIONS)
</span><del>- virtual void requestPermission(WebCore::SecurityOrigin*, PassRefPtr<WebCore::VoidCallback>);
</del><ins>+ virtual void requestPermission(WebCore::SecurityOrigin*, RefPtr<WebCore::VoidCallback>&&);
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(NOTIFICATIONS)
</span><del>- virtual void requestPermission(WebCore::SecurityOrigin*, PassRefPtr<WebCore::NotificationPermissionCallback>);
</del><ins>+ virtual void requestPermission(WebCore::SecurityOrigin*, RefPtr<WebCore::NotificationPermissionCallback>&&);
</ins><span class="cx"> #endif
</span><span class="cx"> bool hasPendingPermissionRequests(WebCore::ScriptExecutionContext*) const override;
</span><span class="cx"> virtual void cancelRequestsForPermission(WebCore::ScriptExecutionContext*);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNotificationsNotificationPermissionRequestManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NOTIFICATIONS)
</span><del>-void NotificationPermissionRequestManager::startRequest(SecurityOrigin* origin, PassRefPtr<NotificationPermissionCallback> callback)
</del><ins>+void NotificationPermissionRequestManager::startRequest(SecurityOrigin* origin, RefPtr<NotificationPermissionCallback>&& callback)
</ins><span class="cx"> {
</span><span class="cx"> NotificationClient::Permission permission = permissionLevel(origin);
</span><span class="cx"> if (permission != NotificationClient::PermissionNotAllowed) {
</span><span class="lines">@@ -81,13 +81,13 @@
</span><span class="cx"> uint64_t requestID = generateRequestID();
</span><span class="cx"> m_originToIDMap.set(origin, requestID);
</span><span class="cx"> m_idToOriginMap.set(requestID, origin);
</span><del>- m_idToCallbackMap.set(requestID, callback);
</del><ins>+ m_idToCallbackMap.set(requestID, WTFMove(callback));
</ins><span class="cx"> m_page->send(Messages::WebPageProxy::RequestNotificationPermission(requestID, origin->toString()));
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(LEGACY_NOTIFICATIONS)
</span><del>-void NotificationPermissionRequestManager::startRequest(SecurityOrigin* origin, PassRefPtr<WebCore::VoidCallback> callback)
</del><ins>+void NotificationPermissionRequestManager::startRequest(SecurityOrigin* origin, RefPtr<WebCore::VoidCallback>&& callback)
</ins><span class="cx"> {
</span><span class="cx"> NotificationClient::Permission permission = permissionLevel(origin);
</span><span class="cx"> if (permission != NotificationClient::PermissionNotAllowed) {
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> uint64_t requestID = generateRequestID();
</span><span class="cx"> m_originToIDMap.set(origin, requestID);
</span><span class="cx"> m_idToOriginMap.set(requestID, origin);
</span><del>- m_idToVoidCallbackMap.set(requestID, callback);
</del><ins>+ m_idToVoidCallbackMap.set(requestID, WTFMove(callback));
</ins><span class="cx"> m_page->send(Messages::WebPageProxy::RequestNotificationPermission(requestID, origin->toString()));
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNotificationsNotificationPermissionRequestManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.h (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.h 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.h 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -50,10 +50,10 @@
</span><span class="cx"> static Ref<NotificationPermissionRequestManager> create(WebPage*);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NOTIFICATIONS)
</span><del>- void startRequest(WebCore::SecurityOrigin*, PassRefPtr<WebCore::NotificationPermissionCallback>);
</del><ins>+ void startRequest(WebCore::SecurityOrigin*, RefPtr<WebCore::NotificationPermissionCallback>&&);
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(LEGACY_NOTIFICATIONS)
</span><del>- void startRequest(WebCore::SecurityOrigin*, PassRefPtr<WebCore::VoidCallback>);
</del><ins>+ void startRequest(WebCore::SecurityOrigin*, RefPtr<WebCore::VoidCallback>&&);
</ins><span class="cx"> #endif
</span><span class="cx"> void cancelRequest(WebCore::SecurityOrigin*);
</span><span class="cx"> bool hasPendingPermissionRequests(WebCore::SecurityOrigin*) const;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebNotificationClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -73,16 +73,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(LEGACY_NOTIFICATIONS)
</span><del>-void WebNotificationClient::requestPermission(ScriptExecutionContext* context, PassRefPtr<WebCore::VoidCallback> callback)
</del><ins>+void WebNotificationClient::requestPermission(ScriptExecutionContext* context, RefPtr<WebCore::VoidCallback>&& callback)
</ins><span class="cx"> {
</span><del>- m_page->notificationPermissionRequestManager()->startRequest(context->securityOrigin(), callback);
</del><ins>+ m_page->notificationPermissionRequestManager()->startRequest(context->securityOrigin(), WTFMove(callback));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NOTIFICATIONS)
</span><del>-void WebNotificationClient::requestPermission(ScriptExecutionContext* context, PassRefPtr<NotificationPermissionCallback> callback)
</del><ins>+void WebNotificationClient::requestPermission(ScriptExecutionContext* context, RefPtr<NotificationPermissionCallback>&& callback)
</ins><span class="cx"> {
</span><del>- m_page->notificationPermissionRequestManager()->startRequest(context->securityOrigin(), callback);
</del><ins>+ m_page->notificationPermissionRequestManager()->startRequest(context->securityOrigin(), WTFMove(callback));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebNotificationClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.h (200288 => 200289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.h 2016-04-30 05:09:10 UTC (rev 200288)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.h 2016-04-30 05:40:57 UTC (rev 200289)
</span><span class="lines">@@ -52,10 +52,10 @@
</span><span class="cx"> void notificationObjectDestroyed(WebCore::Notification*) override;
</span><span class="cx"> void notificationControllerDestroyed() override;
</span><span class="cx"> #if ENABLE(LEGACY_NOTIFICATIONS)
</span><del>- void requestPermission(WebCore::ScriptExecutionContext*, PassRefPtr<WebCore::VoidCallback>) override;
</del><ins>+ void requestPermission(WebCore::ScriptExecutionContext*, RefPtr<WebCore::VoidCallback>&&) override;
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(NOTIFICATIONS)
</span><del>- void requestPermission(WebCore::ScriptExecutionContext*, PassRefPtr<WebCore::NotificationPermissionCallback>) override;
</del><ins>+ void requestPermission(WebCore::ScriptExecutionContext*, RefPtr<WebCore::NotificationPermissionCallback>&&) override;
</ins><span class="cx"> #endif
</span><span class="cx"> void cancelRequestsForPermission(WebCore::ScriptExecutionContext*) override;
</span><span class="cx"> bool hasPendingPermissionRequests(WebCore::ScriptExecutionContext*) const override;
</span></span></pre>
</div>
</div>
</body>
</html>