Changeset 82847 in webkit

Timestamp:

Apr 4, 2011 11:00:32 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2011-04-04 Pavel Feldman <​pfeldman@google.com>

Reviewed by Yury Semikhatsky.

Web Inspector: add support for the enumerated types in the protocol.
​https://bugs.webkit.org/show_bug.cgi?id=57761

• inspector/debugger/debugger-autocontinue-on-syntax-error.html:
• inspector/debugger/debugger-pause-on-exception.html:

2011-04-04 Pavel Feldman <​pfeldman@google.com>

Reviewed by Yury Semikhatsky.

Web Inspector: add support for the enumerated types in the protocol.
​https://bugs.webkit.org/show_bug.cgi?id=57761

• inspector/Inspector.json:
• inspector/InspectorDebuggerAgent.cpp: (WebCore::InspectorDebuggerAgent::setPauseOnExceptions):
• inspector/InspectorDebuggerAgent.h:
• inspector/InspectorInstrumentation.cpp: (WebCore::InspectorInstrumentation::resourceRetrievedByXMLHttpRequestImpl): (WebCore::InspectorInstrumentation::scriptImportedImpl):
• inspector/InspectorResourceAgent.cpp: (WebCore::cachedResourceTypeString): (WebCore::InspectorResourceAgent::didReceiveResponse): (WebCore::InspectorResourceAgent::setInitialScriptContent): (WebCore::InspectorResourceAgent::setInitialXHRContent):
• inspector/InspectorResourceAgent.h:
• inspector/front-end/ScriptsPanel.js:
• inspector/generate-inspector-idl:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/debugger-autocontinue-on-syntax-error.html (modified) (1 diff)
• LayoutTests/inspector/debugger/debugger-pause-on-exception.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/Inspector.json (modified) (11 diffs)
• Source/WebCore/inspector/InspectorDebuggerAgent.cpp (modified) (1 diff)
• Source/WebCore/inspector/InspectorDebuggerAgent.h (modified) (1 diff)
• Source/WebCore/inspector/InspectorInstrumentation.cpp (modified) (2 diffs)
• Source/WebCore/inspector/InspectorResourceAgent.cpp (modified) (5 diffs)
• Source/WebCore/inspector/InspectorResourceAgent.h (modified) (1 diff)
• Source/WebCore/inspector/front-end/ScriptsPanel.js (modified) (5 diffs)
• Source/WebCore/inspector/front-end/inspector.css (modified) (2 diffs)
• Source/WebCore/inspector/generate-inspector-idl (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-04  Pavel Feldman  <pfeldman@google.com>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: add support for the enumerated types in the protocol.
+        https://bugs.webkit.org/show_bug.cgi?id=57761
+
+        * inspector/debugger/debugger-autocontinue-on-syntax-error.html:
+        * inspector/debugger/debugger-pause-on-exception.html:
+
 2011-04-04  Yong Li  <yoli@rim.com>
 

trunk/LayoutTests/inspector/debugger/debugger-autocontinue-on-syntax-error.html

@@ -19 +19 @@
     function step1()
     {
-        DebuggerAgent.setPauseOnExceptionsState(WebInspector.ScriptsPanel.PauseOnExceptionsState.PauseOnUncaughtExceptions);
+        DebuggerAgent.setPauseOnExceptions(WebInspector.ScriptsPanel.PauseOnExceptionsState.PauseOnUncaughtExceptions);
         InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2);
         InspectorTest.evaluateInPage("loadIframe()");

trunk/LayoutTests/inspector/debugger/debugger-pause-on-exception.html

@@ -21 +21 @@
     function step1()
     {
-        DebuggerAgent.setPauseOnExceptionsState(WebInspector.ScriptsPanel.PauseOnExceptionsState.PauseOnUncaughtExceptions);
+        DebuggerAgent.setPauseOnExceptions(WebInspector.ScriptsPanel.PauseOnExceptionsState.PauseOnUncaughtExceptions);
         InspectorTest.showScriptSource("debugger-pause-on-exception.html", step2);
     }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-04  Pavel Feldman  <pfeldman@google.com>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: add support for the enumerated types in the protocol.
+        https://bugs.webkit.org/show_bug.cgi?id=57761
+
+        * inspector/Inspector.json:
+        * inspector/InspectorDebuggerAgent.cpp:
+        (WebCore::InspectorDebuggerAgent::setPauseOnExceptions):
+        * inspector/InspectorDebuggerAgent.h:
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::resourceRetrievedByXMLHttpRequestImpl):
+        (WebCore::InspectorInstrumentation::scriptImportedImpl):
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::cachedResourceTypeString):
+        (WebCore::InspectorResourceAgent::didReceiveResponse):
+        (WebCore::InspectorResourceAgent::setInitialScriptContent):
+        (WebCore::InspectorResourceAgent::setInitialXHRContent):
+        * inspector/InspectorResourceAgent.h:
+        * inspector/front-end/ScriptsPanel.js:
+        * inspector/generate-inspector-idl:
+
 2011-04-04  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebCore/inspector/Inspector.json

