Changeset 96499 in webkit


Ignore:
Timestamp:
Oct 3, 2011 7:56:25 AM (13 years ago)
Author:
pfeldman@chromium.org
Message:

Source/WebCore: Web Inspector: more compilation fixes including making ConsoleMessage a part of console model.
​https://bugs.webkit.org/show_bug.cgi?id=69253

Reviewed by Yury Semikhatsky.

  • inspector/Inspector.json:
  • inspector/compile-front-end.sh:
  • inspector/front-end/ConsoleMessage.js:

(WebInspector.ConsoleMessage.create):
(WebInspector.ConsoleMessage.createTextMessage):
(WebInspector.ConsoleMessageImpl):

  • inspector/front-end/ConsoleModel.js:

(WebInspector.ConsoleModel.prototype._messageRepeatCountUpdated):
(WebInspector.ConsoleMessage.create):
(WebInspector.ConsoleMessage.createTextMessage):
(WebInspector.ConsoleDispatcher.prototype.messageAdded):

  • inspector/front-end/ConsoleView.js:

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

  • inspector/front-end/CookieParser.js:

(WebInspector.Cookie.prototype.get path):
(WebInspector.Cookie.prototype.get domain):
(WebInspector.Cookie.prototype.expires):

  • inspector/front-end/DOMAgent.js:
  • inspector/front-end/ExtensionServer.js:

(WebInspector.ExtensionServer.prototype._onAddConsoleMessage):

  • inspector/front-end/NetworkManager.js:

(WebInspector.NetworkDispatcher.prototype._updateResourceWithResponse):
(WebInspector.NetworkDispatcher.prototype.requestWillBeSent):
(WebInspector.NetworkDispatcher.prototype.requestServedFromMemoryCache):
(WebInspector.NetworkDispatcher.prototype.webSocketCreated):
(WebInspector.NetworkDispatcher.prototype._createResource):

  • inspector/front-end/Resource.js:

(WebInspector.Resource):
(WebInspector.Resource.prototype.setContent):
(WebInspector.Resource.prototype.searchInContent):

  • inspector/front-end/ResourceTreeModel.js:

(WebInspector.ResourceTreeModel.prototype._createResource):

  • inspector/front-end/externs.js:

(WebInspector.linkifyStringAsFragmentWithCustomLinkifier):
(WebInspector.extensionServer.notifyResourceContentCommitted):
(WebInspector.resourceForURL):
(WebInspector.debuggerPresentationModel.linkifyLocation):
(WebInspector.ObjectPropertiesSection):
(WebInspector.ElementsTreeOutline):

  • inspector/front-end/inspector.html:
  • inspector/front-end/inspector.js:

(WebInspector.log.logMessage):
(WebInspector.log):

  • inspector/generate-protocol-externs:

Tools: Unreviewed. Add Zoltán Árvai as contributor.

Patch by Csaba Osztrogonác <Csaba Osztrogonác> on 2011-10-03

  • Scripts/webkitpy/common/config/committers.py:
