DevTools: move ui messages from SourceFrame to UISourceCodeFrame (step2)

third_party/WebKit/Source/devtools/front_end/workspace/UISourceCode.js

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 34 matching lines @@
     this._parentPath = parentPath;
     this._name = name;
     this._originURL = originURL;
     this._contentType = contentType;
     /** @type {!Array.<function(?string)>} */
     this._requestContentCallbacks = [];
 
     /** @type {!Array.<!WebInspector.Revision>} */
     this.history = [];
     this._hasUnsavedCommittedChanges = false;
+
+    /** @type {!Array<!WebInspector.UISourceCode.Message>} */
+    this._messages = [];
 }
 
 /**
  * @enum {string}
  */
 WebInspector.UISourceCode.Events = {
     WorkingCopyChanged: "WorkingCopyChanged",
     WorkingCopyCommitted: "WorkingCopyCommitted",
     TitleChanged: "TitleChanged",
     SourceMappingChanged: "SourceMappingChanged",
+    MessageAdded: "MessageAdded",
+    MessageRemoved: "MessageRemoved",
 }
 
 WebInspector.UISourceCode.prototype = {
     /**
      * @return {string}
      */
     name: function()
     {
         return this._name;
     },
@@ skipping 484 matching lines @@
      * @param {number=} columnNumber
      * @return {!WebInspector.UILocation}
      */
     uiLocation: function(lineNumber, columnNumber)
     {
         if (typeof columnNumber === "undefined")
             columnNumber = 0;
         return new WebInspector.UILocation(this, lineNumber, columnNumber);
     },
 
+    /**
+     * @return {!Array<!WebInspector.UISourceCode.Message>}
+     */
+    messages: function()
+    {
+        return this._messages.slice();
+    },
+
+    /**
+     * @param {!WebInspector.UISourceCode.Message.Level} level
+     * @param {string} text
+     * @param {number} lineNumber
+     * @param {number=} columnNumber
+     * @return {!WebInspector.UISourceCode.Message} message
+     */
+    addMessage: function(level, text, lineNumber, columnNumber)
+    {
+        var message = new WebInspector.UISourceCode.Message(this, level, text, lineNumber, columnNumber);
+        this._messages.push(message);
+        this.dispatchEventToListeners(WebInspector.UISourceCode.Events.MessageAdded, message);
+        return message;
+    },
+
+    /**
+     * @param {!WebInspector.UISourceCode.Message} message
+     */
+    removeMessage: function(message)
+    {
+        if (this._messages.remove(message))
+            this.dispatchEventToListeners(WebInspector.UISourceCode.Events.MessageRemoved, message);
+    },
+
+    removeAllMessages: function()
+    {
+        for (var message of this._messages)
+            this.dispatchEventToListeners(WebInspector.UISourceCode.Events.MessageRemoved, message);

[dgozman, 2015/10/27 21:43:49]

For consistency, |message| should be removed from |_messages| before dispatching
this event. Otherwise, it will be observable through messages().

[pfeldman, 2015/10/27 22:35:17]

Done.

+        this._messages = [];
+    },
+
     __proto__: WebInspector.Object.prototype
 }
 
 /**
  * @constructor
  * @param {!WebInspector.UISourceCode} uiSourceCode
  * @param {number} lineNumber
  * @param {number} columnNumber
  */
 WebInspector.UILocation = function(uiSourceCode, lineNumber, columnNumber)
@@ skipping 121 matching lines @@
      * @param {function(!Array.<!WebInspector.ContentProvider.SearchMatch>)} callback
      */
     searchInContent: function(query, caseSensitive, isRegex, callback)
     {
         callback([]);
     }
 }
 
 /**
  * @constructor
+ * @param {!WebInspector.UISourceCode} uiSourceCode
  * @param {!WebInspector.UISourceCode.Message.Level} level
  * @param {string} text
  * @param {number} lineNumber
  * @param {number=} columnNumber
  */
-WebInspector.UISourceCode.Message = function(level, text, lineNumber, columnNumber)
+WebInspector.UISourceCode.Message = function(uiSourceCode, level, text, lineNumber, columnNumber)
 {
+    this._uiSourceCode = uiSourceCode;
+    this._level = level;
     this._text = text;
-    this._level = level;
     this._lineNumber = lineNumber;
     this._columnNumber = columnNumber;
 }
 
 /**
  * @enum {string}
  */
 WebInspector.UISourceCode.Message.Level = {
     Error: "Error",
     Warning: "Warning"
 }
 
 WebInspector.UISourceCode.Message.prototype = {
     /**
-     * @return {string}
+     * @return {!WebInspector.UISourceCode}
      */
-    text: function()
+    uiSourceCode: function()
     {
-        return this._text;
+        return this._uiSourceCode;
     },
 
     /**
      * @return {!WebInspector.UISourceCode.Message.Level}
      */
     level: function()
     {
         return this._level;
     },
 
     /**
+     * @return {string}
+     */
+    text: function()
+    {
+        return this._text;
+    },
+
+    /**
      * @return {number}
      */
     lineNumber: function()
     {
         return this._lineNumber;
     },
 
     /**
      * @return {(number|undefined)}
      */
     columnNumber: function()
     {
         return this._columnNumber;
     },
 
     /**
      * @param {!WebInspector.UISourceCode.Message} another
      * @return {boolean}
      */
     isEqual: function(another)
     {
-        return this.text() === another.text() && this.level() === another.level() && this.lineNumber() === another.lineNumber() && this.columnNumber() === another.columnNumber();
+        return this._uiSourceCode === another._uiSourceCode && this.text() === another.text() && this.level() === another.level() && this.lineNumber() === another.lineNumber() && this.columnNumber() === another.columnNumber();
+    },
+
+    remove: function()
+    {
+        this._uiSourceCode.removeMessage(this);
     }
 }