@@ -160 +160 @@
                 "parameters": [
                     { "name": "objectId", "type": "string" },
-                    { "name": "ignoreHasOwnProperty", "type": "boolean" },
+                    { "name": "ignoreHasOwnProperty", "type": "boolean" }
                 ],
                 "returns": [
@@ -286 +286 @@
             },
             {
+                "id": "ResourceType",
+                "type": "string",
+                "enum": ["Document", "Stylesheet", "Image", "Font", "Script", "XHR", "WebSocket", "Other"],
+                "description": "Resource type as it was perceived by the rendering enging."
+            },
+            {
                 "id": "CachedResource",
                 "type": "object",
@@ -291 +297 @@
                 "properties": {
                     "url": { "type": "string", "description": "Resource URL." },
-                    "type": { "type": "string", "description": "Type of this resource. // FIXME" },
+                    "type": { "$ref": "ResourceType", "description": "Type of this resource." },
                     "response": { "$ref": "ResourceResponse", "description": "Cached response data." },
                     "bodySize": { "type": "number", "description": "Cached response body size." }
@@ -320 +326 @@
                             "properties": {
                                 "url": { "type": "string", "description": "Resource URL." },
-                                "type": { "type": "string", "description": "Type of this resource. // FIXME" }
+                                "type": { "$ref": "ResourceType", "description": "Type of this resource." }
                             }
                         },
@@ -399 +405 @@
                     { "name": "identifier", "type": "integer", "description": "Request identifier." },
                     { "name": "time", "type": "number", "description": "Timestamp." },
-                    { "name": "resourceType", "type": "string", "description": "Resource type. // FIXME" },
+                    { "name": "type", "$ref": "ResourceType", "description": "Resource type." },
                     { "name": "response", "$ref": "ResourceResponse", "description": "Response data." }
                 ]
@@ -447 +453 @@
                     { "name": "identifier", "type": "integer", "description": "Request identifier." },
                     { "name": "content", "type": "string", "description": "Resource content." },
-                    { "name": "type", "type": "string", "description": "Resource type. // FIXME" }
+                    { "name": "type", "$ref": "ResourceType", "description": "Resource type." }
                 ]
             },
