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

Unified Diff: third_party/WebKit/Source/devtools/front_end/bindings/StylesSourceMapping.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/bindings/StylesSourceMapping.js
diff --git a/third_party/WebKit/Source/devtools/front_end/bindings/StylesSourceMapping.js b/third_party/WebKit/Source/devtools/front_end/bindings/StylesSourceMapping.js
index c8674ad2939d7d91be0b9c2b97f299801caab4a9..1ddf30c84993e4ee21084d7b4e53daa5235f56c5 100644
--- a/third_party/WebKit/Source/devtools/front_end/bindings/StylesSourceMapping.js
+++ b/third_party/WebKit/Source/devtools/front_end/bindings/StylesSourceMapping.js
@@ -27,15 +27,16 @@
* (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.CSSModel} cssModel
- * @param {!WebInspector.Workspace} workspace
- * @param {!WebInspector.NetworkMapping} networkMapping
+ * @unrestricted
*/
-WebInspector.StylesSourceMapping = function(cssModel, workspace, networkMapping)
-{
+WebInspector.StylesSourceMapping = class {
+ /**
+ * @param {!WebInspector.CSSModel} cssModel
+ * @param {!WebInspector.Workspace} workspace
+ * @param {!WebInspector.NetworkMapping} networkMapping
+ */
+ constructor(cssModel, workspace, networkMapping) {
this._cssModel = cssModel;
this._workspace = workspace;
this._networkMapping = networkMapping;
@@ -46,331 +47,317 @@ WebInspector.StylesSourceMapping = function(cssModel, workspace, networkMapping)
this._styleFiles = new Map();
this._eventListeners = [
- this._workspace.addEventListener(WebInspector.Workspace.Events.ProjectRemoved, this._projectRemoved, this),
- this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAddedToWorkspace, this),
- this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeRemoved, this._uiSourceCodeRemoved, this),
- this._cssModel.addEventListener(WebInspector.CSSModel.Events.StyleSheetAdded, this._styleSheetAdded, this),
- this._cssModel.addEventListener(WebInspector.CSSModel.Events.StyleSheetRemoved, this._styleSheetRemoved, this),
- this._cssModel.addEventListener(WebInspector.CSSModel.Events.StyleSheetChanged, this._styleSheetChanged, this),
- WebInspector.ResourceTreeModel.fromTarget(cssModel.target()).addEventListener(
- WebInspector.ResourceTreeModel.Events.MainFrameNavigated, this._unbindAllUISourceCodes, this)
+ this._workspace.addEventListener(WebInspector.Workspace.Events.ProjectRemoved, this._projectRemoved, this),
+ this._workspace.addEventListener(
+ WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAddedToWorkspace, this),
+ this._workspace.addEventListener(
+ WebInspector.Workspace.Events.UISourceCodeRemoved, this._uiSourceCodeRemoved, this),
+ this._cssModel.addEventListener(WebInspector.CSSModel.Events.StyleSheetAdded, this._styleSheetAdded, this),
+ this._cssModel.addEventListener(WebInspector.CSSModel.Events.StyleSheetRemoved, this._styleSheetRemoved, this),
+ this._cssModel.addEventListener(WebInspector.CSSModel.Events.StyleSheetChanged, this._styleSheetChanged, this),
+ WebInspector.ResourceTreeModel.fromTarget(cssModel.target())
+ .addEventListener(
+ WebInspector.ResourceTreeModel.Events.MainFrameNavigated, this._unbindAllUISourceCodes, this)
];
-};
-
-WebInspector.StylesSourceMapping.ChangeUpdateTimeoutMs = 200;
-
-WebInspector.StylesSourceMapping.prototype = {
- /**
- * @param {!WebInspector.CSSLocation} rawLocation
- * @return {?WebInspector.UILocation}
- */
- rawLocationToUILocation: function(rawLocation)
- {
- var uiSourceCode = this._networkMapping.uiSourceCodeForStyleURL(rawLocation.url, rawLocation.header());
- if (!uiSourceCode)
- return null;
- var lineNumber = rawLocation.lineNumber;
- var columnNumber = rawLocation.columnNumber;
- var header = this._cssModel.styleSheetHeaderForId(rawLocation.styleSheetId);
- if (header && header.isInline && header.hasSourceURL) {
- lineNumber -= header.lineNumberInSource(0);
- columnNumber -= header.columnNumberInSource(lineNumber, 0);
- }
- return uiSourceCode.uiLocation(lineNumber, columnNumber);
- },
-
- /**
- * @param {!WebInspector.Event} event
- */
- _styleSheetAdded: function(event)
- {
- var header = /** @type {!WebInspector.CSSStyleSheetHeader} */(event.data);
- var url = header.resourceURL();
- if (!url)
- return;
-
- var map = this._urlToHeadersByFrameId.get(url);
- if (!map) {
- map = /** @type {!Map.<string, !Map.<string, !WebInspector.CSSStyleSheetHeader>>} */ (new Map());
- this._urlToHeadersByFrameId.set(url, map);
- }
- var headersById = map.get(header.frameId);
- if (!headersById) {
- headersById = /** @type {!Map.<string, !WebInspector.CSSStyleSheetHeader>} */ (new Map());
- map.set(header.frameId, headersById);
- }
- headersById.set(header.id, header);
+ }
+
+ /**
+ * @param {!WebInspector.CSSLocation} rawLocation
+ * @return {?WebInspector.UILocation}
+ */
+ rawLocationToUILocation(rawLocation) {
+ var uiSourceCode = this._networkMapping.uiSourceCodeForStyleURL(rawLocation.url, rawLocation.header());
+ if (!uiSourceCode)
+ return null;
+ var lineNumber = rawLocation.lineNumber;
+ var columnNumber = rawLocation.columnNumber;
+ var header = this._cssModel.styleSheetHeaderForId(rawLocation.styleSheetId);
+ if (header && header.isInline && header.hasSourceURL) {
+ lineNumber -= header.lineNumberInSource(0);
+ columnNumber -= header.columnNumberInSource(lineNumber, 0);
+ }
+ return uiSourceCode.uiLocation(lineNumber, columnNumber);
+ }
+
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ _styleSheetAdded(event) {
+ var header = /** @type {!WebInspector.CSSStyleSheetHeader} */ (event.data);
+ var url = header.resourceURL();
+ if (!url)
+ return;
+
+ var map = this._urlToHeadersByFrameId.get(url);
+ if (!map) {
+ map = /** @type {!Map.<string, !Map.<string, !WebInspector.CSSStyleSheetHeader>>} */ (new Map());
+ this._urlToHeadersByFrameId.set(url, map);
+ }
+ var headersById = map.get(header.frameId);
+ if (!headersById) {
+ headersById = /** @type {!Map.<string, !WebInspector.CSSStyleSheetHeader>} */ (new Map());
+ map.set(header.frameId, headersById);
+ }
+ headersById.set(header.id, header);
+ var uiSourceCode = this._networkMapping.uiSourceCodeForStyleURL(url, header);
+ if (uiSourceCode)
+ this._bindUISourceCode(uiSourceCode, header);
+ }
+
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ _styleSheetRemoved(event) {
+ var header = /** @type {!WebInspector.CSSStyleSheetHeader} */ (event.data);
+ var url = header.resourceURL();
+ if (!url)
+ return;
+
+ var map = this._urlToHeadersByFrameId.get(url);
+ console.assert(map);
+ var headersById = map.get(header.frameId);
+ console.assert(headersById);
+ headersById.delete(header.id);
+
+ if (!headersById.size) {
+ map.delete(header.frameId);
+ if (!map.size) {
+ this._urlToHeadersByFrameId.delete(url);
var uiSourceCode = this._networkMapping.uiSourceCodeForStyleURL(url, header);
if (uiSourceCode)
- this._bindUISourceCode(uiSourceCode, header);
- },
-
- /**
- * @param {!WebInspector.Event} event
- */
- _styleSheetRemoved: function(event)
- {
- var header = /** @type {!WebInspector.CSSStyleSheetHeader} */(event.data);
- var url = header.resourceURL();
- if (!url)
- return;
-
- var map = this._urlToHeadersByFrameId.get(url);
- console.assert(map);
- var headersById = map.get(header.frameId);
- console.assert(headersById);
- headersById.delete(header.id);
-
- if (!headersById.size) {
- map.delete(header.frameId);
- if (!map.size) {
- this._urlToHeadersByFrameId.delete(url);
- var uiSourceCode = this._networkMapping.uiSourceCodeForStyleURL(url, header);
- if (uiSourceCode)
- this._unbindUISourceCode(uiSourceCode);
- }
- }
- },
-
- /**
- * @param {!WebInspector.UISourceCode} uiSourceCode
- */
- _unbindUISourceCode: function(uiSourceCode)
- {
- var styleFile = this._styleFiles.get(uiSourceCode);
- if (!styleFile)
- return;
- styleFile.dispose();
- this._styleFiles.delete(uiSourceCode);
- },
-
- /**
- * @param {!WebInspector.Event} event
- */
- _unbindAllUISourceCodes: function(event)
- {
- if (event.data.target() !== this._cssModel.target())
- return;
- for (var styleFile of this._styleFiles.values())
- styleFile.dispose();
- this._styleFiles.clear();
- this._urlToHeadersByFrameId = new Map();
- },
-
- /**
- * @param {!WebInspector.Event} event
- */
- _uiSourceCodeAddedToWorkspace: function(event)
- {
- var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data);
- if (!this._urlToHeadersByFrameId.has(uiSourceCode.url()))
- return;
- this._bindUISourceCode(uiSourceCode, this._urlToHeadersByFrameId.get(uiSourceCode.url()).valuesArray()[0].valuesArray()[0]);
- },
+ this._unbindUISourceCode(uiSourceCode);
+ }
+ }
+ }
+
+ /**
+ * @param {!WebInspector.UISourceCode} uiSourceCode
+ */
+ _unbindUISourceCode(uiSourceCode) {
+ var styleFile = this._styleFiles.get(uiSourceCode);
+ if (!styleFile)
+ return;
+ styleFile.dispose();
+ this._styleFiles.delete(uiSourceCode);
+ }
+
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ _unbindAllUISourceCodes(event) {
+ if (event.data.target() !== this._cssModel.target())
+ return;
+ for (var styleFile of this._styleFiles.values())
+ styleFile.dispose();
+ this._styleFiles.clear();
+ this._urlToHeadersByFrameId = new Map();
+ }
+
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ _uiSourceCodeAddedToWorkspace(event) {
+ var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data);
+ if (!this._urlToHeadersByFrameId.has(uiSourceCode.url()))
+ return;
+ this._bindUISourceCode(
+ uiSourceCode, this._urlToHeadersByFrameId.get(uiSourceCode.url()).valuesArray()[0].valuesArray()[0]);
+ }
+
+ /**
+ * @param {!WebInspector.UISourceCode} uiSourceCode
+ * @param {!WebInspector.CSSStyleSheetHeader} header
+ */
+ _bindUISourceCode(uiSourceCode, header) {
+ if (this._styleFiles.get(uiSourceCode) || (header.isInline && !header.hasSourceURL))
+ return;
+ this._styleFiles.set(uiSourceCode, new WebInspector.StyleFile(uiSourceCode, this));
+ WebInspector.cssWorkspaceBinding.updateLocations(header);
+ }
+
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ _projectRemoved(event) {
+ var project = /** @type {!WebInspector.Project} */ (event.data);
+ var uiSourceCodes = project.uiSourceCodes();
+ for (var i = 0; i < uiSourceCodes.length; ++i)
+ this._unbindUISourceCode(uiSourceCodes[i]);
+ }
+
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ _uiSourceCodeRemoved(event) {
+ var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data);
+ this._unbindUISourceCode(uiSourceCode);
+ }
+
+ /**
+ * @param {!WebInspector.UISourceCode} uiSourceCode
+ * @param {string} content
+ * @param {boolean} majorChange
+ * @return {!Promise<?string>}
+ */
+ _setStyleContent(uiSourceCode, content, majorChange) {
+ var styleSheetIds = this._cssModel.styleSheetIdsForURL(uiSourceCode.url());
+ if (!styleSheetIds.length)
+ return Promise.resolve(/** @type {?string} */ ('No stylesheet found: ' + uiSourceCode.url()));
+
+ this._isSettingContent = true;
/**
- * @param {!WebInspector.UISourceCode} uiSourceCode
- * @param {!WebInspector.CSSStyleSheetHeader} header
+ * @param {?string} error
+ * @this {WebInspector.StylesSourceMapping}
+ * @return {?string}
*/
- _bindUISourceCode: function(uiSourceCode, header)
- {
- if (this._styleFiles.get(uiSourceCode) || (header.isInline && !header.hasSourceURL))
- return;
- this._styleFiles.set(uiSourceCode, new WebInspector.StyleFile(uiSourceCode, this));
- WebInspector.cssWorkspaceBinding.updateLocations(header);
- },
+ function callback(error) {
+ delete this._isSettingContent;
+ return error || null;
+ }
- /**
- * @param {!WebInspector.Event} event
- */
- _projectRemoved: function(event)
- {
- var project = /** @type {!WebInspector.Project} */ (event.data);
- var uiSourceCodes = project.uiSourceCodes();
- for (var i = 0; i < uiSourceCodes.length; ++i)
- this._unbindUISourceCode(uiSourceCodes[i]);
- },
+ var promises = [];
+ for (var i = 0; i < styleSheetIds.length; ++i)
+ promises.push(this._cssModel.setStyleSheetText(styleSheetIds[i], content, majorChange));
+
+ return Promise.all(promises).spread(callback.bind(this));
+ }
+
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ _styleSheetChanged(event) {
+ if (this._isSettingContent)
+ return;
+
+ this._updateStyleSheetTextSoon(event.data.styleSheetId);
+ }
+
+ /**
+ * @param {!CSSAgent.StyleSheetId} styleSheetId
+ */
+ _updateStyleSheetTextSoon(styleSheetId) {
+ if (this._updateStyleSheetTextTimer)
+ clearTimeout(this._updateStyleSheetTextTimer);
+
+ this._updateStyleSheetTextTimer = setTimeout(
+ this._updateStyleSheetText.bind(this, styleSheetId), WebInspector.StylesSourceMapping.ChangeUpdateTimeoutMs);
+ }
+
+ /**
+ * @param {!CSSAgent.StyleSheetId} styleSheetId
+ */
+ _updateStyleSheetText(styleSheetId) {
+ if (this._updateStyleSheetTextTimer) {
+ clearTimeout(this._updateStyleSheetTextTimer);
+ delete this._updateStyleSheetTextTimer;
+ }
- /**
- * @param {!WebInspector.Event} event
- */
- _uiSourceCodeRemoved: function(event)
- {
- var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data);
- this._unbindUISourceCode(uiSourceCode);
- },
+ var header = this._cssModel.styleSheetHeaderForId(styleSheetId);
+ if (!header)
+ return;
+ var styleSheetURL = header.resourceURL();
+ if (!styleSheetURL)
+ return;
+ var uiSourceCode = this._networkMapping.uiSourceCodeForStyleURL(styleSheetURL, header);
+ if (!uiSourceCode)
+ return;
+ header.requestContent().then(callback.bind(this, uiSourceCode));
/**
* @param {!WebInspector.UISourceCode} uiSourceCode
- * @param {string} content
- * @param {boolean} majorChange
- * @return {!Promise<?string>}
- */
- _setStyleContent: function(uiSourceCode, content, majorChange)
- {
- var styleSheetIds = this._cssModel.styleSheetIdsForURL(uiSourceCode.url());
- if (!styleSheetIds.length)
- return Promise.resolve(/** @type {?string} */("No stylesheet found: " + uiSourceCode.url()));
-
- this._isSettingContent = true;
-
- /**
- * @param {?string} error
- * @this {WebInspector.StylesSourceMapping}
- * @return {?string}
- */
- function callback(error)
- {
- delete this._isSettingContent;
- return error || null;
- }
-
- var promises = [];
- for (var i = 0; i < styleSheetIds.length; ++i)
- promises.push(this._cssModel.setStyleSheetText(styleSheetIds[i], content, majorChange));
-
- return Promise.all(promises).spread(callback.bind(this));
- },
-
- /**
- * @param {!WebInspector.Event} event
- */
- _styleSheetChanged: function(event)
- {
- if (this._isSettingContent)
- return;
-
- this._updateStyleSheetTextSoon(event.data.styleSheetId);
- },
-
- /**
- * @param {!CSSAgent.StyleSheetId} styleSheetId
+ * @param {?string} content
+ * @this {WebInspector.StylesSourceMapping}
*/
- _updateStyleSheetTextSoon: function(styleSheetId)
- {
- if (this._updateStyleSheetTextTimer)
- clearTimeout(this._updateStyleSheetTextTimer);
-
- this._updateStyleSheetTextTimer = setTimeout(this._updateStyleSheetText.bind(this, styleSheetId), WebInspector.StylesSourceMapping.ChangeUpdateTimeoutMs);
- },
-
- /**
- * @param {!CSSAgent.StyleSheetId} styleSheetId
- */
- _updateStyleSheetText: function(styleSheetId)
- {
- if (this._updateStyleSheetTextTimer) {
- clearTimeout(this._updateStyleSheetTextTimer);
- delete this._updateStyleSheetTextTimer;
- }
-
- var header = this._cssModel.styleSheetHeaderForId(styleSheetId);
- if (!header)
- return;
- var styleSheetURL = header.resourceURL();
- if (!styleSheetURL)
- return;
- var uiSourceCode = this._networkMapping.uiSourceCodeForStyleURL(styleSheetURL, header);
- if (!uiSourceCode)
- return;
- header.requestContent().then(callback.bind(this, uiSourceCode));
-
- /**
- * @param {!WebInspector.UISourceCode} uiSourceCode
- * @param {?string} content
- * @this {WebInspector.StylesSourceMapping}
- */
- function callback(uiSourceCode, content)
- {
- var styleFile = this._styleFiles.get(uiSourceCode);
- if (styleFile)
- styleFile.addRevision(content || "");
- }
- },
-
- dispose: function()
- {
- WebInspector.EventTarget.removeEventListeners(this._eventListeners);
+ function callback(uiSourceCode, content) {
+ var styleFile = this._styleFiles.get(uiSourceCode);
+ if (styleFile)
+ styleFile.addRevision(content || '');
}
+ }
+
+ dispose() {
+ WebInspector.EventTarget.removeEventListeners(this._eventListeners);
+ }
};
+WebInspector.StylesSourceMapping.ChangeUpdateTimeoutMs = 200;
+
/**
- * @constructor
- * @param {!WebInspector.UISourceCode} uiSourceCode
- * @param {!WebInspector.StylesSourceMapping} mapping
+ * @unrestricted
*/
-WebInspector.StyleFile = function(uiSourceCode, mapping)
-{
+WebInspector.StyleFile = class {
+ /**
+ * @param {!WebInspector.UISourceCode} uiSourceCode
+ * @param {!WebInspector.StylesSourceMapping} mapping
+ */
+ constructor(uiSourceCode, mapping) {
this._uiSourceCode = uiSourceCode;
this._mapping = mapping;
this._eventListeners = [
- this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.WorkingCopyChanged, this._workingCopyChanged, this),
- this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._workingCopyCommitted, this)
+ this._uiSourceCode.addEventListener(
+ WebInspector.UISourceCode.Events.WorkingCopyChanged, this._workingCopyChanged, this),
+ this._uiSourceCode.addEventListener(
+ WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._workingCopyCommitted, this)
];
this._commitThrottler = new WebInspector.Throttler(WebInspector.StyleFile.updateTimeout);
this._terminated = false;
+ }
+
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ _workingCopyCommitted(event) {
+ if (this._isAddingRevision)
+ return;
+
+ this._isMajorChangePending = true;
+ this._commitThrottler.schedule(this._commitIncrementalEdit.bind(this), true);
+ }
+
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ _workingCopyChanged(event) {
+ if (this._isAddingRevision)
+ return;
+
+ this._commitThrottler.schedule(this._commitIncrementalEdit.bind(this), false);
+ }
+
+ _commitIncrementalEdit() {
+ if (this._terminated)
+ return;
+ var promise =
+ this._mapping._setStyleContent(this._uiSourceCode, this._uiSourceCode.workingCopy(), this._isMajorChangePending)
+ .then(this._styleContentSet.bind(this));
+ this._isMajorChangePending = false;
+ return promise;
+ }
+
+ /**
+ * @param {?string} error
+ */
+ _styleContentSet(error) {
+ if (error)
+ console.error(error);
+ }
+
+ /**
+ * @param {string} content
+ */
+ addRevision(content) {
+ this._isAddingRevision = true;
+ this._uiSourceCode.addRevision(content);
+ delete this._isAddingRevision;
+ }
+
+ dispose() {
+ if (this._terminated)
+ return;
+ this._terminated = true;
+ WebInspector.EventTarget.removeEventListeners(this._eventListeners);
+ }
};
WebInspector.StyleFile.updateTimeout = 200;
-
-WebInspector.StyleFile.prototype = {
- /**
- * @param {!WebInspector.Event} event
- */
- _workingCopyCommitted: function(event)
- {
- if (this._isAddingRevision)
- return;
-
- this._isMajorChangePending = true;
- this._commitThrottler.schedule(this._commitIncrementalEdit.bind(this), true);
- },
-
- /**
- * @param {!WebInspector.Event} event
- */
- _workingCopyChanged: function(event)
- {
- if (this._isAddingRevision)
- return;
-
- this._commitThrottler.schedule(this._commitIncrementalEdit.bind(this), false);
- },
-
- _commitIncrementalEdit: function()
- {
- if (this._terminated)
- return;
- var promise = this._mapping._setStyleContent(this._uiSourceCode, this._uiSourceCode.workingCopy(), this._isMajorChangePending)
- .then(this._styleContentSet.bind(this));
- this._isMajorChangePending = false;
- return promise;
- },
-
- /**
- * @param {?string} error
- */
- _styleContentSet: function(error)
- {
- if (error)
- console.error(error);
- },
-
- /**
- * @param {string} content
- */
- addRevision: function(content)
- {
- this._isAddingRevision = true;
- this._uiSourceCode.addRevision(content);
- delete this._isAddingRevision;
- },
-
- dispose: function()
- {
- if (this._terminated)
- return;
- this._terminated = true;
- WebInspector.EventTarget.removeEventListeners(this._eventListeners);
- }
-};

Powered by Google App Engine
This is Rietveld 408576698