⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 181610 in webkit


Ignore:
Timestamp:
Mar 16, 2015, 8:56:18 PM (11 years ago)
Author:
Nikita Vasilyev
Message:

Web Inspector: Rename ConsoleMessage and ConsoleMessageImpl to LegacyConsoleMessage and LegacyConsoleMessageImpl respectively
​https://bugs.webkit.org/show_bug.cgi?id=142712

As a first step of ConsoleMessage refactoring (​https://bugs.webkit.org/show_bug.cgi?id=142599):

  • Rename WebInspector.ConsoleMessage class to WebInspector.LegacyConsoleMessage
  • Rename WebInspector.ConsoleMessageImpl class to WebInspector.LegacyConsoleMessageImpl
  • Rename ConsoleMessage.js file to LegacyConsoleMessage.js
  • Rename ConsoleMessageImpl file to LegacyConsoleMessageImpl.js

Reviewed by Joseph Pecoraro.

  • UserInterface/Controllers/JavaScriptLogViewController.js:

(WebInspector.JavaScriptLogViewController.prototype._appendConsoleMessage):

  • UserInterface/Controllers/LogManager.js:

(WebInspector.LogManager.prototype.messageWasAdded):

  • UserInterface/Main.html:
  • UserInterface/Models/DefaultDashboard.js:

(WebInspector.DefaultDashboard.prototype._incrementConsoleMessageType):

  • UserInterface/Views/ConsoleCommandResult.js:

(WebInspector.ConsoleCommandResult):
(WebInspector.ConsoleCommandResult.prototype.toMessageElement):

  • UserInterface/Views/ConsoleGroup.js:

(WebInspector.ConsoleGroup.prototype.render):

  • UserInterface/Views/LegacyConsoleMessage.js: Renamed from Source/WebInspectorUI/UserInterface/Views/ConsoleMessage.js.

(WebInspector.LegacyConsoleMessage):
(WebInspector.LegacyConsoleMessage.prototype.isErrorOrWarning):
(WebInspector.LegacyConsoleMessage.prototype.updateRepeatCount):
(WebInspector.LegacyConsoleMessage.prototype.clone):
(WebInspector.LegacyConsoleMessage.create):

  • UserInterface/Views/LegacyConsoleMessageImpl.js: Renamed from Source/WebInspectorUI/UserInterface/Views/ConsoleMessageImpl.js.

(WebInspector.LegacyConsoleMessageImpl):
(WebInspector.LegacyConsoleMessageImpl.prototype._formatMessage):
(WebInspector.LegacyConsoleMessageImpl.prototype._shouldDumpStackTrace):
(WebInspector.LegacyConsoleMessageImpl.prototype._shouldHideURL):
(WebInspector.LegacyConsoleMessageImpl.prototype._firstNonNativeCallFrame):
(WebInspector.LegacyConsoleMessageImpl.prototype.get message):
(WebInspector.LegacyConsoleMessageImpl.prototype.get formattedMessage):
(WebInspector.LegacyConsoleMessageImpl.prototype._linkifyLocation):
(WebInspector.LegacyConsoleMessageImpl.prototype._linkifyCallFrame):
(WebInspector.LegacyConsoleMessageImpl.prototype.isErrorOrWarning):
(WebInspector.LegacyConsoleMessageImpl.prototype._format):
(WebInspector.LegacyConsoleMessageImpl.prototype._isExpandable):
(WebInspector.LegacyConsoleMessageImpl.prototype._formatParameter):
(WebInspector.LegacyConsoleMessageImpl.prototype._formatParameterAsValue):
(WebInspector.LegacyConsoleMessageImpl.prototype._formatParameterAsObject):
(WebInspector.LegacyConsoleMessageImpl.prototype._formatParameterAsString):
(WebInspector.LegacyConsoleMessageImpl.prototype._formatParameterAsNode):
(WebInspector.LegacyConsoleMessageImpl.prototype._formatParameterAsArray):
(WebInspector.LegacyConsoleMessageImpl.prototype._rootPropertyPathForObject):
(WebInspector.LegacyConsoleMessageImpl.prototype._userProvidedColumnNames):
(WebInspector.LegacyConsoleMessageImpl.prototype._formatParameterAsTable):
(WebInspector.LegacyConsoleMessageImpl.prototype.):
(WebInspector.LegacyConsoleMessageImpl.prototype.stringFormatter):
(WebInspector.LegacyConsoleMessageImpl.prototype.floatFormatter):
(WebInspector.LegacyConsoleMessageImpl.prototype.integerFormatter):
(WebInspector.LegacyConsoleMessageImpl.prototype.styleFormatter):
(WebInspector.LegacyConsoleMessageImpl.prototype.isWhitelistedProperty):
(WebInspector.LegacyConsoleMessageImpl.prototype.append):
(WebInspector.LegacyConsoleMessageImpl.prototype._formatWithSubstitutionString):
(WebInspector.LegacyConsoleMessageImpl.prototype.decorateMessageElement):
(WebInspector.LegacyConsoleMessageImpl.prototype.toMessageElement):
(WebInspector.LegacyConsoleMessageImpl.prototype._populateStackTraceTreeElement):
(WebInspector.LegacyConsoleMessageImpl.prototype.updateRepeatCount):
(WebInspector.LegacyConsoleMessageImpl.prototype.toString):
(WebInspector.LegacyConsoleMessageImpl.prototype.get text):
(WebInspector.LegacyConsoleMessageImpl.prototype.isEqual):
(WebInspector.LegacyConsoleMessageImpl.prototype.get stackTrace):
(WebInspector.LegacyConsoleMessageImpl.prototype.clone):
(WebInspector.LegacyConsoleMessageImpl.prototype.get levelString):
(WebInspector.LegacyConsoleMessageImpl.prototype.get clipboardPrefixString):
(WebInspector.LegacyConsoleMessageImpl.prototype.toClipboardString):

  • UserInterface/Views/LogContentView.js:

(WebInspector.LogContentView.prototype.didAppendConsoleMessage):
(WebInspector.LogContentView.prototype._messageAdded):
(WebInspector.LogContentView.prototype._filterMessages):
(WebInspector.LogContentView.prototype._reappendProvisionalMessages):

  • WebInspectorUI.vcxproj/WebInspectorUI.vcxproj:
  • WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters:
Location:
trunk/Source/WebInspectorUI
Files:
10 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebInspectorUI/ChangeLog

    r181567 r181610  
     12015-03-16  Nikita Vasilyev  <nvasilyev@apple.com>
     2
     3        Web Inspector: Rename ConsoleMessage and ConsoleMessageImpl to LegacyConsoleMessage and LegacyConsoleMessageImpl respectively
     4        https://bugs.webkit.org/show_bug.cgi?id=142712
     5
     6        As a first step of ConsoleMessage refactoring (https://bugs.webkit.org/show_bug.cgi?id=142599):
     7
     8          - Rename WebInspector.ConsoleMessage class to WebInspector.LegacyConsoleMessage
     9          - Rename WebInspector.ConsoleMessageImpl class to WebInspector.LegacyConsoleMessageImpl
     10          - Rename ConsoleMessage.js file to LegacyConsoleMessage.js
     11          - Rename ConsoleMessageImpl file to LegacyConsoleMessageImpl.js
     12
     13        Reviewed by Joseph Pecoraro.
     14
     15        * UserInterface/Controllers/JavaScriptLogViewController.js:
     16        (WebInspector.JavaScriptLogViewController.prototype._appendConsoleMessage):
     17        * UserInterface/Controllers/LogManager.js:
     18        (WebInspector.LogManager.prototype.messageWasAdded):
     19        * UserInterface/Main.html:
     20        * UserInterface/Models/DefaultDashboard.js:
     21        (WebInspector.DefaultDashboard.prototype._incrementConsoleMessageType):
     22        * UserInterface/Views/ConsoleCommandResult.js:
     23        (WebInspector.ConsoleCommandResult):
     24        (WebInspector.ConsoleCommandResult.prototype.toMessageElement):
     25        * UserInterface/Views/ConsoleGroup.js:
     26        (WebInspector.ConsoleGroup.prototype.render):
     27        * UserInterface/Views/LegacyConsoleMessage.js: Renamed from Source/WebInspectorUI/UserInterface/Views/ConsoleMessage.js.
     28        (WebInspector.LegacyConsoleMessage):
     29        (WebInspector.LegacyConsoleMessage.prototype.isErrorOrWarning):
     30        (WebInspector.LegacyConsoleMessage.prototype.updateRepeatCount):
     31        (WebInspector.LegacyConsoleMessage.prototype.clone):
     32        (WebInspector.LegacyConsoleMessage.create):
     33        * UserInterface/Views/LegacyConsoleMessageImpl.js: Renamed from Source/WebInspectorUI/UserInterface/Views/ConsoleMessageImpl.js.
     34        (WebInspector.LegacyConsoleMessageImpl):
     35        (WebInspector.LegacyConsoleMessageImpl.prototype._formatMessage):
     36        (WebInspector.LegacyConsoleMessageImpl.prototype._shouldDumpStackTrace):
     37        (WebInspector.LegacyConsoleMessageImpl.prototype._shouldHideURL):
     38        (WebInspector.LegacyConsoleMessageImpl.prototype._firstNonNativeCallFrame):
     39        (WebInspector.LegacyConsoleMessageImpl.prototype.get message):
     40        (WebInspector.LegacyConsoleMessageImpl.prototype.get formattedMessage):
     41        (WebInspector.LegacyConsoleMessageImpl.prototype._linkifyLocation):
     42        (WebInspector.LegacyConsoleMessageImpl.prototype._linkifyCallFrame):
     43        (WebInspector.LegacyConsoleMessageImpl.prototype.isErrorOrWarning):
     44        (WebInspector.LegacyConsoleMessageImpl.prototype._format):
     45        (WebInspector.LegacyConsoleMessageImpl.prototype._isExpandable):
     46        (WebInspector.LegacyConsoleMessageImpl.prototype._formatParameter):
     47        (WebInspector.LegacyConsoleMessageImpl.prototype._formatParameterAsValue):
     48        (WebInspector.LegacyConsoleMessageImpl.prototype._formatParameterAsObject):
     49        (WebInspector.LegacyConsoleMessageImpl.prototype._formatParameterAsString):
     50        (WebInspector.LegacyConsoleMessageImpl.prototype._formatParameterAsNode):
     51        (WebInspector.LegacyConsoleMessageImpl.prototype._formatParameterAsArray):
     52        (WebInspector.LegacyConsoleMessageImpl.prototype._rootPropertyPathForObject):
     53        (WebInspector.LegacyConsoleMessageImpl.prototype._userProvidedColumnNames):
     54        (WebInspector.LegacyConsoleMessageImpl.prototype._formatParameterAsTable):
     55        (WebInspector.LegacyConsoleMessageImpl.prototype.):
     56        (WebInspector.LegacyConsoleMessageImpl.prototype.stringFormatter):
     57        (WebInspector.LegacyConsoleMessageImpl.prototype.floatFormatter):
     58        (WebInspector.LegacyConsoleMessageImpl.prototype.integerFormatter):
     59        (WebInspector.LegacyConsoleMessageImpl.prototype.styleFormatter):
     60        (WebInspector.LegacyConsoleMessageImpl.prototype.isWhitelistedProperty):
     61        (WebInspector.LegacyConsoleMessageImpl.prototype.append):
     62        (WebInspector.LegacyConsoleMessageImpl.prototype._formatWithSubstitutionString):
     63        (WebInspector.LegacyConsoleMessageImpl.prototype.decorateMessageElement):
     64        (WebInspector.LegacyConsoleMessageImpl.prototype.toMessageElement):
     65        (WebInspector.LegacyConsoleMessageImpl.prototype._populateStackTraceTreeElement):
     66        (WebInspector.LegacyConsoleMessageImpl.prototype.updateRepeatCount):
     67        (WebInspector.LegacyConsoleMessageImpl.prototype.toString):
     68        (WebInspector.LegacyConsoleMessageImpl.prototype.get text):
     69        (WebInspector.LegacyConsoleMessageImpl.prototype.isEqual):
     70        (WebInspector.LegacyConsoleMessageImpl.prototype.get stackTrace):
     71        (WebInspector.LegacyConsoleMessageImpl.prototype.clone):
     72        (WebInspector.LegacyConsoleMessageImpl.prototype.get levelString):
     73        (WebInspector.LegacyConsoleMessageImpl.prototype.get clipboardPrefixString):
     74        (WebInspector.LegacyConsoleMessageImpl.prototype.toClipboardString):
     75        * UserInterface/Views/LogContentView.js:
     76        (WebInspector.LogContentView.prototype.didAppendConsoleMessage):
     77        (WebInspector.LogContentView.prototype._messageAdded):
     78        (WebInspector.LogContentView.prototype._filterMessages):
     79        (WebInspector.LogContentView.prototype._reappendProvisionalMessages):
     80        * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj:
     81        * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters:
     82
    1832015-03-16  Commit Queue  <commit-queue@webkit.org>
    284

  • trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js

    r181567 r181610  
    277277            this._previousMessage = msg;
    278278
    279         if (msg.type === WebInspector.ConsoleMessage.MessageType.EndGroup) {
     279        if (msg.type === WebInspector.LegacyConsoleMessage.MessageType.EndGroup) {
    280280            var parentGroup = this._currentConsoleGroup.parentGroup;
    281281            if (parentGroup)
    282282                this._currentConsoleGroup = parentGroup;
    283283        } else {
    284             if (msg.type === WebInspector.ConsoleMessage.MessageType.StartGroup || msg.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed) {
     284            if (msg.type === WebInspector.LegacyConsoleMessage.MessageType.StartGroup || msg.type === WebInspector.LegacyConsoleMessage.MessageType.StartGroupCollapsed) {
    285285                var group = new WebInspector.ConsoleGroup(this._currentConsoleGroup);
    286286                var groupElement = group.render(msg);
    … …  
    291291        }
    292292
    293         if (msg.type === WebInspector.ConsoleMessage.MessageType.Result || wasScrolledToBottom)
     293        if (msg.type === WebInspector.LegacyConsoleMessage.MessageType.Result || wasScrolledToBottom)
    294294            this.scrollToBottom();
    295295

  • trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js

    r181567 r181610  
    4949
    5050        // FIXME: Pass a request. We need a way to get it from the request ID.
    51         var consoleMessage = WebInspector.ConsoleMessage.create(source, level, text, type, url, line, column, repeatCount, parameters, stackTrace, null);
     51        var consoleMessage = WebInspector.LegacyConsoleMessage.create(source, level, text, type, url, line, column, repeatCount, parameters, stackTrace, null);
    5252
    5353        this.dispatchEventToListeners(WebInspector.LogManager.Event.MessageAdded, {message: consoleMessage});

  • trunk/Source/WebInspectorUI/UserInterface/Main.html

    r181567 r181610  
    292292    <script src="Models/UnitBezier.js"></script>
    293293
    294     <script src="Views/ConsoleMessage.js"></script>
     294    <script src="Views/LegacyConsoleMessage.js"></script>
    295295    <script src="Views/ContentView.js"></script>
    296296    <script src="Views/DataGrid.js"></script>
    … …  
    307307
    308308    <script src="Views/ButtonNavigationItem.js"></script>
    309     <script src="Views/ConsoleMessageImpl.js"></script>
     309    <script src="Views/LegacyConsoleMessageImpl.js"></script>
    310310    <script src="Views/DOMTreeContentView.js"></script>
    311311    <script src="Views/DetailsSidebarPanel.js"></script>

  • trunk/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js

    r181567 r181610  
    250250    {
    251251        switch (type) {
    252         case WebInspector.ConsoleMessage.MessageLevel.Log:
     252        case WebInspector.LegacyConsoleMessage.MessageLevel.Log:
    253253            this.logs += increment;
    254254            break;
    255         case WebInspector.ConsoleMessage.MessageLevel.Warning:
     255        case WebInspector.LegacyConsoleMessage.MessageLevel.Warning:
    256256            this.issues += increment;
    257257            break;
    258         case WebInspector.ConsoleMessage.MessageLevel.Error:
     258        case WebInspector.LegacyConsoleMessage.MessageLevel.Error:
    259259            this.errors += increment;
    260260            break;

  • trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleCommandResult.js

    r181567 r181610  
    3030WebInspector.ConsoleCommandResult = function(result, wasThrown, originatingCommand, savedResultIndex)
    3131{
    32     var level = (wasThrown ? WebInspector.ConsoleMessage.MessageLevel.Error : WebInspector.ConsoleMessage.MessageLevel.Log);
     32    var level = (wasThrown ? WebInspector.LegacyConsoleMessage.MessageLevel.Error : WebInspector.LegacyConsoleMessage.MessageLevel.Log);
    3333    this.originatingCommand = originatingCommand;
    3434    this.savedResultIndex = savedResultIndex;
    … …  
    3737        WebInspector.ConsoleCommandResult.maximumSavedResultIndex = this.savedResultIndex;
    3838
    39     WebInspector.ConsoleMessageImpl.call(this, WebInspector.ConsoleMessage.MessageSource.JS, level, "", null, WebInspector.ConsoleMessage.MessageType.Result, undefined, undefined, undefined, undefined, [result]);
     39    WebInspector.LegacyConsoleMessageImpl.call(this, WebInspector.LegacyConsoleMessage.MessageSource.JS, level, "", null, WebInspector.LegacyConsoleMessage.MessageType.Result, undefined, undefined, undefined, undefined, [result]);
    4040};
    4141
    … …  
    5656    toMessageElement: function()
    5757    {
    58         var element = WebInspector.ConsoleMessageImpl.prototype.toMessageElement.call(this);
     58        var element = WebInspector.LegacyConsoleMessageImpl.prototype.toMessageElement.call(this);
    5959        element.classList.add("console-user-command-result");
    6060        if (!element.getAttribute("data-labelprefix"))
    … …  
    6969};
    7070
    71 WebInspector.ConsoleCommandResult.prototype.__proto__ = WebInspector.ConsoleMessageImpl.prototype;
     71WebInspector.ConsoleCommandResult.prototype.__proto__ = WebInspector.LegacyConsoleMessageImpl.prototype;

  • trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleGroup.js

    r181567 r181610  
    5151        titleElement.addEventListener("click", this._titleClicked.bind(this));
    5252        titleElement.addEventListener("mousedown", this._titleMouseDown.bind(this));
    53         if (groupElement && message.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed)
     53        if (groupElement && message.type === WebInspector.LegacyConsoleMessage.MessageType.StartGroupCollapsed)
    5454            groupElement.classList.add("collapsed");
    5555

  • trunk/Source/WebInspectorUI/UserInterface/Views/LegacyConsoleMessage.js

    r181609 r181610  
    2929 */
    3030
    31 WebInspector.ConsoleMessage = function(source, level, url, line, column, repeatCount)
     31WebInspector.LegacyConsoleMessage = function(source, level, url, line, column, repeatCount)
    3232{
    3333    this.source = source;
    … …  
    4343};
    4444
    45 WebInspector.ConsoleMessage.prototype = {
     45WebInspector.LegacyConsoleMessage.prototype = {
    4646    isErrorOrWarning: function()
    4747    {
    48         return (this.level === WebInspector.ConsoleMessage.MessageLevel.Warning || this.level === WebInspector.ConsoleMessage.MessageLevel.Error);
     48        return (this.level === WebInspector.LegacyConsoleMessage.MessageLevel.Warning || this.level === WebInspector.LegacyConsoleMessage.MessageLevel.Error);
    4949    },
    5050
    … …  
    6060};
    6161
    62 WebInspector.ConsoleMessage.create = function(source, level, message, type, url, line, column, repeatCount, parameters, stackTrace, request)
     62WebInspector.LegacyConsoleMessage.create = function(source, level, message, type, url, line, column, repeatCount, parameters, stackTrace, request)
    6363{
    64     return new WebInspector.ConsoleMessageImpl(source, level, message, null, type, url, line, column, repeatCount, parameters, stackTrace, request);
     64    return new WebInspector.LegacyConsoleMessageImpl(source, level, message, null, type, url, line, column, repeatCount, parameters, stackTrace, request);
    6565};
    6666
    6767// FIXME: Switch to ConsoleAgent.ConsoleMessageSource.
    68 WebInspector.ConsoleMessage.MessageSource = {
     68WebInspector.LegacyConsoleMessage.MessageSource = {
    6969    HTML: "html",
    7070    XML: "xml",
    … …  
    7676
    7777// FIXME: Switch to ConsoleAgent.ConsoleMessageType.
    78 WebInspector.ConsoleMessage.MessageType = {
     78WebInspector.LegacyConsoleMessage.MessageType = {
    7979    Log: "log",
    8080    Dir: "dir",
    … …  
    9090
    9191// FIXME: Switch to ConsoleAgent.ConsoleMessageLevel.
    92 WebInspector.ConsoleMessage.MessageLevel = {
     92WebInspector.LegacyConsoleMessage.MessageLevel = {
    9393    Tip: "tip",
    9494    Log: "log",

  • trunk/Source/WebInspectorUI/UserInterface/Views/LegacyConsoleMessageImpl.js

    r181609 r181610  
    2929 */
    3030
    31 WebInspector.ConsoleMessageImpl = function(source, level, message, linkifier, type, url, line, column, repeatCount, parameters, stackTrace, request)
     31WebInspector.LegacyConsoleMessageImpl = function(source, level, message, linkifier, type, url, line, column, repeatCount, parameters, stackTrace, request)
    3232{
    33     WebInspector.ConsoleMessage.call(this, source, level, url, line, column, repeatCount);
     33    WebInspector.LegacyConsoleMessage.call(this, source, level, url, line, column, repeatCount);
    3434
    3535    this._linkifier = linkifier;
    36     this.type = type || WebInspector.ConsoleMessage.MessageType.Log;
     36    this.type = type || WebInspector.LegacyConsoleMessage.MessageType.Log;
    3737    this._messageText = message;
    3838    this._parameters = parameters;
    … …  
    5353};
    5454
    55 WebInspector.ConsoleMessageImpl.prototype = {
     55WebInspector.LegacyConsoleMessageImpl.prototype = {
    5656
    5757    enforcesClipboardPrefixString: true,
    … …  
    6363
    6464        var messageText;
    65         if (this.source === WebInspector.ConsoleMessage.MessageSource.ConsoleAPI) {
     65        if (this.source === WebInspector.LegacyConsoleMessage.MessageSource.ConsoleAPI) {
    6666            switch (this.type) {
    67                 case WebInspector.ConsoleMessage.MessageType.Trace:
     67                case WebInspector.LegacyConsoleMessage.MessageType.Trace:
    6868                    messageText = document.createTextNode("console.trace()");
    6969                    break;
    70                 case WebInspector.ConsoleMessage.MessageType.Assert:
     70                case WebInspector.LegacyConsoleMessage.MessageType.Assert:
    7171                    var args = [WebInspector.UIString("Assertion failed:")];
    7272                    if (this._parameters)
    … …  
    7474                    messageText = this._format(args);
    7575                    break;
    76                 case WebInspector.ConsoleMessage.MessageType.Dir:
     76                case WebInspector.LegacyConsoleMessage.MessageType.Dir:
    7777                    var obj = this._parameters ? this._parameters[0] : undefined;
    7878                    var args = ["%O", obj];
    … …  
    8383                    messageText = this._format(args);
    8484            }
    85         } else if (this.source === WebInspector.ConsoleMessage.MessageSource.Network) {
     85        } else if (this.source === WebInspector.LegacyConsoleMessage.MessageSource.Network) {
    8686            if (this._request) {
    8787                this._stackTrace = this._request.stackTrace;
    … …  
    9191                }
    9292                messageText = document.createElement("span");
    93                 if (this.level === WebInspector.ConsoleMessage.MessageLevel.Error) {
     93                if (this.level === WebInspector.LegacyConsoleMessage.MessageLevel.Error) {
    9494                    messageText.appendChild(document.createTextNode(this._request.requestMethod + " "));
    9595                    messageText.appendChild(WebInspector.linkifyRequestAsNode(this._request));
    … …  
    114114        }
    115115
    116         if (this.source !== WebInspector.ConsoleMessage.MessageSource.Network || this._request) {
     116        if (this.source !== WebInspector.LegacyConsoleMessage.MessageSource.Network || this._request) {
    117117            var firstNonNativeCallFrame = this._firstNonNativeCallFrame();
    118118            if (firstNonNativeCallFrame) {
    … …  
    146146            content.treeElementForTest = root;
    147147            treeOutline.appendChild(root);
    148             if (this.type === WebInspector.ConsoleMessage.MessageType.Trace)
     148            if (this.type === WebInspector.LegacyConsoleMessage.MessageType.Trace)
    149149                root.expand();
    150150
    … …  
    159159    _shouldDumpStackTrace: function()
    160160    {
    161         return !!this._stackTrace && this._stackTrace.length && (this.source === WebInspector.ConsoleMessage.MessageSource.Network || this.level === WebInspector.ConsoleMessage.MessageLevel.Error || this.type === WebInspector.ConsoleMessage.MessageType.Trace);
     161        return !!this._stackTrace && this._stackTrace.length && (this.source === WebInspector.LegacyConsoleMessage.MessageSource.Network || this.level === WebInspector.LegacyConsoleMessage.MessageLevel.Error || this.type === WebInspector.LegacyConsoleMessage.MessageType.Trace);
    162162    },
    163163
    … …  
    212212    isErrorOrWarning: function()
    213213    {
    214         return (this.level === WebInspector.ConsoleMessage.MessageLevel.Warning || this.level === WebInspector.ConsoleMessage.MessageLevel.Error);
     214        return (this.level === WebInspector.LegacyConsoleMessage.MessageLevel.Warning || this.level === WebInspector.LegacyConsoleMessage.MessageLevel.Error);
    215215    },
    216216
    … …  
    236236
    237237        // There can be string log and string eval result. We distinguish between them based on message type.
    238         var shouldFormatMessage = WebInspector.RemoteObject.type(parameters[0]) === "string" && this.type !== WebInspector.ConsoleMessage.MessageType.Result;
     238        var shouldFormatMessage = WebInspector.RemoteObject.type(parameters[0]) === "string" && this.type !== WebInspector.LegacyConsoleMessage.MessageType.Result;
    239239
    240240        if (shouldFormatMessage) {
    … …  
    246246        }
    247247
    248         if (this.type === WebInspector.ConsoleMessage.MessageType.Table) {
     248        if (this.type === WebInspector.LegacyConsoleMessage.MessageType.Table) {
    249249            formattedResult.appendChild(this._formatParameterAsTable(parameters));
    250250            return formattedResult;
    … …  
    562562
    563563        switch (this.level) {
    564             case WebInspector.ConsoleMessage.MessageLevel.Tip:
     564            case WebInspector.LegacyConsoleMessage.MessageLevel.Tip:
    565565                element.classList.add("console-tip-level");
    566566                element.setAttribute("data-labelprefix", WebInspector.UIString("Tip: "));
    567567                break;
    568             case WebInspector.ConsoleMessage.MessageLevel.Log:
     568            case WebInspector.LegacyConsoleMessage.MessageLevel.Log:
    569569                element.classList.add("console-log-level");
    570570                element.setAttribute("data-labelprefix", WebInspector.UIString("Log: "));
    571571                break;
    572             case WebInspector.ConsoleMessage.MessageLevel.Debug:
     572            case WebInspector.LegacyConsoleMessage.MessageLevel.Debug:
    573573                element.classList.add("console-debug-level");
    574574                element.setAttribute("data-labelprefix", WebInspector.UIString("Debug: "));
    575575                break;
    576             case WebInspector.ConsoleMessage.MessageLevel.Warning:
     576            case WebInspector.LegacyConsoleMessage.MessageLevel.Warning:
    577577                element.classList.add("console-warning-level");
    578578                element.setAttribute("data-labelprefix", WebInspector.UIString("Warning: "));
    579579                break;
    580             case WebInspector.ConsoleMessage.MessageLevel.Error:
     580            case WebInspector.LegacyConsoleMessage.MessageLevel.Error:
    581581                element.classList.add("console-error-level");
    582582                element.setAttribute("data-labelprefix", WebInspector.UIString("Error: "));
    … …  
    584584        }
    585585
    586         if (this.type === WebInspector.ConsoleMessage.MessageType.StartGroup || this.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed)
     586        if (this.type === WebInspector.LegacyConsoleMessage.MessageType.StartGroup || this.type === WebInspector.LegacyConsoleMessage.MessageType.StartGroupCollapsed)
    587587            element.classList.add("console-group-title");
    588588
    … …  
    641641        var sourceString;
    642642        switch (this.source) {
    643             case WebInspector.ConsoleMessage.MessageSource.HTML:
     643            case WebInspector.LegacyConsoleMessage.MessageSource.HTML:
    644644                sourceString = "HTML";
    645645                break;
    646             case WebInspector.ConsoleMessage.MessageSource.XML:
     646            case WebInspector.LegacyConsoleMessage.MessageSource.XML:
    647647                sourceString = "XML";
    648648                break;
    649             case WebInspector.ConsoleMessage.MessageSource.JS:
     649            case WebInspector.LegacyConsoleMessage.MessageSource.JS:
    650650                sourceString = "JS";
    651651                break;
    652             case WebInspector.ConsoleMessage.MessageSource.Network:
     652            case WebInspector.LegacyConsoleMessage.MessageSource.Network:
    653653                sourceString = "Network";
    654654                break;
    655             case WebInspector.ConsoleMessage.MessageSource.ConsoleAPI:
     655            case WebInspector.LegacyConsoleMessage.MessageSource.ConsoleAPI:
    656656                sourceString = "ConsoleAPI";
    657657                break;
    658             case WebInspector.ConsoleMessage.MessageSource.Other:
     658            case WebInspector.LegacyConsoleMessage.MessageSource.Other:
    659659                sourceString = "Other";
    660660                break;
    … …  
    663663        var typeString;
    664664        switch (this.type) {
    665             case WebInspector.ConsoleMessage.MessageType.Log:
     665            case WebInspector.LegacyConsoleMessage.MessageType.Log:
    666666                typeString = "Log";
    667667                break;
    668             case WebInspector.ConsoleMessage.MessageType.Dir:
     668            case WebInspector.LegacyConsoleMessage.MessageType.Dir:
    669669                typeString = "Dir";
    670670                break;
    671             case WebInspector.ConsoleMessage.MessageType.DirXML:
     671            case WebInspector.LegacyConsoleMessage.MessageType.DirXML:
    672672                typeString = "Dir XML";
    673673                break;
    674             case WebInspector.ConsoleMessage.MessageType.Trace:
     674            case WebInspector.LegacyConsoleMessage.MessageType.Trace:
    675675                typeString = "Trace";
    676676                break;
    677             case WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed:
    678             case WebInspector.ConsoleMessage.MessageType.StartGroup:
     677            case WebInspector.LegacyConsoleMessage.MessageType.StartGroupCollapsed:
     678            case WebInspector.LegacyConsoleMessage.MessageType.StartGroup:
    679679                typeString = "Start Group";
    680680                break;
    681             case WebInspector.ConsoleMessage.MessageType.EndGroup:
     681            case WebInspector.LegacyConsoleMessage.MessageType.EndGroup:
    682682                typeString = "End Group";
    683683                break;
    684             case WebInspector.ConsoleMessage.MessageType.Assert:
     684            case WebInspector.LegacyConsoleMessage.MessageType.Assert:
    685685                typeString = "Assert";
    686686                break;
    687             case WebInspector.ConsoleMessage.MessageType.Result:
     687            case WebInspector.LegacyConsoleMessage.MessageType.Result:
    688688                typeString = "Result";
    689689                break;
    … …  
    733733    clone: function()
    734734    {
    735         return WebInspector.ConsoleMessage.create(this.source, this.level, this._messageText, this.type, this.url, this.line, this.column, this.repeatCount, this._parameters, this._stackTrace, this._request);
     735        return WebInspector.LegacyConsoleMessage.create(this.source, this.level, this._messageText, this.type, this.url, this.line, this.column, this.repeatCount, this._parameters, this._stackTrace, this._request);
    736736    },
    737737
    … …  
    739739    {
    740740        switch (this.level) {
    741             case WebInspector.ConsoleMessage.MessageLevel.Tip:
     741            case WebInspector.LegacyConsoleMessage.MessageLevel.Tip:
    742742                return "Tip";
    743             case WebInspector.ConsoleMessage.MessageLevel.Log:
     743            case WebInspector.LegacyConsoleMessage.MessageLevel.Log:
    744744                return "Log";
    745             case WebInspector.ConsoleMessage.MessageLevel.Warning:
     745            case WebInspector.LegacyConsoleMessage.MessageLevel.Warning:
    746746                return "Warning";
    747             case WebInspector.ConsoleMessage.MessageLevel.Debug:
     747            case WebInspector.LegacyConsoleMessage.MessageLevel.Debug:
    748748                return "Debug";
    749             case WebInspector.ConsoleMessage.MessageLevel.Error:
     749            case WebInspector.LegacyConsoleMessage.MessageLevel.Error:
    750750                return "Error";
    751751        }
    … …  
    765765            clipboardString = this._formattedMessage.querySelector("span").innerText;
    766766        else
    767             clipboardString = this.type === WebInspector.ConsoleMessage.MessageType.Trace ? "console.trace()" : this._message || this._messageText;
     767            clipboardString = this.type === WebInspector.LegacyConsoleMessage.MessageType.Trace ? "console.trace()" : this._message || this._messageText;
    768768
    769769        if (!isPrefixOptional || this.enforcesClipboardPrefixString)
    … …  
    799799};
    800800
    801 WebInspector.ConsoleMessageImpl.prototype.__proto__ = WebInspector.ConsoleMessage.prototype;
     801WebInspector.LegacyConsoleMessageImpl.prototype.__proto__ = WebInspector.LegacyConsoleMessage.prototype;

  • trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js

    r181567 r181610  
    177177
    178178        // Nest the message.
    179         if (message.type !== WebInspector.ConsoleMessage.MessageType.EndGroup) {
     179        if (message.type !== WebInspector.LegacyConsoleMessage.MessageType.EndGroup) {
    180180            var x = 16 * this._nestingLevel;
    181181            var messageElement = message.toMessageElement();
    … …  
    186186        // Update the nesting level.
    187187        switch (message.type) {
    188         case WebInspector.ConsoleMessage.MessageType.StartGroup:
    189         case WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed:
     188        case WebInspector.LegacyConsoleMessage.MessageType.StartGroup:
     189        case WebInspector.LegacyConsoleMessage.MessageType.StartGroupCollapsed:
    190190            ++this._nestingLevel;
    191191            break;
    192         case WebInspector.ConsoleMessage.MessageType.EndGroup:
     192        case WebInspector.LegacyConsoleMessage.MessageType.EndGroup:
    193193            --this._nestingLevel;
    194194            break;
    … …  
    203203        // We only auto show the console if the message is a result.
    204204        // This is when the user evaluated something directly in the prompt.
    205         if (message.type !== WebInspector.ConsoleMessage.MessageType.Result)
     205        if (message.type !== WebInspector.LegacyConsoleMessage.MessageType.Result)
    206206            return;
    207207
    … …  
    331331
    332332        var message = this._logViewController.appendConsoleMessage(event.data.message);
    333         if (message.type !== WebInspector.ConsoleMessage.MessageType.EndGroup)
     333        if (message.type !== WebInspector.LegacyConsoleMessage.MessageType.EndGroup)
    334334            this._filterMessages([message.toMessageElement()]);
    335335    },
    … …  
    678678            if (!visible) {
    679679                switch(message.message.level) {
    680                     case WebInspector.ConsoleMessage.MessageLevel.Warning:
     680                    case WebInspector.LegacyConsoleMessage.MessageLevel.Warning:
    681681                        visible = showsWarnings;
    682682                        break;
    683                     case WebInspector.ConsoleMessage.MessageLevel.Error:
     683                    case WebInspector.LegacyConsoleMessage.MessageLevel.Error:
    684684                        visible = showsErrors;
    685685                        break;
    686                     case WebInspector.ConsoleMessage.MessageLevel.Log:
    687                     case WebInspector.ConsoleMessage.MessageLevel.Debug:
     686                    case WebInspector.LegacyConsoleMessage.MessageLevel.Log:
     687                    case WebInspector.LegacyConsoleMessage.MessageLevel.Debug:
    688688                        visible = showsLogs;
    689689                        break;
    … …  
    997997        for (var provisionalMessage of this._provisionalMessages) {
    998998            var message = this._logViewController.appendConsoleMessage(provisionalMessage);
    999             if (message.type !== WebInspector.ConsoleMessage.MessageType.EndGroup)
     999            if (message.type !== WebInspector.LegacyConsoleMessage.MessageType.EndGroup)
    10001000                this._filterMessages([message.toMessageElement()]);
    10011001        }

  • trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj

    r181567 r181610  
    316316    <None Include="..\UserInterface\ConsoleCommandResult.js" />
    317317    <None Include="..\UserInterface\ConsoleGroup.js" />
    318     <None Include="..\UserInterface\ConsoleMessage.js" />
    319     <None Include="..\UserInterface\ConsoleMessageImpl.js" />
     318    <None Include="..\UserInterface\LegacyConsoleMessage.js" />
     319    <None Include="..\UserInterface\LegacyConsoleMessageImpl.js" />
    320320    <None Include="..\UserInterface\ConsoleObserver.js" />
    321321    <None Include="..\UserInterface\ConsolePrompt.css" />

  • trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters

    r181567 r181610  
    196196      <Filter>UserInterface</Filter>
    197197    </None>
    198     <None Include="..\UserInterface\ConsoleMessage.js">
    199       <Filter>UserInterface</Filter>
    200     </None>
    201     <None Include="..\UserInterface\ConsoleMessageImpl.js">
     198    <None Include="..\UserInterface\LegacyConsoleMessage.js">
     199      <Filter>UserInterface</Filter>
     200    </None>
     201    <None Include="..\UserInterface\LegacyConsoleMessageImpl.js">
    202202      <Filter>UserInterface</Filter>
    203203    </None>
Note: See TracChangeset for help on using the changeset viewer.