@@ -679 +685 @@
                 "parameters": [
                     { "name": "nodeId", "type": "integer", "description": "Id of the node to query upon." },
-                    { "name": "selectors", "type": "string", "description": "Selector string." },
+                    { "name": "selectors", "type": "string", "description": "Selector string." }
                 ],
                 "returns": [
@@ -690 +696 @@
                 "parameters": [
                     { "name": "nodeId", "type": "integer", "description": "Id of the node to query upon." },
-                    { "name": "selectors", "type": "string", "description": "Selector string." },
+                    { "name": "selectors", "type": "string", "description": "Selector string." }
                 ],
                 "returns": [
@@ -1003 +1009 @@
                     "sourceURL": { "type": "string", "optional": true, "description": "Parent stylesheet resource URL (for regular rules)."},
                     "sourceLine": { "type": "integer", "description": "Line ordinal of the rule selector start character in the resource."},
-                    "origin": { "type": "string", "description": "The parent stylesheet type: \"user\" for user stylesheets, \"user-agent\" for user-agent stylesheets, \"inspector\" for stylesheets created by the inspector (i.e. those holding new rules created with <code>addRule()</code>), \"\" for regular stylesheets. // FIXME"},
+                    "origin": { "type": "string", "enum": ["user", "user-agent", "inspector", ""], "description": "The parent stylesheet type: \"user\" for user stylesheets, \"user-agent\" for user-agent stylesheets, \"inspector\" for stylesheets created by the inspector (i.e. those holding new rules created with <code>addRule()</code>), \"\" for regular stylesheets."},
                     "style": { "$ref": "CSSStyle", "description": "Associated style declaration." },
                     "selectorRange": { "$ref": "SourceRange", "optional": true, "description": "The rule selector range in the underlying resource (if available)." }
@@ -1041 +1047 @@
                     "implicit": { "type": "boolean", "optional": true, "description": "Whether the property is implicit (implies <code>false</code> if absent)." },
                     "parsedOk": { "type": "boolean", "optional": true, "description": "Whether the property is understood by the browser (implies <code>true</code> if absent)." },
-                    "status": { "type": "string", "optional": true, "description": "The property status: \"active\" (implied if absent) if the property is effective in the style, \"inactive\" if the property is overridden by a same-named property in this style later on, \"disabled\" if the property is disabled by the user, \"style\" if the property is reported by the browser rather than by the CSS source parser. // FIXME" },
+                    "status": { "type": "string", "enum": ["active", "inactive", "disabled", "style"], "optional": true, "description": "The property status: \"active\" (implied if absent) if the property is effective in the style, \"inactive\" if the property is overridden by a same-named property in this style later on, \"disabled\" if the property is disabled by the user, \"style\" if the property is reported by the browser rather than by the CSS source parser." },
                     "shorthandName": { "type": "string", "description": "The related shorthand property name (absent if this property is not a longhand)." },
                     "range": { "$ref": "SourceRange", "optional": true, "description": "The entire property range in the enclosing style declaration (if available)." }
@@ -1351 +1357 @@
             },
             {
-                "name": "setPauseOnExceptionsState",
-                "parameters": [
-                    { "name": "pauseOnExceptionsState", "type": "integer", "description": "Pause on exceptions mode. // FIXME, make enumerable." }
+                "name": "setPauseOnExceptions",
+                "parameters": [
+                    { "name": "state", "type": "string", "enum": ["none", "uncaught", "all"], "description": "Pause on exceptions mode." }
                 ],
                 "description": "Defines pause on exceptions state. Can be set to stop on all exceptions, uncaught exceptions or no exceptions."

trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp

@@ -302 +302 @@
 }
 
-void InspectorDebuggerAgent::setPauseOnExceptionsState(ErrorString* errorString, int pauseState)
-{
+void InspectorDebuggerAgent::setPauseOnExceptions(ErrorString* errorString, const String& stringPauseState)
+{
+    ScriptDebugServer::PauseOnExceptionsState pauseState;
+    if (stringPauseState == "none")
+        pauseState = ScriptDebugServer::DontPauseOnExceptions;
+    else if (stringPauseState == "all")
+        pauseState = ScriptDebugServer::PauseOnAllExceptions;
+    else if (stringPauseState == "uncaught")
+        pauseState = ScriptDebugServer::PauseOnUncaughtExceptions;
+    else {
+        *errorString = "Unknown pause on exceptions mode: " + stringPauseState;
+        return;
+    }
     scriptDebugServer().setPauseOnExceptionsState(static_cast<ScriptDebugServer::PauseOnExceptionsState>(pauseState));
     if (scriptDebugServer().pauseOnExceptionsState() != pauseState)

trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h

@@ -95 +95 @@
     void stepInto(ErrorString*);
     void stepOut(ErrorString*);
-    void setPauseOnExceptionsState(ErrorString*, int pauseState);
+    void setPauseOnExceptions(ErrorString*, const String& pauseState);
     void evaluateOnCallFrame(ErrorString*, const String& callFrameId, const String& expression, const String& objectGroup, const bool* const optionalIncludeCommandLineAPI, RefPtr<InspectorObject>* result);
 

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -485 +485 @@
     inspectorAgent->consoleAgent()->resourceRetrievedByXMLHttpRequest(url, sendURL, sendLineNumber);
     if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
-        resourceAgent->setInitialContent(identifier, sourceString, "XHR");
+        resourceAgent->setInitialXHRContent(identifier, sourceString);
 }
 
@@ -491 +491 @@
 {
     if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
-        resourceAgent->setInitialContent(identifier, sourceString, "Script");
+        resourceAgent->setInitialScriptContent(identifier, sourceString);
 }
 

trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

@@ -75 +75 @@
 }
 
+namespace ResourceType {
+static const char document[] = "Document";
+static const char stylesheet[] = "Stylesheet";
+static const char image[] = "Image";
+static const char font[] = "Font";
+static const char script[] = "Script";
+static const char xhr[] = "XHR";
+static const char websocket[] = "WebSocket";
+static const char other[] = "Other";
+}
+
 void InspectorResourceAgent::setFrontend(InspectorFrontend* frontend)
 {
@@ -237 +248 @@
     switch (cachedResource.type()) {
     case CachedResource::ImageResource:
-        return "Image";
+        return ResourceType::image;
     case CachedResource::FontResource:
-        return "Font";
+        return ResourceType::font;
     case CachedResource::CSSStyleSheet:
         // Fall through.
@@ -245 +256 @@
     case CachedResource::XSLStyleSheet:
 #endif
-        return "Stylesheet";
+        return ResourceType::stylesheet;
     case CachedResource::Script:
-        return "Script";
+        return ResourceType::script;
     default:
         break;
     }
-    return "Other";
+    return ResourceType::other;
 }
 
@@ -315 +326 @@
         }
         if (equalIgnoringFragmentIdentifier(response.url(), loader->frameLoader()->iconURL()))
-            type = "Image";
+            type = ResourceType::image;
         else if (equalIgnoringFragmentIdentifier(response.url(), loader->url()) && type == "Other")
-            type = "Document";
+            type = ResourceType::document;
     }
     m_frontend->responseReceived(static_cast<int>(identifier), currentTime(), type, resourceResponse);
