Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(890)

Unified Diff: third_party/WebKit/Source/devtools/front_end/sdk/ServiceWorkerCacheModel.js

Issue 2466123002: DevTools: reformat front-end code to match chromium style. (Closed)
Patch Set: all done Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/devtools/front_end/sdk/ServiceWorkerCacheModel.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/ServiceWorkerCacheModel.js b/third_party/WebKit/Source/devtools/front_end/sdk/ServiceWorkerCacheModel.js
index 25edb06a6ff20368ba4cc070badc1cf6ddbf93fc..2bbf9d8c34800984db98586ce64b827247169166 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/ServiceWorkerCacheModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/ServiceWorkerCacheModel.js
@@ -1,17 +1,17 @@
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-
/**
- * Invariant: This model can only be constructed on a ServiceWorker target.
- * @constructor
- * @extends {WebInspector.SDKModel}
- * @param {!WebInspector.Target} target
- * @param {!WebInspector.SecurityOriginManager} securityOriginManager
+ * @unrestricted
*/
-WebInspector.ServiceWorkerCacheModel = function(target, securityOriginManager)
-{
- WebInspector.SDKModel.call(this, WebInspector.ServiceWorkerCacheModel, target);
+WebInspector.ServiceWorkerCacheModel = class extends WebInspector.SDKModel {
+ /**
+ * Invariant: This model can only be constructed on a ServiceWorker target.
+ * @param {!WebInspector.Target} target
+ * @param {!WebInspector.SecurityOriginManager} securityOriginManager
+ */
+ constructor(target, securityOriginManager) {
+ super(WebInspector.ServiceWorkerCacheModel, target);
/** @type {!Map<string, !WebInspector.ServiceWorkerCacheModel.Cache>} */
this._caches = new Map();
@@ -22,320 +22,307 @@ WebInspector.ServiceWorkerCacheModel = function(target, securityOriginManager)
/** @type {boolean} */
this._enabled = false;
-};
-
-/** @enum {symbol} */
-WebInspector.ServiceWorkerCacheModel.Events = {
- CacheAdded: Symbol("CacheAdded"),
- CacheRemoved: Symbol("CacheRemoved")
-};
-
-WebInspector.ServiceWorkerCacheModel.prototype = {
- enable: function()
- {
- if (this._enabled)
- return;
-
- this._securityOriginManager.addEventListener(WebInspector.SecurityOriginManager.Events.SecurityOriginAdded, this._securityOriginAdded, this);
- this._securityOriginManager.addEventListener(WebInspector.SecurityOriginManager.Events.SecurityOriginRemoved, this._securityOriginRemoved, this);
-
- for (var securityOrigin of this._securityOriginManager.securityOrigins())
- this._addOrigin(securityOrigin);
- this._enabled = true;
- },
-
- /**
- * @param {string} origin
- */
- clearForOrigin: function(origin)
- {
- this._removeOrigin(origin);
- this._addOrigin(origin);
- },
-
- refreshCacheNames: function()
- {
- for (var cache of this._caches.values())
- this._cacheRemoved(cache);
- this._caches.clear();
- var securityOrigins = this._securityOriginManager.securityOrigins();
- for (var securityOrigin of securityOrigins)
- this._loadCacheNames(securityOrigin);
- },
-
- /**
- * @param {!WebInspector.ServiceWorkerCacheModel.Cache} cache
- */
- deleteCache: function(cache)
- {
- /**
- * @this {WebInspector.ServiceWorkerCacheModel}
- */
- function callback(error)
- {
- if (error) {
- console.error("ServiceWorkerCacheAgent error deleting cache ", cache.toString(), ": ", error);
- return;
- }
- this._caches.delete(cache.cacheId);
- this._cacheRemoved(cache);
- }
- this._agent.deleteCache(cache.cacheId, callback.bind(this));
- },
-
- /**
- * @param {!WebInspector.ServiceWorkerCacheModel.Cache} cache
- * @param {string} request
- * @param {function()} callback
- */
- deleteCacheEntry: function(cache, request, callback)
- {
-
- /**
- * @param {?Protocol.Error} error
- */
- function myCallback(error)
- {
- if (error) {
- WebInspector.console.error(WebInspector.UIString("ServiceWorkerCacheAgent error deleting cache entry %s in cache: %s", cache.toString(), error));
- return;
- }
- callback();
- }
- this._agent.deleteEntry(cache.cacheId, request, myCallback);
- },
-
- /**
- * @param {!WebInspector.ServiceWorkerCacheModel.Cache} cache
- * @param {number} skipCount
- * @param {number} pageSize
- * @param {function(!Array.<!WebInspector.ServiceWorkerCacheModel.Entry>, boolean)} callback
- */
- loadCacheData: function(cache, skipCount, pageSize, callback)
- {
- this._requestEntries(cache, skipCount, pageSize, callback);
- },
-
- /**
- * @return {!Array.<!WebInspector.ServiceWorkerCacheModel.Cache>}
- */
- caches: function()
- {
- var caches = new Array();
- for (var cache of this._caches.values())
- caches.push(cache);
- return caches;
- },
-
- dispose: function()
- {
- for (var cache of this._caches.values())
- this._cacheRemoved(cache);
- this._caches.clear();
- if (this._enabled) {
- this._securityOriginManager.removeEventListener(WebInspector.SecurityOriginManager.Events.SecurityOriginAdded, this._securityOriginAdded, this);
- this._securityOriginManager.removeEventListener(WebInspector.SecurityOriginManager.Events.SecurityOriginRemoved, this._securityOriginRemoved, this);
- }
- },
-
- _addOrigin: function(securityOrigin)
- {
- this._loadCacheNames(securityOrigin);
- },
-
- /**
- * @param {string} securityOrigin
- */
- _removeOrigin: function(securityOrigin)
- {
- for (var opaqueId of this._caches.keys()) {
- var cache = this._caches.get(opaqueId);
- if (cache.securityOrigin === securityOrigin) {
- this._caches.delete(opaqueId);
- this._cacheRemoved(cache);
- }
- }
- },
-
- /**
- * @param {string} securityOrigin
- */
- _loadCacheNames: function(securityOrigin)
- {
- /**
- * @param {?Protocol.Error} error
- * @param {!Array.<!WebInspector.ServiceWorkerCacheModel.Cache>} caches
- * @this {WebInspector.ServiceWorkerCacheModel}
- */
- function callback(error, caches)
- {
- if (error) {
- console.error("ServiceWorkerCacheAgent error while loading caches: ", error);
- return;
- }
- this._updateCacheNames(securityOrigin, caches);
- }
- this._agent.requestCacheNames(securityOrigin, callback.bind(this));
- },
+ }
+ /**
+ * @param {!WebInspector.Target} target
+ * @return {?WebInspector.ServiceWorkerCacheModel}
+ */
+ static fromTarget(target) {
+ if (!target.hasBrowserCapability())
+ return null;
+ var instance =
+ /** @type {?WebInspector.ServiceWorkerCacheModel} */ (target.model(WebInspector.ServiceWorkerCacheModel));
+ if (!instance)
+ instance =
+ new WebInspector.ServiceWorkerCacheModel(target, WebInspector.SecurityOriginManager.fromTarget(target));
+ return instance;
+ }
+
+ enable() {
+ if (this._enabled)
+ return;
+
+ this._securityOriginManager.addEventListener(
+ WebInspector.SecurityOriginManager.Events.SecurityOriginAdded, this._securityOriginAdded, this);
+ this._securityOriginManager.addEventListener(
+ WebInspector.SecurityOriginManager.Events.SecurityOriginRemoved, this._securityOriginRemoved, this);
+
+ for (var securityOrigin of this._securityOriginManager.securityOrigins())
+ this._addOrigin(securityOrigin);
+ this._enabled = true;
+ }
+
+ /**
+ * @param {string} origin
+ */
+ clearForOrigin(origin) {
+ this._removeOrigin(origin);
+ this._addOrigin(origin);
+ }
+
+ refreshCacheNames() {
+ for (var cache of this._caches.values())
+ this._cacheRemoved(cache);
+ this._caches.clear();
+ var securityOrigins = this._securityOriginManager.securityOrigins();
+ for (var securityOrigin of securityOrigins)
+ this._loadCacheNames(securityOrigin);
+ }
+
+ /**
+ * @param {!WebInspector.ServiceWorkerCacheModel.Cache} cache
+ */
+ deleteCache(cache) {
/**
- * @param {string} securityOrigin
- * @param {!Array} cachesJson
+ * @this {WebInspector.ServiceWorkerCacheModel}
*/
- _updateCacheNames: function(securityOrigin, cachesJson)
- {
- /**
- * @param {!WebInspector.ServiceWorkerCacheModel.Cache} cache
- * @this {WebInspector.ServiceWorkerCacheModel}
- */
- function deleteAndSaveOldCaches(cache)
- {
- if (cache.securityOrigin === securityOrigin && !updatingCachesIds.has(cache.cacheId)) {
- oldCaches.set(cache.cacheId, cache);
- this._caches.delete(cache.cacheId);
- }
- }
-
- /** @type {!Set<string>} */
- var updatingCachesIds = new Set();
- /** @type {!Map<string, !WebInspector.ServiceWorkerCacheModel.Cache>} */
- var newCaches = new Map();
- /** @type {!Map<string, !WebInspector.ServiceWorkerCacheModel.Cache>} */
- var oldCaches = new Map();
-
- for (var cacheJson of cachesJson) {
- var cache = new WebInspector.ServiceWorkerCacheModel.Cache(cacheJson.securityOrigin, cacheJson.cacheName, cacheJson.cacheId);
- updatingCachesIds.add(cache.cacheId);
- if (this._caches.has(cache.cacheId))
- continue;
- newCaches.set(cache.cacheId, cache);
- this._caches.set(cache.cacheId, cache);
- }
- this._caches.forEach(deleteAndSaveOldCaches, this);
- newCaches.forEach(this._cacheAdded, this);
- oldCaches.forEach(this._cacheRemoved, this);
- },
-
+ function callback(error) {
+ if (error) {
+ console.error('ServiceWorkerCacheAgent error deleting cache ', cache.toString(), ': ', error);
+ return;
+ }
+ this._caches.delete(cache.cacheId);
+ this._cacheRemoved(cache);
+ }
+ this._agent.deleteCache(cache.cacheId, callback.bind(this));
+ }
+
+ /**
+ * @param {!WebInspector.ServiceWorkerCacheModel.Cache} cache
+ * @param {string} request
+ * @param {function()} callback
+ */
+ deleteCacheEntry(cache, request, callback) {
/**
- * @param {!WebInspector.Event} event
+ * @param {?Protocol.Error} error
*/
- _securityOriginAdded: function(event)
- {
- var securityOrigin = /** @type {string} */ (event.data);
- this._addOrigin(securityOrigin);
- },
+ function myCallback(error) {
+ if (error) {
+ WebInspector.console.error(WebInspector.UIString(
+ 'ServiceWorkerCacheAgent error deleting cache entry %s in cache: %s', cache.toString(), error));
+ return;
+ }
+ callback();
+ }
+ this._agent.deleteEntry(cache.cacheId, request, myCallback);
+ }
+
+ /**
+ * @param {!WebInspector.ServiceWorkerCacheModel.Cache} cache
+ * @param {number} skipCount
+ * @param {number} pageSize
+ * @param {function(!Array.<!WebInspector.ServiceWorkerCacheModel.Entry>, boolean)} callback
+ */
+ loadCacheData(cache, skipCount, pageSize, callback) {
+ this._requestEntries(cache, skipCount, pageSize, callback);
+ }
+
+ /**
+ * @return {!Array.<!WebInspector.ServiceWorkerCacheModel.Cache>}
+ */
+ caches() {
+ var caches = new Array();
+ for (var cache of this._caches.values())
+ caches.push(cache);
+ return caches;
+ }
+
+ /**
+ * @override
+ */
+ dispose() {
+ for (var cache of this._caches.values())
+ this._cacheRemoved(cache);
+ this._caches.clear();
+ if (this._enabled) {
+ this._securityOriginManager.removeEventListener(
+ WebInspector.SecurityOriginManager.Events.SecurityOriginAdded, this._securityOriginAdded, this);
+ this._securityOriginManager.removeEventListener(
+ WebInspector.SecurityOriginManager.Events.SecurityOriginRemoved, this._securityOriginRemoved, this);
+ }
+ }
+
+ _addOrigin(securityOrigin) {
+ this._loadCacheNames(securityOrigin);
+ }
+
+ /**
+ * @param {string} securityOrigin
+ */
+ _removeOrigin(securityOrigin) {
+ for (var opaqueId of this._caches.keys()) {
+ var cache = this._caches.get(opaqueId);
+ if (cache.securityOrigin === securityOrigin) {
+ this._caches.delete(opaqueId);
+ this._cacheRemoved(cache);
+ }
+ }
+ }
+ /**
+ * @param {string} securityOrigin
+ */
+ _loadCacheNames(securityOrigin) {
/**
- * @param {!WebInspector.Event} event
+ * @param {?Protocol.Error} error
+ * @param {!Array.<!WebInspector.ServiceWorkerCacheModel.Cache>} caches
+ * @this {WebInspector.ServiceWorkerCacheModel}
*/
- _securityOriginRemoved: function(event)
- {
- var securityOrigin = /** @type {string} */ (event.data);
- this._removeOrigin(securityOrigin);
- },
-
+ function callback(error, caches) {
+ if (error) {
+ console.error('ServiceWorkerCacheAgent error while loading caches: ', error);
+ return;
+ }
+ this._updateCacheNames(securityOrigin, caches);
+ }
+ this._agent.requestCacheNames(securityOrigin, callback.bind(this));
+ }
+
+ /**
+ * @param {string} securityOrigin
+ * @param {!Array} cachesJson
+ */
+ _updateCacheNames(securityOrigin, cachesJson) {
/**
* @param {!WebInspector.ServiceWorkerCacheModel.Cache} cache
+ * @this {WebInspector.ServiceWorkerCacheModel}
*/
- _cacheAdded: function(cache)
- {
- this.dispatchEventToListeners(WebInspector.ServiceWorkerCacheModel.Events.CacheAdded, cache);
- },
+ function deleteAndSaveOldCaches(cache) {
+ if (cache.securityOrigin === securityOrigin && !updatingCachesIds.has(cache.cacheId)) {
+ oldCaches.set(cache.cacheId, cache);
+ this._caches.delete(cache.cacheId);
+ }
+ }
+ /** @type {!Set<string>} */
+ var updatingCachesIds = new Set();
+ /** @type {!Map<string, !WebInspector.ServiceWorkerCacheModel.Cache>} */
+ var newCaches = new Map();
+ /** @type {!Map<string, !WebInspector.ServiceWorkerCacheModel.Cache>} */
+ var oldCaches = new Map();
+
+ for (var cacheJson of cachesJson) {
+ var cache = new WebInspector.ServiceWorkerCacheModel.Cache(
+ cacheJson.securityOrigin, cacheJson.cacheName, cacheJson.cacheId);
+ updatingCachesIds.add(cache.cacheId);
+ if (this._caches.has(cache.cacheId))
+ continue;
+ newCaches.set(cache.cacheId, cache);
+ this._caches.set(cache.cacheId, cache);
+ }
+ this._caches.forEach(deleteAndSaveOldCaches, this);
+ newCaches.forEach(this._cacheAdded, this);
+ oldCaches.forEach(this._cacheRemoved, this);
+ }
+
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ _securityOriginAdded(event) {
+ var securityOrigin = /** @type {string} */ (event.data);
+ this._addOrigin(securityOrigin);
+ }
+
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ _securityOriginRemoved(event) {
+ var securityOrigin = /** @type {string} */ (event.data);
+ this._removeOrigin(securityOrigin);
+ }
+
+ /**
+ * @param {!WebInspector.ServiceWorkerCacheModel.Cache} cache
+ */
+ _cacheAdded(cache) {
+ this.dispatchEventToListeners(WebInspector.ServiceWorkerCacheModel.Events.CacheAdded, cache);
+ }
+
+ /**
+ * @param {!WebInspector.ServiceWorkerCacheModel.Cache} cache
+ */
+ _cacheRemoved(cache) {
+ this.dispatchEventToListeners(WebInspector.ServiceWorkerCacheModel.Events.CacheRemoved, cache);
+ }
+
+ /**
+ * @param {!WebInspector.ServiceWorkerCacheModel.Cache} cache
+ * @param {number} skipCount
+ * @param {number} pageSize
+ * @param {function(!Array.<!WebInspector.ServiceWorkerCacheModel.Entry>, boolean)} callback
+ */
+ _requestEntries(cache, skipCount, pageSize, callback) {
/**
- * @param {!WebInspector.ServiceWorkerCacheModel.Cache} cache
+ * @param {?Protocol.Error} error
+ * @param {!Array.<!WebInspector.ServiceWorkerCacheModel.Entry>} dataEntries
+ * @param {boolean} hasMore
*/
- _cacheRemoved: function(cache)
- {
- this.dispatchEventToListeners(WebInspector.ServiceWorkerCacheModel.Events.CacheRemoved, cache);
- },
+ function innerCallback(error, dataEntries, hasMore) {
+ if (error) {
+ console.error('ServiceWorkerCacheAgent error while requesting entries: ', error);
+ return;
+ }
+ var entries = [];
+ for (var i = 0; i < dataEntries.length; ++i) {
+ entries.push(new WebInspector.ServiceWorkerCacheModel.Entry(dataEntries[i].request, dataEntries[i].response));
+ }
+ callback(entries, hasMore);
+ }
+ this._agent.requestEntries(cache.cacheId, skipCount, pageSize, innerCallback);
+ }
+};
- /**
- * @param {!WebInspector.ServiceWorkerCacheModel.Cache} cache
- * @param {number} skipCount
- * @param {number} pageSize
- * @param {function(!Array.<!WebInspector.ServiceWorkerCacheModel.Entry>, boolean)} callback
- */
- _requestEntries: function(cache, skipCount, pageSize, callback)
- {
- /**
- * @param {?Protocol.Error} error
- * @param {!Array.<!WebInspector.ServiceWorkerCacheModel.Entry>} dataEntries
- * @param {boolean} hasMore
- */
- function innerCallback(error, dataEntries, hasMore)
- {
- if (error) {
- console.error("ServiceWorkerCacheAgent error while requesting entries: ", error);
- return;
- }
- var entries = [];
- for (var i = 0; i < dataEntries.length; ++i) {
- entries.push(new WebInspector.ServiceWorkerCacheModel.Entry(dataEntries[i].request, dataEntries[i].response));
- }
- callback(entries, hasMore);
- }
- this._agent.requestEntries(cache.cacheId, skipCount, pageSize, innerCallback);
- },
-
- __proto__: WebInspector.SDKModel.prototype
+/** @enum {symbol} */
+WebInspector.ServiceWorkerCacheModel.Events = {
+ CacheAdded: Symbol('CacheAdded'),
+ CacheRemoved: Symbol('CacheRemoved')
};
/**
- * @constructor
- * @param {string} request
- * @param {string} response
+ * @unrestricted
*/
-WebInspector.ServiceWorkerCacheModel.Entry = function(request, response)
-{
+WebInspector.ServiceWorkerCacheModel.Entry = class {
+ /**
+ * @param {string} request
+ * @param {string} response
+ */
+ constructor(request, response) {
this.request = request;
this.response = response;
+ }
};
/**
- * @constructor
- * @param {string} securityOrigin
- * @param {string} cacheName
- * @param {string} cacheId
+ * @unrestricted
*/
-WebInspector.ServiceWorkerCacheModel.Cache = function(securityOrigin, cacheName, cacheId)
-{
+WebInspector.ServiceWorkerCacheModel.Cache = class {
+ /**
+ * @param {string} securityOrigin
+ * @param {string} cacheName
+ * @param {string} cacheId
+ */
+ constructor(securityOrigin, cacheName, cacheId) {
this.securityOrigin = securityOrigin;
this.cacheName = cacheName;
this.cacheId = cacheId;
+ }
+
+ /**
+ * @param {!WebInspector.ServiceWorkerCacheModel.Cache} cache
+ * @return {boolean}
+ */
+ equals(cache) {
+ return this.cacheId === cache.cacheId;
+ }
+
+ /**
+ * @override
+ * @return {string}
+ */
+ toString() {
+ return this.securityOrigin + this.cacheName;
+ }
};
-WebInspector.ServiceWorkerCacheModel.Cache.prototype = {
- /**
- * @param {!WebInspector.ServiceWorkerCacheModel.Cache} cache
- * @return {boolean}
- */
- equals: function(cache)
- {
- return this.cacheId === cache.cacheId;
- },
-
- /**
- * @override
- * @return {string}
- */
- toString: function()
- {
- return this.securityOrigin + this.cacheName;
- }
-};
-
-/**
- * @param {!WebInspector.Target} target
- * @return {?WebInspector.ServiceWorkerCacheModel}
- */
-WebInspector.ServiceWorkerCacheModel.fromTarget = function(target)
-{
- if (!target.hasBrowserCapability())
- return null;
- var instance = /** @type {?WebInspector.ServiceWorkerCacheModel} */ (target.model(WebInspector.ServiceWorkerCacheModel));
- if (!instance)
- instance = new WebInspector.ServiceWorkerCacheModel(target, WebInspector.SecurityOriginManager.fromTarget(target));
- return instance;
-};

Powered by Google App Engine
This is Rietveld 408576698