| Index: third_party/WebKit/Source/devtools/front_end/sdk/SecurityOriginManager.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/SecurityOriginManager.js b/third_party/WebKit/Source/devtools/front_end/sdk/SecurityOriginManager.js
|
| index fed45e9d0bfc838ba4eb073934853b89b47f35bf..5f72555caf636fec294010c81c9a3294653ca05d 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/sdk/SecurityOriginManager.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/sdk/SecurityOriginManager.js
|
| @@ -1,92 +1,86 @@
|
| // Copyright 2016 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.
|
| -
|
| /**
|
| - * @constructor
|
| - * @extends {WebInspector.SDKModel}
|
| - * @param {!WebInspector.Target} target
|
| + * @unrestricted
|
| */
|
| -WebInspector.SecurityOriginManager = function(target)
|
| -{
|
| - WebInspector.SDKModel.call(this, WebInspector.SecurityOriginManager, target);
|
| +WebInspector.SecurityOriginManager = class extends WebInspector.SDKModel {
|
| + /**
|
| + * @param {!WebInspector.Target} target
|
| + */
|
| + constructor(target) {
|
| + super(WebInspector.SecurityOriginManager, target);
|
|
|
| this._securityOriginCounter = new Map();
|
| - this._mainSecurityOrigin = "";
|
| -};
|
| + this._mainSecurityOrigin = '';
|
| + }
|
|
|
| -/** @enum {symbol} */
|
| -WebInspector.SecurityOriginManager.Events = {
|
| - SecurityOriginAdded: Symbol("SecurityOriginAdded"),
|
| - SecurityOriginRemoved: Symbol("SecurityOriginRemoved"),
|
| - MainSecurityOriginChanged: Symbol("MainSecurityOriginChanged")
|
| -};
|
| -
|
| -/**
|
| - * @param {!WebInspector.Target} target
|
| - * @return {!WebInspector.SecurityOriginManager}
|
| - */
|
| -WebInspector.SecurityOriginManager.fromTarget = function(target)
|
| -{
|
| - var securityOriginManager = /** @type {?WebInspector.SecurityOriginManager} */ (target.model(WebInspector.SecurityOriginManager));
|
| + /**
|
| + * @param {!WebInspector.Target} target
|
| + * @return {!WebInspector.SecurityOriginManager}
|
| + */
|
| + static fromTarget(target) {
|
| + var securityOriginManager =
|
| + /** @type {?WebInspector.SecurityOriginManager} */ (target.model(WebInspector.SecurityOriginManager));
|
| if (!securityOriginManager)
|
| - securityOriginManager = new WebInspector.SecurityOriginManager(target);
|
| + securityOriginManager = new WebInspector.SecurityOriginManager(target);
|
| return securityOriginManager;
|
| -};
|
| + }
|
|
|
| -WebInspector.SecurityOriginManager.prototype = {
|
| - /**
|
| - * @param {string} securityOrigin
|
| - */
|
| - addSecurityOrigin: function(securityOrigin)
|
| - {
|
| - var currentCount = this._securityOriginCounter.get(securityOrigin);
|
| - if (!currentCount) {
|
| - this._securityOriginCounter.set(securityOrigin, 1);
|
| - this.dispatchEventToListeners(WebInspector.SecurityOriginManager.Events.SecurityOriginAdded, securityOrigin);
|
| - return;
|
| - }
|
| - this._securityOriginCounter.set(securityOrigin, currentCount + 1);
|
| - },
|
| + /**
|
| + * @param {string} securityOrigin
|
| + */
|
| + addSecurityOrigin(securityOrigin) {
|
| + var currentCount = this._securityOriginCounter.get(securityOrigin);
|
| + if (!currentCount) {
|
| + this._securityOriginCounter.set(securityOrigin, 1);
|
| + this.dispatchEventToListeners(WebInspector.SecurityOriginManager.Events.SecurityOriginAdded, securityOrigin);
|
| + return;
|
| + }
|
| + this._securityOriginCounter.set(securityOrigin, currentCount + 1);
|
| + }
|
|
|
| - /**
|
| - * @param {string} securityOrigin
|
| - */
|
| - removeSecurityOrigin: function(securityOrigin)
|
| - {
|
| - var currentCount = this._securityOriginCounter.get(securityOrigin);
|
| - if (currentCount === 1) {
|
| - this._securityOriginCounter.delete(securityOrigin);
|
| - this.dispatchEventToListeners(WebInspector.SecurityOriginManager.Events.SecurityOriginRemoved, securityOrigin);
|
| - return;
|
| - }
|
| - this._securityOriginCounter.set(securityOrigin, currentCount - 1);
|
| - },
|
| + /**
|
| + * @param {string} securityOrigin
|
| + */
|
| + removeSecurityOrigin(securityOrigin) {
|
| + var currentCount = this._securityOriginCounter.get(securityOrigin);
|
| + if (currentCount === 1) {
|
| + this._securityOriginCounter.delete(securityOrigin);
|
| + this.dispatchEventToListeners(WebInspector.SecurityOriginManager.Events.SecurityOriginRemoved, securityOrigin);
|
| + return;
|
| + }
|
| + this._securityOriginCounter.set(securityOrigin, currentCount - 1);
|
| + }
|
|
|
| - /**
|
| - * @return {!Array<string>}
|
| - */
|
| - securityOrigins: function()
|
| - {
|
| - return this._securityOriginCounter.keysArray();
|
| - },
|
| + /**
|
| + * @return {!Array<string>}
|
| + */
|
| + securityOrigins() {
|
| + return this._securityOriginCounter.keysArray();
|
| + }
|
|
|
| - /**
|
| - * @return {string}
|
| - */
|
| - mainSecurityOrigin: function()
|
| - {
|
| - return this._mainSecurityOrigin;
|
| - },
|
| + /**
|
| + * @return {string}
|
| + */
|
| + mainSecurityOrigin() {
|
| + return this._mainSecurityOrigin;
|
| + }
|
|
|
| - /**
|
| - * @param {string} securityOrigin
|
| - */
|
| - setMainSecurityOrigin: function(securityOrigin)
|
| - {
|
| - this._mainSecurityOrigin = securityOrigin;
|
| - this.dispatchEventToListeners(WebInspector.SecurityOriginManager.Events.MainSecurityOriginChanged, securityOrigin);
|
| - },
|
| + /**
|
| + * @param {string} securityOrigin
|
| + */
|
| + setMainSecurityOrigin(securityOrigin) {
|
| + this._mainSecurityOrigin = securityOrigin;
|
| + this.dispatchEventToListeners(WebInspector.SecurityOriginManager.Events.MainSecurityOriginChanged, securityOrigin);
|
| + }
|
| +};
|
|
|
| - __proto__: WebInspector.SDKModel.prototype
|
| +/** @enum {symbol} */
|
| +WebInspector.SecurityOriginManager.Events = {
|
| + SecurityOriginAdded: Symbol('SecurityOriginAdded'),
|
| + SecurityOriginRemoved: Symbol('SecurityOriginRemoved'),
|
| + MainSecurityOriginChanged: Symbol('MainSecurityOriginChanged')
|
| };
|
| +
|
| +
|
|
|