Index: third_party/WebKit/Source/devtools/front_end/resources/DatabaseModel.js |
diff --git a/third_party/WebKit/Source/devtools/front_end/resources/DatabaseModel.js b/third_party/WebKit/Source/devtools/front_end/resources/DatabaseModel.js |
index 73ac7c55235dce7e34dbe519fb8ce41854f09176..08a9d6f2bf2870b79f83600b2084ad68959f7253 100644 |
--- a/third_party/WebKit/Source/devtools/front_end/resources/DatabaseModel.js |
+++ b/third_party/WebKit/Source/devtools/front_end/resources/DatabaseModel.js |
@@ -25,210 +25,194 @@ |
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
- |
/** |
- * @constructor |
- * @param {!WebInspector.DatabaseModel} model |
- * @param {string} id |
- * @param {string} domain |
- * @param {string} name |
- * @param {string} version |
+ * @unrestricted |
*/ |
-WebInspector.Database = function(model, id, domain, name, version) |
-{ |
+WebInspector.Database = class { |
+ /** |
+ * @param {!WebInspector.DatabaseModel} model |
+ * @param {string} id |
+ * @param {string} domain |
+ * @param {string} name |
+ * @param {string} version |
+ */ |
+ constructor(model, id, domain, name, version) { |
this._model = model; |
this._id = id; |
this._domain = domain; |
this._name = name; |
this._version = version; |
-}; |
- |
-WebInspector.Database.prototype = { |
- /** @return {string} */ |
- get id() |
- { |
- return this._id; |
- }, |
- |
- /** @return {string} */ |
- get name() |
- { |
- return this._name; |
- }, |
- |
- set name(x) |
- { |
- this._name = x; |
- }, |
- |
- /** @return {string} */ |
- get version() |
- { |
- return this._version; |
- }, |
- |
- set version(x) |
- { |
- this._version = x; |
- }, |
- |
- /** @return {string} */ |
- get domain() |
- { |
- return this._domain; |
- }, |
- |
- set domain(x) |
- { |
- this._domain = x; |
- }, |
- |
- /** |
- * @param {function(!Array.<string>)} callback |
- */ |
- getTableNames: function(callback) |
- { |
- function sortingCallback(error, names) |
- { |
- if (!error) |
- callback(names.sort()); |
- } |
- this._model._agent.getDatabaseTableNames(this._id, sortingCallback); |
- }, |
- |
+ } |
+ |
+ /** @return {string} */ |
+ get id() { |
+ return this._id; |
+ } |
+ |
+ /** @return {string} */ |
+ get name() { |
+ return this._name; |
+ } |
+ |
+ /** @param {string} x */ |
+ set name(x) { |
+ this._name = x; |
+ } |
+ |
+ /** @return {string} */ |
+ get version() { |
+ return this._version; |
+ } |
+ |
+ /** @param {string} x */ |
+ set version(x) { |
+ this._version = x; |
+ } |
+ |
+ /** @return {string} */ |
+ get domain() { |
+ return this._domain; |
+ } |
+ |
+ /** @param {string} x */ |
+ set domain(x) { |
+ this._domain = x; |
+ } |
+ |
+ /** |
+ * @param {function(!Array.<string>)} callback |
+ */ |
+ getTableNames(callback) { |
+ function sortingCallback(error, names) { |
+ if (!error) |
+ callback(names.sort()); |
+ } |
+ this._model._agent.getDatabaseTableNames(this._id, sortingCallback); |
+ } |
+ |
+ /** |
+ * @param {string} query |
+ * @param {function(!Array.<string>=, !Array.<*>=)} onSuccess |
+ * @param {function(string)} onError |
+ */ |
+ executeSql(query, onSuccess, onError) { |
/** |
- * @param {string} query |
- * @param {function(!Array.<string>=, !Array.<*>=)} onSuccess |
- * @param {function(string)} onError |
+ * @param {?Protocol.Error} error |
+ * @param {!Array.<string>=} columnNames |
+ * @param {!Array.<*>=} values |
+ * @param {!DatabaseAgent.Error=} errorObj |
*/ |
- executeSql: function(query, onSuccess, onError) |
- { |
- /** |
- * @param {?Protocol.Error} error |
- * @param {!Array.<string>=} columnNames |
- * @param {!Array.<*>=} values |
- * @param {!DatabaseAgent.Error=} errorObj |
- */ |
- function callback(error, columnNames, values, errorObj) |
- { |
- if (error) { |
- onError(error); |
- return; |
- } |
- if (errorObj) { |
- var message; |
- if (errorObj.message) |
- message = errorObj.message; |
- else if (errorObj.code === 2) |
- message = WebInspector.UIString("Database no longer has expected version."); |
- else |
- message = WebInspector.UIString("An unexpected error %s occurred.", errorObj.code); |
- onError(message); |
- return; |
- } |
- onSuccess(columnNames, values); |
- } |
- this._model._agent.executeSQL(this._id, query, callback); |
+ function callback(error, columnNames, values, errorObj) { |
+ if (error) { |
+ onError(error); |
+ return; |
+ } |
+ if (errorObj) { |
+ var message; |
+ if (errorObj.message) |
+ message = errorObj.message; |
+ else if (errorObj.code === 2) |
+ message = WebInspector.UIString('Database no longer has expected version.'); |
+ else |
+ message = WebInspector.UIString('An unexpected error %s occurred.', errorObj.code); |
+ onError(message); |
+ return; |
+ } |
+ onSuccess(columnNames, values); |
} |
+ this._model._agent.executeSQL(this._id, query, callback); |
+ } |
}; |
/** |
- * @constructor |
- * @extends {WebInspector.SDKModel} |
- * @param {!WebInspector.Target} target |
+ * @unrestricted |
*/ |
-WebInspector.DatabaseModel = function(target) |
-{ |
- WebInspector.SDKModel.call(this, WebInspector.DatabaseModel, target); |
+WebInspector.DatabaseModel = class extends WebInspector.SDKModel { |
+ /** |
+ * @param {!WebInspector.Target} target |
+ */ |
+ constructor(target) { |
+ super(WebInspector.DatabaseModel, target); |
this._databases = []; |
this._agent = target.databaseAgent(); |
this.target().registerDatabaseDispatcher(new WebInspector.DatabaseDispatcher(this)); |
+ } |
+ |
+ /** |
+ * @param {!WebInspector.Target} target |
+ * @return {!WebInspector.DatabaseModel} |
+ */ |
+ static fromTarget(target) { |
+ if (!target[WebInspector.DatabaseModel._symbol]) |
+ target[WebInspector.DatabaseModel._symbol] = new WebInspector.DatabaseModel(target); |
+ |
+ return target[WebInspector.DatabaseModel._symbol]; |
+ } |
+ |
+ enable() { |
+ if (this._enabled) |
+ return; |
+ this._agent.enable(); |
+ this._enabled = true; |
+ } |
+ |
+ disable() { |
+ if (!this._enabled) |
+ return; |
+ this._enabled = false; |
+ this._databases = []; |
+ this._agent.disable(); |
+ this.dispatchEventToListeners(WebInspector.DatabaseModel.Events.DatabasesRemoved); |
+ } |
+ |
+ /** |
+ * @return {!Array.<!WebInspector.Database>} |
+ */ |
+ databases() { |
+ var result = []; |
+ for (var database of this._databases) |
+ result.push(database); |
+ return result; |
+ } |
+ |
+ /** |
+ * @param {!WebInspector.Database} database |
+ */ |
+ _addDatabase(database) { |
+ this._databases.push(database); |
+ this.dispatchEventToListeners(WebInspector.DatabaseModel.Events.DatabaseAdded, database); |
+ } |
}; |
/** @enum {symbol} */ |
WebInspector.DatabaseModel.Events = { |
- DatabaseAdded: Symbol("DatabaseAdded"), |
- DatabasesRemoved: Symbol("DatabasesRemoved") |
-}; |
- |
-WebInspector.DatabaseModel.prototype = { |
- enable: function() |
- { |
- if (this._enabled) |
- return; |
- this._agent.enable(); |
- this._enabled = true; |
- }, |
- |
- disable: function() |
- { |
- if (!this._enabled) |
- return; |
- this._enabled = false; |
- this._databases = []; |
- this._agent.disable(); |
- this.dispatchEventToListeners(WebInspector.DatabaseModel.Events.DatabasesRemoved); |
- }, |
- |
- /** |
- * @return {!Array.<!WebInspector.Database>} |
- */ |
- databases: function() |
- { |
- var result = []; |
- for (var database of this._databases) |
- result.push(database); |
- return result; |
- }, |
- |
- /** |
- * @param {!WebInspector.Database} database |
- */ |
- _addDatabase: function(database) |
- { |
- this._databases.push(database); |
- this.dispatchEventToListeners(WebInspector.DatabaseModel.Events.DatabaseAdded, database); |
- }, |
- |
- __proto__: WebInspector.SDKModel.prototype |
+ DatabaseAdded: Symbol('DatabaseAdded'), |
+ DatabasesRemoved: Symbol('DatabasesRemoved') |
}; |
/** |
- * @constructor |
* @implements {DatabaseAgent.Dispatcher} |
- * @param {!WebInspector.DatabaseModel} model |
+ * @unrestricted |
*/ |
-WebInspector.DatabaseDispatcher = function(model) |
-{ |
+WebInspector.DatabaseDispatcher = class { |
+ /** |
+ * @param {!WebInspector.DatabaseModel} model |
+ */ |
+ constructor(model) { |
this._model = model; |
+ } |
+ |
+ /** |
+ * @override |
+ * @param {!DatabaseAgent.Database} payload |
+ */ |
+ addDatabase(payload) { |
+ this._model._addDatabase( |
+ new WebInspector.Database(this._model, payload.id, payload.domain, payload.name, payload.version)); |
+ } |
}; |
-WebInspector.DatabaseDispatcher.prototype = { |
- /** |
- * @override |
- * @param {!DatabaseAgent.Database} payload |
- */ |
- addDatabase: function(payload) |
- { |
- this._model._addDatabase(new WebInspector.Database( |
- this._model, |
- payload.id, |
- payload.domain, |
- payload.name, |
- payload.version)); |
- } |
-}; |
+WebInspector.DatabaseModel._symbol = Symbol('DatabaseModel'); |
-WebInspector.DatabaseModel._symbol = Symbol("DatabaseModel"); |
-/** |
- * @param {!WebInspector.Target} target |
- * @return {!WebInspector.DatabaseModel} |
- */ |
-WebInspector.DatabaseModel.fromTarget = function(target) |
-{ |
- if (!target[WebInspector.DatabaseModel._symbol]) |
- target[WebInspector.DatabaseModel._symbol] = new WebInspector.DatabaseModel(target); |
- return target[WebInspector.DatabaseModel._symbol]; |
-}; |