Location:
trunk
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r96498 r96499  
     12011-10-03  Pavel Feldman  <pfeldman@google.com>
     2
     3        Web Inspector: more compilation fixes including making ConsoleMessage a part of console model.
     4        https://bugs.webkit.org/show_bug.cgi?id=69253
     5
     6        Reviewed by Yury Semikhatsky.
     7
     8        * inspector/Inspector.json:
     9        * inspector/compile-front-end.sh:
     10        * inspector/front-end/ConsoleMessage.js:
     11        (WebInspector.ConsoleMessage.create):
     12        (WebInspector.ConsoleMessage.createTextMessage):
     13        (WebInspector.ConsoleMessageImpl):
     14        * inspector/front-end/ConsoleModel.js:
     15        (WebInspector.ConsoleModel.prototype._messageRepeatCountUpdated):
     16        (WebInspector.ConsoleMessage.create):
     17        (WebInspector.ConsoleMessage.createTextMessage):
     18        (WebInspector.ConsoleDispatcher.prototype.messageAdded):
     19        * inspector/front-end/ConsoleView.js:
     20        (WebInspector.ConsoleCommandResult):
     21        (WebInspector.ConsoleCommandResult.prototype.toMessageElement):
     22        * inspector/front-end/CookieParser.js:
     23        (WebInspector.Cookie.prototype.get path):
     24        (WebInspector.Cookie.prototype.get domain):
     25        (WebInspector.Cookie.prototype.expires):
     26        * inspector/front-end/DOMAgent.js:
     27        * inspector/front-end/ExtensionServer.js:
     28        (WebInspector.ExtensionServer.prototype._onAddConsoleMessage):
     29        * inspector/front-end/NetworkManager.js:
     30        (WebInspector.NetworkDispatcher.prototype._updateResourceWithResponse):
     31        (WebInspector.NetworkDispatcher.prototype.requestWillBeSent):
     32        (WebInspector.NetworkDispatcher.prototype.requestServedFromMemoryCache):
     33        (WebInspector.NetworkDispatcher.prototype.webSocketCreated):
     34        (WebInspector.NetworkDispatcher.prototype._createResource):
     35        * inspector/front-end/Resource.js:
     36        (WebInspector.Resource):
     37        (WebInspector.Resource.prototype.setContent):
     38        (WebInspector.Resource.prototype.searchInContent):
     39        * inspector/front-end/ResourceTreeModel.js:
     40        (WebInspector.ResourceTreeModel.prototype._createResource):
     41        * inspector/front-end/externs.js:
     42        (WebInspector.linkifyStringAsFragmentWithCustomLinkifier):
     43        (WebInspector.extensionServer.notifyResourceContentCommitted):
     44        (WebInspector.resourceForURL):
     45        (WebInspector.debuggerPresentationModel.linkifyLocation):
     46        (WebInspector.ObjectPropertiesSection):
     47        (WebInspector.ElementsTreeOutline):
     48        * inspector/front-end/inspector.html:
     49        * inspector/front-end/inspector.js:
     50        (WebInspector.log.logMessage):
     51        (WebInspector.log):
     52        * inspector/generate-protocol-externs:
     53
     542011-10-03  Pavel Feldman  <pfeldman@google.com>
     55
     56        Web Inspector: move console message formatting from ConsoleView.js into ConsoleMessage.js
     57        https://bugs.webkit.org/show_bug.cgi?id=69244
     58
     59        Reviewed by Yury Semikhatsky.
     60
     61        * inspector/front-end/ConsoleMessage.js:
     62        (WebInspector.ConsoleMessage):
     63        (WebInspector.ConsoleMessage.prototype._formatMessage.else.else.linkifier):
     64        (WebInspector.ConsoleMessage.prototype._formatMessage):
     65        (WebInspector.ConsoleMessage.prototype._format):
     66        (WebInspector.ConsoleMessage.prototype._formatParameter):
     67        (WebInspector.ConsoleMessage.prototype._formatParameterAsValue):
     68        (WebInspector.ConsoleMessage.prototype._formatParameterAsObject):
     69        (WebInspector.ConsoleMessage.prototype._formatParameterAsNode):
     70        (WebInspector.ConsoleMessage.prototype._formatParameterAsArray):
     71        (WebInspector.ConsoleMessage.prototype._formatParameterAsString):
     72        (WebInspector.ConsoleMessage.prototype._printArray):
     73        (WebInspector.ConsoleMessage.prototype._formatAsArrayEntry):
     74        (WebInspector.ConsoleMessage.prototype._formatWithSubstitutionString):
     75        * inspector/front-end/ConsoleView.js:
     76
    1772011-10-03  Dirk Schulze  <krit@webkit.org>
    278

  • trunk/Source/WebCore/inspector/Inspector.json

    r96491 r96499  
    549549            },
    550550            {
     551                "id": "WebSocketRequest",
     552                "type": "object",
     553                "description": "WebSocket request data.",
     554                "hidden": true,
     555                "properties": [
     556                    { "name": "requestKey3", "type": "string", "description": "HTTP response status text." },
     557                    { "name": "headers", "$ref": "Headers", "description": "HTTP response headers." }
     558                ]
     559            },
     560            {
     561                "id": "WebSocketResponse",
     562                "type": "object",
     563                "description": "WebSocket response data.",
     564                "hidden": true,
     565                "properties": [
     566                    { "name": "status", "type": "number", "description": "HTTP response status code." },
     567                    { "name": "statusText", "type": "string", "description": "HTTP response status text." },
     568                    { "name": "headers", "$ref": "Headers", "description": "HTTP response headers." },
     569                    { "name": "challengeResponse", "type": "string", "description": "Challenge response." }
     570                ]
     571            },
     572            {
    551573                "id": "CachedResource",
    552574                "type": "object",
    … …  
    701723                    { "name": "requestId", "$ref": "RequestId", "description": "Request identifier." },
    702724                    { "name": "timestamp", "$ref": "Timestamp", "description": "Timestamp." },
    703                     { "name": "request", "type": "object", "description": "WebSocket request data." }
     725                    { "name": "request", "$ref": "WebSocketRequest", "description": "WebSocket request data." }
    704726                ],
    705727                "hidden": true
    … …  
    711733                    { "name": "requestId", "$ref": "RequestId", "description": "Request identifier." },
    712734                    { "name": "timestamp", "$ref": "Timestamp", "description": "Timestamp." },
    713                     { "name": "response", "type": "object", "description": "WebSocket response data." }
     735                    { "name": "response", "$ref": "WebSocketResponse", "description": "WebSocket response data." }
    714736                ],
    715737                "hidden": true
    … …  
    933955                    { "name": "systemId", "type": "string", "optional": true, "description": "<code>DocumentType</code>'s systemId." },
    934956                    { "name": "internalSubset", "type": "string", "optional": true, "description": "<code>DocumentType</code>'s internalSubset." },
     957                    { "name": "xmlVersion", "type": "string", "optional": true, "description": "<code>Document</code>'s XML version in case of XML documents." },
    935958                    { "name": "name", "type": "string", "optional": true, "description": "<code>Attr</code>'s name." },
    936959                    { "name": "value", "type": "string", "optional": true, "description": "<code>Attr</code>'s value." }

  • trunk/Source/WebCore/inspector/compile-front-end.sh

    r96485 r96499  
    3535    --externs Source/WebCore/inspector/front-end/externs.js \
    3636    --externs Source/WebCore/inspector/front-end/protocol-externs.js \
    37     --module jsmodule_core:2 \
     37    --module jsmodule_util:2 \
    3838        --js Source/WebCore/inspector/front-end/utilities.js \
    3939        --js Source/WebCore/inspector/front-end/treeoutline.js \
    40     --module jsmodule_env:3 \
     40    --module jsmodule_host:1 \
     41        --js Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js \
     42    --module jsmodule_common:4:jsmodule_util,jsmodule_host \
     43        --js Source/WebCore/inspector/front-end/BinarySearch.js \
     44        --js Source/WebCore/inspector/front-end/Object.js \
    4145        --js Source/WebCore/inspector/front-end/Settings.js \
    4246        --js Source/WebCore/inspector/front-end/UserMetrics.js \
    43         --js Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js \
    44     --module jsmodule_sdk:7:jsmodule_core,jsmodule_env \
    45         --js Source/WebCore/inspector/front-end/BinarySearch.js \
     47    --module jsmodule_sdk:9:jsmodule_common,jsmodule_host \
    4648        --js Source/WebCore/inspector/front-end/DOMAgent.js \
    4749        --js Source/WebCore/inspector/front-end/DebuggerModel.js \
    48         --js Source/WebCore/inspector/front-end/Object.js \
    4950        --js Source/WebCore/inspector/front-end/Script.js \
    5051        --js Source/WebCore/inspector/front-end/RemoteObject.js \
    5152        --js Source/WebCore/inspector/front-end/ResourceCategory.js \
    52     --module jsmodule_misc:10:jsmodule_sdk \
     53        --js Source/WebCore/inspector/front-end/CookieParser.js \
     54        --js Source/WebCore/inspector/front-end/ConsoleModel.js \
     55        --js Source/WebCore/inspector/front-end/Resource.js \
     56        --js Source/WebCore/inspector/front-end/NetworkManager.js \
     57    --module jsmodule_misc:11:jsmodule_sdk \
    5358        --js Source/WebCore/inspector/front-end/Checkbox.js \
    5459        --js Source/WebCore/inspector/front-end/ContextMenu.js \
     60        --js Source/WebCore/inspector/front-end/ConsoleMessage.js \
    5561        --js Source/WebCore/inspector/front-end/KeyboardShortcut.js \
    5662        --js Source/WebCore/inspector/front-end/View.js \

  • trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js

    r96487 r96499  
    2929 */
    3030
     31WebInspector.ConsoleMessage.create = function(source, type, level, line, url, repeatCount, message, parameters, stackTrace, request)
     32{
     33    return new WebInspector.ConsoleMessageImpl(source, type, level, line, url, repeatCount, message, parameters, stackTrace, request);
     34}
     35
     36WebInspector.ConsoleMessage.createTextMessage = function(text, level)
     37{
     38    level = level || WebInspector.ConsoleMessage.MessageLevel.Log;
     39    return new WebInspector.ConsoleMessageImpl(WebInspector.ConsoleMessage.MessageSource.ConsoleAPI, WebInspector.ConsoleMessage.MessageType.Log, level, 0, null, 1, null, [text], null);
     40}
     41
    3142/**
    3243 * @constructor
    33  */
    34 WebInspector.ConsoleStackFrame = function()
    35 {
    36     this.url = undefined;
    37     this.functionName = undefined;
    38     this.lineNumber = undefined;
    39     this.columnNumber = undefined;
    40 }
    41 
    42 /**
    43  * @constructor
     44 * @extends {WebInspector.ConsoleMessage}
    4445 * @param {Array.<RuntimeAgent.RemoteObject>=} parameters
    4546 * @param {ConsoleAgent.StackTrace=} stackTrace
    4647 * @param {WebInspector.Resource=} request
    4748 */
    48 WebInspector.ConsoleMessage = function(source, type, level, line, url, repeatCount, message, parameters, stackTrace, request)
     49WebInspector.ConsoleMessageImpl = function(source, type, level, line, url, repeatCount, message, parameters, stackTrace, request)
    4950{
     51    WebInspector.ConsoleMessage.call();
     52
    5053    this.source = source;
    5154    this.type = type;
    … …  
    7578        "string": this._formatParameterAsString
    7679    };
    77 
    78     this._formatMessage();
    7980}
    8081
    81 WebInspector.ConsoleMessage.createTextMessage = function(text, level)
    82 {
    83     level = level || WebInspector.ConsoleMessage.MessageLevel.Log;
    84     return new WebInspector.ConsoleMessage(WebInspector.ConsoleMessage.MessageSource.ConsoleAPI, WebInspector.ConsoleMessage.MessageType.Log, level, 0, null, 1, null, [text], null);
    85 }
    86 
    87 WebInspector.ConsoleMessage.prototype = {
     82WebInspector.ConsoleMessageImpl.prototype = {
    8883    _formatMessage: function()
    8984    {
    … …  
    188183    },
    189184
     185    get formattedMessage()
     186    {
     187        if (!this._formattedMessage)
     188            this._formatMessage();
     189        return this._formattedMessage;
     190    },
     191
    190192    _linkifyLocation: function(url, lineNumber, columnNumber)
    191193    {
    … …  
    396398    clearHighlight: function()
    397399    {
     400        if (!this._formattedMessage)
     401            return;
     402
    398403        var highlightedMessage = this._formattedMessage;
    399404        delete this._formattedMessage;
    … …  
    404409    highlightSearchResults: function(regexObject)
    405410    {
     411        if (!this._formattedMessage)
     412            return;
     413
    406414        regexObject.lastIndex = 0;
    407415        var text = this.message;
    … …  
    454462            element.addStyleClass("console-group-title");
    455463
    456         element.appendChild(this._formattedMessage);
     464        element.appendChild(this.formattedMessage);
    457465
    458466        if (this.repeatCount > 1)
    459             this._updateRepeatCount();
     467            this.updateRepeatCount();
    460468
    461469        return element;
    … …  
    484492    },
    485493
    486     _updateRepeatCount: function() {
     494    updateRepeatCount: function() {
    487495        if (!this.repeatCountElement) {
    488496            this.repeatCountElement = document.createElement("span");
    … …  
    567575        }
    568576
    569         return sourceString + " " + typeString + " " + levelString + ": " + this._formattedMessage.textContent + "\n" + this.url + " line " + this.line;
     577        return sourceString + " " + typeString + " " + levelString + ": " + this.formattedMessage.textContent + "\n" + this.url + " line " + this.line;
    570578    },
    571579
    … …  
    609617}
    610618
    611 // Note: Keep these constants in sync with the ones in Console.h
    612 WebInspector.ConsoleMessage.MessageSource = {
    613     HTML: "html",
    614     XML: "xml",
    615     JS: "javascript",
    616     Network: "network",
    617     ConsoleAPI: "console-api",
    618     Other: "other"
    619 }
    620 
    621 WebInspector.ConsoleMessage.MessageType = {
    622     Log: "log",
    623     Dir: "dir",
    624     DirXML: "dirxml",
    625     Trace: "trace",
    626     StartGroup: "startGroup",
    627     StartGroupCollapsed: "startGroupCollapsed",
    628     EndGroup: "endGroup",
    629     Assert: "assert",
    630     Result: "result"
    631 }
    632 
    633 WebInspector.ConsoleMessage.MessageLevel = {
    634     Tip: "tip",
    635     Log: "log",
    636     Warning: "warning",
    637     Error: "error",
    638     Debug: "debug"
    639 }
     619WebInspector.ConsoleMessageImpl.prototype.__proto__ = WebInspector.ConsoleMessage.prototype;

  • trunk/Source/WebCore/inspector/front-end/ConsoleModel.js

    r95536 r96499  
    3131/**
    3232 * @constructor
     33 * @extends {WebInspector.Object}
    3334 */
    3435WebInspector.ConsoleModel = function()
    … …  
    5354            ConsoleAgent.setMonitoringXHREnabled(true);
    5455
    55         // There is no console agent for workers yet.
    56         if (!WebInspector.WorkerManager.isWorkerFrontend())
    57             ConsoleAgent.enable(this._setConsoleMessageExpiredCount.bind(this));
     56        ConsoleAgent.enable(this._setConsoleMessageExpiredCount.bind(this));
    5857    },
    5958
    … …  
    120119            msg.repeatCount = msg.repeatCount + msg.repeatDelta;
    121120            msg.totalRepeatCount = count;
    122             msg._updateRepeatCount();
     121            msg.updateRepeatCount();
    123122
    124123            this._incrementErrorWarningCount(msg);
    125124            this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.RepeatCountUpdated, msg);
    126125        } else {
    127             var msgCopy = new WebInspector.ConsoleMessage(msg.source, msg.type, msg.level, msg.line, msg.url, count - prevRepeatCount, msg._messageText, msg._parameters, msg._stackTrace, msg._request);
     126            var msgCopy = WebInspector.ConsoleMessage.create(msg.source, msg.type, msg.level, msg.line, msg.url, count - prevRepeatCount, msg._messageText, msg._parameters, msg._stackTrace, msg._request);
    128127            msgCopy.totalRepeatCount = count;
    129             msgCopy._formatMessage();
    130128            this.addMessage(msgCopy);
    131129        }
    … …  
    137135/**
    138136 * @constructor
     137 */
     138WebInspector.ConsoleMessage = function()
     139{
     140    this.repeatDelta = 0;
     141    this.repeatCount = 0;
     142    this._totalRepeatCount = 0;
     143}
     144
     145WebInspector.ConsoleMessage.prototype = {
     146    get totalRepeatCount()
     147    {
     148        return this._totalRepeatCount;
     149    },
     150
     151    set totalRepeatCount(totalRepeatCount)
     152    {
     153        this._totalRepeatCount = totalRepeatCount;
     154    },
     155
     156    updateRepeatCount: function()
     157    {
     158        // Implemented by concrete instances
     159    }
     160}
     161
     162/**
     163 * @param {string} source
     164 * @param {string} type
     165 * @param {string} level
     166 * @param {number} line
     167 * @param {string} url
     168 * @param {number} repeatCount
     169 * @param {string} message
     170 * @param {Array.<RuntimeAgent.RemoteObject>=} parameters
     171 * @param {ConsoleAgent.StackTrace=} stackTrace
     172 * @param {WebInspector.Resource=} request
     173 *
     174 * @return {WebInspector.ConsoleMessage}
     175 */
     176WebInspector.ConsoleMessage.create = function(source, type, level, line, url, repeatCount, message, parameters, stackTrace, request)
     177{
     178}
     179
     180/**
     181 * @param {string} text
     182 * @param {string} level
     183 * @return {WebInspector.ConsoleMessage}
     184 */
     185WebInspector.ConsoleMessage.createTextMessage = function(text, level)
     186{
     187}
     188
     189// Note: Keep these constants in sync with the ones in Console.h
     190WebInspector.ConsoleMessage.MessageSource = {
     191    HTML: "html",
     192    XML: "xml",
     193    JS: "javascript",
     194    Network: "network",
     195    ConsoleAPI: "console-api",
     196    Other: "other"
     197}
     198
     199WebInspector.ConsoleMessage.MessageType = {
     200    Log: "log",
     201    Dir: "dir",
     202    DirXML: "dirxml",
     203    Trace: "trace",
     204    StartGroup: "startGroup",
     205    StartGroupCollapsed: "startGroupCollapsed",
     206    EndGroup: "endGroup",
     207    Assert: "assert",
     208    Result: "result"
     209}
     210
     211WebInspector.ConsoleMessage.MessageLevel = {
     212    Tip: "tip",
     213    Log: "log",
     214    Warning: "warning",
     215    Error: "error",
     216    Debug: "debug"
     217}
     218
     219
     220/**
     221 * @constructor
    139222 * @implements {ConsoleAgent.Dispatcher}
    140223 * @param {WebInspector.ConsoleModel} console
    … …  
    148231    messageAdded: function(payload)
    149232    {
    150         var consoleMessage = new WebInspector.ConsoleMessage(
     233        var consoleMessage = WebInspector.ConsoleMessage.create(
    151234            payload.source,
    152235            payload.type,

  • trunk/Source/WebCore/inspector/front-end/ConsoleView.js

    r96487 r96499  
    702702    var level = (wasThrown ? WebInspector.ConsoleMessage.MessageLevel.Error : WebInspector.ConsoleMessage.MessageLevel.Log);
    703703    this.originatingCommand = originatingCommand;
    704     WebInspector.ConsoleMessage.call(this, WebInspector.ConsoleMessage.MessageSource.JS, WebInspector.ConsoleMessage.MessageType.Result, level, -1, null, 1, null, [result]);
     704    WebInspector.ConsoleMessageImpl.call(this, WebInspector.ConsoleMessage.MessageSource.JS, WebInspector.ConsoleMessage.MessageType.Result, level, -1, null, 1, null, [result]);
    705705}
    706706
    … …  
    708708    toMessageElement: function()
    709709    {
    710         var element = WebInspector.ConsoleMessage.prototype.toMessageElement.call(this);
     710        var element = WebInspector.ConsoleMessageImpl.prototype.toMessageElement.call(this);
    711711        element.addStyleClass("console-user-command-result");
    712712        return element;
    … …  
    714714}
    715715
    716 WebInspector.ConsoleCommandResult.prototype.__proto__ = WebInspector.ConsoleMessage.prototype;
     716WebInspector.ConsoleCommandResult.prototype.__proto__ = WebInspector.ConsoleMessageImpl.prototype;
    717717
    718718WebInspector.ConsoleGroup = function(parentGroup)

  • trunk/Source/WebCore/inspector/front-end/CookieParser.js

    r94754 r96499  
    186186    get path()
    187187    {
    188         return this._attributes.path;
     188        return this._attributes["path"];
    189189    },
    190190
    191191    get domain()
    192192    {
    193         return this._attributes.domain;
     193        return this._attributes["domain"];
    194194    },
    195195
    196196    expires: function(requestDate)
    197197    {
    198         return this._attributes.expires ? new Date(this._attributes.expires) :
     198        return this._attributes["expires"] ? new Date(this._attributes["expires"]) :
    199199            (this._attributes["max-age"] ? new Date(requestDate.getTime() + 1000 * this._attributes["max-age"]) : null);
    200200    },

  • trunk/Source/WebCore/inspector/front-end/DOMAgent.js

    r96485 r96499  
    3232/**
    3333 * @constructor
    34  * @param {DOMAgent.Node} payload.
     34 * @param {DOMAgent.Node} payload
    3535 */
    3636WebInspector.DOMNode = function(doc, payload) {
    … …  
    269269
    270270    /**
    271      * @param {DOMAgent.Node} payload.
     271     * @param {DOMAgent.Node} payload
    272272     */
    273273    _insertChild: function(prev, payload)
    … …  
    371371 * @extends {WebInspector.DOMNode}
    372372 * @constructor
    373  * @param {DOMAgent.Node} payload.
     373 * @param {DOMAgent.Node} payload
    374374 */
    375375WebInspector.DOMDocument = function(domAgent, payload)
    … …  
    547547
    548548    /**
    549      * @param {DOMAgent.Node} payload.
     549     * @param {DOMAgent.Node} payload
    550550     */
    551551    _setDocument: function(payload)
    … …  
    563563
    564564    /**
    565      * @param {DOMAgent.Node} payload.
     565     * @param {DOMAgent.Node} payload
    566566     */
    567567    _setDetachedRoot: function(payload)

  • trunk/Source/WebCore/inspector/front-end/ExtensionServer.js

    r95942 r96499  
    331331            return this._status.E_BADARG("message.severity", message.severity);
    332332
    333         var consoleMessage = new WebInspector.ConsoleMessage(
     333        var consoleMessage = WebInspector.ConsoleMessage.create(
    334334            WebInspector.ConsoleMessage.MessageSource.JS,
    335335            WebInspector.ConsoleMessage.MessageType.Log,

  • trunk/Source/WebCore/inspector/front-end/NetworkManager.js

    r95613 r96499  
    128128
    129129        if (!this._mimeTypeIsConsistentWithType(resource)) {
    130             WebInspector.console.addMessage(new WebInspector.ConsoleMessage(WebInspector.ConsoleMessage.MessageSource.Other,
     130            WebInspector.console.addMessage(WebInspector.ConsoleMessage.create(WebInspector.ConsoleMessage.MessageSource.Other,
    131131                WebInspector.ConsoleMessage.MessageType.Log,
    132132                WebInspector.ConsoleMessage.MessageLevel.Warning,
    … …  
    181181        if (resource) {
    182182            // FIXME: move this check to the backend.
    183             if (this._isNull(redirectResponse))
     183            if (!redirectResponse)
    184184                return;
    185185            this.responseReceived(requestId, time, "Other", redirectResponse);
    … …  
    259259    requestServedFromMemoryCache: function(requestId, frameId, loaderId, documentURL, time, initiator, cachedResource)
    260260    {
    261         var resource = this._createResource(requestId, frameId, loaderId, cachedResource.url, documentURL, initiator);
     261        var resource = this._createResource(requestId, frameId, loaderId, cachedResource.url, documentURL, initiator, null);
    262262        this._updateResourceWithCachedResource(resource, cachedResource);
    263263        resource.cached = true;
    … …  
    270270    webSocketCreated: function(requestId, requestURL)
    271271    {
    272         var resource = this._createResource(requestId, null, null, requestURL);
     272        var resource = new WebInspector.Resource(requestId, requestURL, null, null);
    273273        resource.type = WebInspector.Resource.Type.WebSocket;
    274274        this._startResource(resource);
    … …  
    353353    },
    354354
     355    /**
     356     * @param {NetworkAgent.RequestId} requestId
     357     * @param {string} frameId
     358     * @param {NetworkAgent.LoaderId} loaderId
     359     * @param {string} url
     360     * @param {string} documentURL
     361     * @param {NetworkAgent.Initiator} initiator
     362     * @param {ConsoleAgent.StackTrace=} stackTrace
     363     */
    355364    _createResource: function(requestId, frameId, loaderId, url, documentURL, initiator, stackTrace)
    356365    {
    357         var resource = new WebInspector.Resource(requestId, url, loaderId);
     366        var resource = new WebInspector.Resource(requestId, url, frameId, loaderId);
    358367        resource.documentURL = documentURL;
    359         resource.frameId = frameId;
    360368        resource.initiator = initiator;
    361369        resource.stackTrace = stackTrace;

  • trunk/Source/WebCore/inspector/front-end/Resource.js

    r96323 r96499  
    6969 * @constructor
    7070 * @extends {WebInspector.Object}
     71 *
     72 * @param {NetworkAgent.RequestId} requestId
     73 * @param {string} url
     74 * @param {?string} frameId
     75 * @param {?NetworkAgent.LoaderId} loaderId
    7176 */
    72 WebInspector.Resource = function(requestId, url, loaderId)
     77WebInspector.Resource = function(requestId, url, frameId, loaderId)
    7378{
    7479    this.requestId = requestId;
    7580    this.url = url;
     81    this.frameId = frameId;
    7682    this.loaderId = loaderId;
    7783    this._startTime = -1;
    … …  
    8288    /** @type {number} */
    8389    this.statusCode = 0;
     90    this.statusText = "";
    8491    this.requestMethod = "";
    8592    this.requestTime = 0;
    … …  
    821828    setContent: function(newContent, majorChange, callback)
    822829    {
    823         if (!this.isEditable(this)) {
     830        if (!this.isEditable()) {
    824831            if (callback)
    825832                callback("Resource is not editable");
    … …  
    875882        }
    876883
    877         PageAgent.searchInResource(this.frameId, this.url, query, callbackWrapper);
     884        if (this.frameId)
     885            PageAgent.searchInResource(this.frameId, this.url, query, callbackWrapper);
     886        else
     887            callback([]);
    878888    },
    879889

  • trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js

    r95636 r96499  
    388388    },
    389389
     390    /**
     391     * @param {PageAgent.Frame} frame
     392     * @param {string} url
     393     */
    390394    _createResource: function(frame, url)
    391395    {
    392         var resource = new WebInspector.Resource(null, url, frame.loaderId);
    393         resource.frameId = frame.id;
     396        var resource = new WebInspector.Resource(null, url, frame.id, frame.loaderId);
    394397        resource.documentURL = frame.url;
    395398        resource.mimeType = frame.mimeType;

  • trunk/Source/WebCore/inspector/front-end/externs.js

    r96485 r96499  
    4747/** @param {string} url */
    4848WebInspector.linkifyStringAsFragment = function(url) {}
     49/** @param {string} url */
     50WebInspector.linkifyStringAsFragmentWithCustomLinkifier = function(url, linkifier) {}
    4951
    5052/**
    … …  
    7274
    7375Array.prototype.remove = function(obj) {}
     76
     77WebInspector.extensionServer = {}
     78WebInspector.extensionServer.notifyResourceContentCommitted = function(resource, content) {}
     79
     80/**
     81 * @param {string} url
     82 * @return {?WebInspector.Resource}
     83 */
     84WebInspector.resourceForURL = function(url) {}
     85
     86WebInspector.debuggerPresentationModel = {
     87    linkifyLocation: function(url, lineNumber, columnNumber, className) {}
     88}
     89
     90/**
     91 * @constructor
     92 */
     93WebInspector.ObjectPropertiesSection = function(obj, title)
     94{
     95    this.element = null;
     96}
     97
     98/**
     99 * @constructor
     100 * @extends {TreeOutline}
     101 */
     102WebInspector.ElementsTreeOutline = function()
     103{
     104    this.element = null;
     105}
     106
     107/**
     108 * @param {NetworkAgent.RequestId} requestId
     109 * @return {?WebInspector.Resource}
     110 */
     111WebInspector.networkResourceById = function(requestId)
     112{
     113}

  • trunk/Source/WebCore/inspector/front-end/inspector.html

    r96313 r96499  
    6161    <script type="text/javascript" src="IFrameView.js"></script>
    6262    <script type="text/javascript" src="Drawer.js"></script>
     63    <script type="text/javascript" src="ConsoleModel.js"></script>
    6364    <script type="text/javascript" src="ConsoleMessage.js"></script>
    64     <script type="text/javascript" src="ConsoleModel.js"></script>
    6565    <script type="text/javascript" src="ConsoleView.js"></script>
    6666    <script type="text/javascript" src="Panel.js"></script>

  • trunk/Source/WebCore/inspector/front-end/inspector.js

    r95984 r96499  
    557557    this.extensionServer.initExtensions();
    558558
    559     this.console.enableAgent();
     559    // There is no console agent for workers yet.
     560    if (!WebInspector.WorkerManager.isWorkerFrontend())
     561        this.console.enableAgent();
    560562    DatabaseAgent.enable();
    561563    DOMStorageAgent.enable();
    … …  
    11431145
    11441146        // post the message
    1145         var msg = new WebInspector.ConsoleMessage(
     1147        var msg = WebInspector.ConsoleMessage.create(
    11461148            WebInspector.ConsoleMessage.MessageSource.Other,
    11471149            WebInspector.ConsoleMessage.MessageType.Log,

  • trunk/Source/WebCore/inspector/front-end/utilities.js

    r96215 r96499  
    665665}
    666666
    667 String.sprintf = function(format)
     667/**
     668 * @param {string} format
     669 * @param {...*} var_arg
     670 */
     671String.sprintf = function(format, var_arg)
    668672{
    669673    return String.vsprintf(format, Array.prototype.slice.call(arguments, 1));

  • trunk/Source/WebCore/inspector/generate-protocol-externs

    r96485 r96499  
    102102                        output_file.write("/** @type {%s%s} */ this.%s;\n" % (param_type(domain_name, property), suffix, property["name"]))
    103103                output_file.write("}\n")
     104            elif type["type"] == "array":
     105                suffix = ""
     106                if ("optional" in property):
     107                    suffix = "|undefined"
     108                output_file.write("\n/** @typedef {Array.<%s>%s} */\n%sAgent.%s;\n" % (param_type(domain_name, type["items"]), suffix, domain_name, type["id"]))
    104109            else:
    105110                output_file.write("\n/** @typedef {%s} */\n%sAgent.%s;\n" % (type_traits[type["type"]], domain_name, type["id"]))

  • trunk/Tools/ChangeLog

    r96497 r96499  
     12011-10-03  Csaba Osztrogonác  <ossy@webkit.org>
     2
     3        Unreviewed. Add Zoltán Árvai as contributor.
     4
     5        * Scripts/webkitpy/common/config/committers.py:
     6
    172011-10-03  Raphael Kubo da Costa  <kubo@profusion.mobi>
    28
Note: See TracChangeset for help on using the changeset viewer.