@@ -349 +360 @@
 }
 
-void InspectorResourceAgent::setInitialContent(unsigned long identifier, const String& sourceString, const String& type)
-{
-    m_frontend->initialContentSet(static_cast<int>(identifier), sourceString, type);
+void InspectorResourceAgent::setInitialScriptContent(unsigned long identifier, const String& sourceString)
+{
+    m_frontend->initialContentSet(static_cast<int>(identifier), sourceString, ResourceType::script);
+}
+
+void InspectorResourceAgent::setInitialXHRContent(unsigned long identifier, const String& sourceString)
+{
+    m_frontend->initialContentSet(static_cast<int>(identifier), sourceString, ResourceType::xhr);
 }
 

trunk/Source/WebCore/inspector/InspectorResourceAgent.h

@@ -96 +96 @@
     void didFailLoading(unsigned long identifier, const ResourceError&);
     void didLoadResourceFromMemoryCache(DocumentLoader*, const CachedResource*);
-    void setInitialContent(unsigned long identifier, const String& sourceString, const String& type);
+    void setInitialScriptContent(unsigned long identifier, const String& sourceString);
+    void setInitialXHRContent(unsigned long identifier, const String& sourceString);
     void didCommitLoad(DocumentLoader*);
     void frameDetachedFromParent(Frame*);

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

@@ -205 +205 @@
 // Keep these in sync with WebCore::ScriptDebugServer
 WebInspector.ScriptsPanel.PauseOnExceptionsState = {
-    DontPauseOnExceptions : 0,
-    PauseOnAllExceptions : 1,
-    PauseOnUncaughtExceptions: 2
+    DontPauseOnExceptions : "none",
+    PauseOnAllExceptions : "all",
+    PauseOnUncaughtExceptions: "uncaught"
 };
 
@@ -415 +415 @@
     _debuggerWasEnabled: function()
     {
-        this._setPauseOnExceptions(WebInspector.settings.pauseOnExceptionState);
+        this._setPauseOnExceptions(WebInspector.settings.pauseOnExceptionStateString);
 
         if (this._debuggerEnabled)
@@ -682 +682 @@
     _setPauseOnExceptions: function(pauseOnExceptionsState)
     {
+        pauseOnExceptionsState = pauseOnExceptionsState || WebInspector.ScriptsPanel.PauseOnExceptionsState.DontPauseOnExceptions;
         function callback(error)
         {
@@ -694 +695 @@
 
             this._pauseOnExceptionButton.state = pauseOnExceptionsState;
-            WebInspector.settings.pauseOnExceptionState = pauseOnExceptionsState;
-        }
-        DebuggerAgent.setPauseOnExceptionsState(pauseOnExceptionsState, callback.bind(this));
+            WebInspector.settings.pauseOnExceptionStateString = pauseOnExceptionsState;
+        }
+        DebuggerAgent.setPauseOnExceptions(pauseOnExceptionsState, callback.bind(this));
     },
 
@@ -811 +812 @@
     _togglePauseOnExceptions: function()
     {
-        this._setPauseOnExceptions((this._pauseOnExceptionButton.state + 1) % this._pauseOnExceptionButton.states);
+        var nextStateMap = {};
+        var stateEnum = WebInspector.ScriptsPanel.PauseOnExceptionsState;
+        nextStateMap[stateEnum.DontPauseOnExceptions] = stateEnum.PauseOnAllExceptions;  
+        nextStateMap[stateEnum.PauseOnAllExceptions] = stateEnum.PauseOnUncaughtExceptions;  
+        nextStateMap[stateEnum.PauseOnUncaughtExceptions] = stateEnum.DontPauseOnExceptions;
+        this._setPauseOnExceptions(nextStateMap[this._pauseOnExceptionButton.state]);
     },
 

trunk/Source/WebCore/inspector/front-end/inspector.css

@@ -494 +494 @@
 }
 
