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

third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.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 36 matching lines @@
     this._popoverHelper = new WebInspector.ObjectPopoverHelper(scriptsPanel.element,
         this._getPopoverAnchor.bind(this), this._resolveObjectForPopover.bind(this), this._onHidePopover.bind(this), true);
 
     this.textEditor.element.addEventListener("keydown", this._onKeyDown.bind(this), true);
 
     this.textEditor.addEventListener(WebInspector.CodeMirrorTextEditor.Events.GutterClick, this._handleGutterClick.bind(this), this);
 
     this._breakpointManager.addEventListener(WebInspector.BreakpointManager.Events.BreakpointAdded, this._breakpointAdded, this);
     this._breakpointManager.addEventListener(WebInspector.BreakpointManager.Events.BreakpointRemoved, this._breakpointRemoved, this);
 
-    WebInspector.presentationConsoleMessageHelper.addConsoleMessageEventListener(WebInspector.PresentationConsoleMessageHelper.Events.ConsoleMessageAdded, this._uiSourceCode, this._consoleMessageAdded, this);
-    WebInspector.presentationConsoleMessageHelper.addConsoleMessageEventListener(WebInspector.PresentationConsoleMessageHelper.Events.ConsoleMessageRemoved, this._uiSourceCode, this._consoleMessageRemoved, this);
-    WebInspector.presentationConsoleMessageHelper.addConsoleMessageEventListener(WebInspector.PresentationConsoleMessageHelper.Events.ConsoleMessagesCleared, this._uiSourceCode, this._consoleMessagesCleared, this);
     this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.SourceMappingChanged, this._onSourceMappingChanged, this);
     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.TitleChanged, this._showBlackboxInfobarIfNeeded, this);
 
     /** @type {!Map.<!WebInspector.Target, !WebInspector.ResourceScriptFile>}*/
     this._scriptFileForTarget = new Map();
     this._registerShortcuts();
     var targets = WebInspector.targetManager.targets();
     for (var i = 0; i < targets.length; ++i) {
@@ skipping 307 matching lines @@
 
             var warningLevel = WebInspector.Console.MessageLevel.Warning;
             if (!liveEditErrorData) {
                 if (liveEditError)
                     WebInspector.console.addMessage(WebInspector.UIString("LiveEdit failed: %s", liveEditError), warningLevel);
                 return;
             }
             var compileError = liveEditErrorData.compileError;
             if (compileError) {
                 var messageText = WebInspector.UIString("LiveEdit compile failed: %s", compileError.message);
-                var message = new WebInspector.UISourceCode.Message(WebInspector.UISourceCode.Message.Level.Error, messageText, compileError.lineNumber - 1, compileError.columnNumber + 1);
-                this.addMessageToSource(message);
+                this.uiSourceCode().addMessage(WebInspector.UISourceCode.Message.Level.Error, messageText, compileError.lineNumber - 1, compileError.columnNumber + 1);
             } else {
                 WebInspector.console.addMessage(WebInspector.UIString("Unknown LiveEdit error: %s; %s", JSON.stringify(liveEditErrorData), liveEditError), warningLevel);
             }
         }
 
         this._scriptsPanel.setIgnoreExecutionLineEvents(true);
         this._hasCommittedLiveEdit = true;
         var scriptFiles = this._scriptFileForTarget.valuesArray();
         for (var i = 0; i < scriptFiles.length; ++i)
             scriptFiles[i].commitLiveEdit(liveEditCallback.bind(this));
@@ skipping 532 matching lines @@
         if (uiLocation.uiSourceCode !== this._uiSourceCode)
             return;
         if (this._shouldIgnoreExternalBreakpointEvents())
             return;
 
         var remainingBreakpoint = this._breakpointManager.findBreakpointOnLine(this._uiSourceCode, uiLocation.lineNumber);
         if (!remainingBreakpoint && this.loaded)
             this._removeBreakpointDecoration(uiLocation.lineNumber);
     },
 
-    _consoleMessageAdded: function(event)
-    {
-        var message = /** @type {!WebInspector.PresentationConsoleMessage} */ (event.data);
-        if (this.loaded)
-            this.addMessageToSource(this._sourceFrameMessage(message));
-    },
-
-    _consoleMessageRemoved: function(event)
-    {
-        var message = /** @type {!WebInspector.PresentationConsoleMessage} */ (event.data);
-        if (this.loaded)
-            this.removeMessageFromSource(this._sourceFrameMessage(message));
-    },
-
-    /**
-     * @param {!WebInspector.PresentationConsoleMessage} message
-     * @return {!WebInspector.UISourceCode.Message}
-     */
-    _sourceFrameMessage: function(message)
-    {
-        return WebInspector.UISourceCodeFrame.uiMessageFromConsoleMessage(message.originalMessage, message.lineNumber(), message.columnNumber());
-    },
-
-    _consoleMessagesCleared: function(event)
-    {
-        this.clearMessages();
-    },
-
     /**
      * @param {!WebInspector.Event} event
      */
     _onSourceMappingChanged: function(event)
     {
         var data = /** @type {{target: !WebInspector.Target}} */ (event.data);
         this._updateScriptFile(data.target);
         this._updateLinesWithoutMappingHighlight();
     },
 
@@ skipping 30 matching lines @@
         this._updateDivergedInfobar();
 
         if (newScriptFile) {
             newScriptFile.addEventListener(WebInspector.ResourceScriptFile.Events.DidMergeToVM, this._didMergeToVM, this);
             newScriptFile.addEventListener(WebInspector.ResourceScriptFile.Events.DidDivergeFromVM, this._didDivergeFromVM, this);
             if (this.loaded)
                 newScriptFile.checkMapping();
         }
     },
 
+    /**
+     * @override
+     */
     onTextEditorContentLoaded: function()
     {
         WebInspector.UISourceCodeFrame.prototype.onTextEditorContentLoaded.call(this);
         if (this._executionLocation)
             this.setExecutionLocation(this._executionLocation);
 
         var breakpointLocations = this._breakpointManager.breakpointLocationsForUISourceCode(this._uiSourceCode);
         for (var i = 0; i < breakpointLocations.length; ++i)
             this._breakpointAdded({data:breakpointLocations[i]});
 
-        var messages = WebInspector.presentationConsoleMessageHelper.consoleMessages(this._uiSourceCode);
-        for (var message of messages)
-            this.addMessageToSource(this._sourceFrameMessage(message));
-
         var scriptFiles = this._scriptFileForTarget.valuesArray();
         for (var i = 0; i < scriptFiles.length; ++i)
             scriptFiles[i].checkMapping();
 
         this._updateLinesWithoutMappingHighlight();
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
@@ skipping 60 matching lines @@
      */
     _setBreakpoint: function(lineNumber, columnNumber, condition, enabled)
     {
         this._breakpointManager.setBreakpoint(this._uiSourceCode, lineNumber, columnNumber, condition, enabled);
     },
 
     dispose: function()
     {
         this._breakpointManager.removeEventListener(WebInspector.BreakpointManager.Events.BreakpointAdded, this._breakpointAdded, this);
         this._breakpointManager.removeEventListener(WebInspector.BreakpointManager.Events.BreakpointRemoved, this._breakpointRemoved, this);
-        WebInspector.presentationConsoleMessageHelper.removeConsoleMessageEventListener(WebInspector.PresentationConsoleMessageHelper.Events.ConsoleMessageAdded, this._uiSourceCode, this._consoleMessageAdded, this);
-        WebInspector.presentationConsoleMessageHelper.removeConsoleMessageEventListener(WebInspector.PresentationConsoleMessageHelper.Events.ConsoleMessageRemoved, this._uiSourceCode, this._consoleMessageRemoved, this);
-        WebInspector.presentationConsoleMessageHelper.removeConsoleMessageEventListener(WebInspector.PresentationConsoleMessageHelper.Events.ConsoleMessagesCleared, this._uiSourceCode, this._consoleMessagesCleared, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.SourceMappingChanged, this._onSourceMappingChanged, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyChanged, this._workingCopyChanged, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._workingCopyCommitted, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.TitleChanged, this._showBlackboxInfobarIfNeeded, this);
         WebInspector.moduleSetting("skipStackFramesPattern").removeChangeListener(this._showBlackboxInfobarIfNeeded, this);
         WebInspector.moduleSetting("skipContentScripts").removeChangeListener(this._showBlackboxInfobarIfNeeded, this);
         WebInspector.UISourceCodeFrame.prototype.dispose.call(this);
     },
 
     __proto__: WebInspector.UISourceCodeFrame.prototype
 }