-button.status-bar-item.toggled-1 .glyph {
-    background-color: rgb(66, 129, 235);
-}
-
-button.status-bar-item.toggled-2 .glyph {
-    background-color: purple;   
-}
-
 button.status-bar-item:disabled {
     opacity: 0.5;
@@ -2521 +2513 @@
 }
 
+.scripts-pause-on-exceptions-status-bar-item.toggled-all .glyph {
+    background-color: rgb(66, 129, 235);
+}
+
+.scripts-pause-on-exceptions-status-bar-item.toggled-uncaught .glyph {
+    background-color: purple;   
+}
+
 #scripts-status-bar {
     position: absolute;

trunk/Source/WebCore/inspector/generate-inspector-idl

@@ -82 +82 @@
 }
 
+ref_types = {}
+
 macro_traits = {
     "Database": "DATABASE",
@@ -93 +95 @@
 def param_type(param):
     if "type" in param:
-        return type_traits[param["type"]];
+        return type_traits[param["type"]]
     if "$ref" in param:
-        return "Object"
+        type_id = param["$ref"]
+        if type_id in ref_types:
+            ref_type = ref_types[type_id]
+            return type_traits[ref_type["type"]]
+        else:
+            return "Object"
 
 for domain in json_api:
@@ -102 +109 @@
         output_file.write("\n#if defined(ENABLE_%s) && ENABLE_%s" % (macro_traits[domain_name], macro_traits[domain_name]))
     output_file.write("\n    interface [Conditional=INSPECTOR] %s {" % domain_name)
+    if "types" in domain:
+        for type in domain["types"]:
+            ref_types[type["id"]] = type
     if "commands" in domain:
         for command in domain["commands"]:
-            params = [];
+            params = []
             if ("parameters" in command):
                 for in_param in command["parameters"]:
@@ -118 +128 @@
     if "events" in domain:
         for event in domain["events"]:
-            params = [];
+            params = []
             if ("parameters" in event):
                 for in_param in event["parameters"]: