Source/WebCore/ChangeLog

 12012-04-10 Pavel Feldman <pfeldman@chromium.org>
 2
 3 Web Inspector: make error a string on the front-end side, not an object.
 4 https://bugs.webkit.org/show_bug.cgi?id=83570
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 We already expect it to be a string in all the code, we never use the error code in it.
 9
 10 * inspector/front-end/InspectorBackend.js:
 11 (InspectorBackendClass.prototype.dispatch):
 12
1132012-04-09 Pavel Feldman <pfeldman@chromium.org>
214
315 Web Inspector: annotate front-end for newer closure compiler.

Source/WebCore/inspector/front-end/InspectorBackend.js

@@InspectorBackendClass.prototype = {
163163
164164 if ("id" in messageObject) { // just a response for some request
165165 if (messageObject.error) {
166  messageObject.error.__proto__ = {
167  getDescription: function()
168  {
169  switch(this.code) {
170  case -32700: return "Parse error";
171  case -32600: return "Invalid Request";
172  case -32601: return "Method not found";
173  case -32602: return "Invalid params";
174  case -32603: return "Internal error";;
175  case -32000: return "Server error";
176  }
177  },
178 
179  toString: function()
180  {
181  var description ="Unknown error code";
182  return this.getDescription() + "(" + this.code + "): " + this.message + "." + (this.data ? " " + this.data.join(" ") : "");
183  },
184 
185  getMessage: function()
186  {
187  return this.message;
188  }
189  }
190 
191166 if (messageObject.error.code !== -32000)
192167 this.reportProtocolError(messageObject);
193168 }

@@InspectorBackendClass.prototype = {
207182 if (this.dumpInspectorTimeStats && callback.methodName)
208183 processingStartTime = Date.now();
209184
210  argumentsArray.unshift(messageObject.error);
 185 argumentsArray.unshift(messageObject.error ? messageObject.error.message : null);
211186 callback.apply(null, argumentsArray);
212187 --this._pendingResponsesCount;
213188 delete this._callbacks[messageObject.id];

LayoutTests/ChangeLog

 12012-04-10 Pavel Feldman <pfeldman@chromium.org>
 2
 3 Web Inspector: make error a string on the front-end side, not an object.
 4 https://bugs.webkit.org/show_bug.cgi?id=83570
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 * inspector/debugger/debugger-set-breakpoint-regex-expected.txt:
 9 * inspector/debugger/debugger-set-breakpoint-regex.html:
 10 * inspector/elements/resolve-node-blocked-expected.txt:
 11 * inspector/elements/set-attribute.html:
 12 * inspector/profiler/heap-snapshot-inspect-dom-wrapper-expected.txt:
 13 * inspector/report-protocol-errors-expected.txt:
 14 * inspector/report-protocol-errors.html:
 15 * inspector/styles/set-property-boundaries-expected.txt:
 16
1172012-04-10 Ádám Kallai <kadam@inf.u-szeged.hu>
218
319 [Qt] Gardening after r113701.

LayoutTests/inspector/debugger/debugger-set-breakpoint-regex-expected.txt

@@Tests Debugger.setBreakpointByUrl with isRegex set to true.
33Debugger was enabled.
44
55Running: testSetNoneOfURLAndRegex
6 {
7  code : -32000
8  message : "Either url or urlRegex must be specified."
9 }
 6Either url or urlRegex must be specified.
107
118Running: testSetBothURLAndRegex
12 {
13  code : -32000
14  message : "Either url or urlRegex must be specified."
15 }
 9Either url or urlRegex must be specified.
1610
1711Running: testSetByRegex
1812Set timer for test function.

LayoutTests/inspector/debugger/debugger-set-breakpoint-regex.html

@@function test()
2020 {
2121 DebuggerAgent.setBreakpointByUrl.invoke({lineNumber: 1}, step2);
2222
23  function step2(result)
 23 function step2(error)
2424 {
25  InspectorTest.dump(result);
 25 InspectorTest.addResult(error);
2626 next();
2727 }
2828 },

@@function test()
3333 var urlRegex = "debugger-set-breakpoint.*";
3434 DebuggerAgent.setBreakpointByUrl(1, url, urlRegex, step2);
3535
36  function step2(result)
 36 function step2(error)
3737 {
38  InspectorTest.dump(result);
 38 InspectorTest.addResult(error);
3939 next();
4040 }
4141 },

LayoutTests/inspector/elements/resolve-node-blocked-expected.txt

11Tests that JS object to node resolution still works even if script evals are prohibited by Content-Security-Policy. The test passes if it doesn't crash. Bug 78705.
22
33didReceiveDocumentObject
4 didRequestNode error = undefined
 4didRequestNode error = null
55

LayoutTests/inspector/elements/set-attribute.html

@@function test()
118118 {
119119 function callback(error)
120120 {
121  InspectorTest.addResult("Error: " + error.getMessage());
 121 InspectorTest.addResult("Error: " + error);
122122 WebInspector.domAgent.removeEventListener(WebInspector.DOMAgent.Events.AttrModified, callback);
123123 InspectorTest.addResult("=== Set malformed attribute as text ===");
124124 InspectorTest.dumpElementsTree(targetNode);

LayoutTests/inspector/profiler/heap-snapshot-inspect-dom-wrapper-expected.txt

@@Test that resolving heap snaphot object to a JS object will not crash on DOM wra
22
33_finishHeapSnapshot 1
44_callLoadCallbacks
5 Error resolving heap snapshot object: Server error(-32000): Object is not available.
6 Error resolving heap snapshot object: Server error(-32000): Object is not available.
 5Error resolving heap snapshot object: Object is not available
 6Error resolving heap snapshot object: Object is not available
77clearProfiles
88

LayoutTests/inspector/report-protocol-errors-expected.txt

@@Tests that InspectorBackendDispatcher is catching incorrect messages.
77 }
88 id : null
99}
10 error.code: -32700
11 error.getMessage(): Message must be in JSON format
12 error.toString(): Parse error(-32700): Message must be in JSON format.
1310-------------------------------------------------------
1411{
1512 error : {

@@error.toString(): Parse error(-32700): Message must be in JSON format.
1815 }
1916 id : null
2017}
21 error.code: -32600
22 error.getMessage(): 'id' property was not found
23 error.toString(): Invalid Request(-32600): 'id' property was not found.
2418-------------------------------------------------------
2519{
2620 error : {

@@error.toString(): Invalid Request(-32600): 'id' property was not found.
2923 }
3024 id : null
3125}
32 error.code: -32600
33 error.getMessage(): The type of 'id' property must be number
34 error.toString(): Invalid Request(-32600): The type of 'id' property must be number.
3526-------------------------------------------------------
3627{
3728 error : {

@@error.toString(): Invalid Request(-32600): The type of 'id' property must be num
4031 }
4132 id : 1
4233}
43 error.code: -32600
44 error.getMessage(): The type of 'method' property must be string
45 error.toString(): Invalid Request(-32600): The type of 'method' property must be string.
4634-------------------------------------------------------
4735{
4836 error : {

@@error.toString(): Invalid Request(-32600): The type of 'method' property must be
5139 }
5240 id : 2
5341}
54 error.code: -32601
55 error.getMessage(): 'resourceContent' wasn't found
56 error.toString(): Method not found(-32601): 'resourceContent' wasn't found.
5742-------------------------------------------------------
5843{
5944 error : {

@@error.toString(): Method not found(-32601): 'resourceContent' wasn't found.
6247 }
6348 id : 3
6449}
65 error.code: -32601
66 error.getMessage(): 'DOM.test' wasn't found
67 error.toString(): Method not found(-32601): 'DOM.test' wasn't found.
6850-------------------------------------------------------
6951{
7052 error : {

@@error.toString(): Method not found(-32601): 'DOM.test' wasn't found.
7759 }
7860 id : 4
7961}
80 error.code: -32602
81 error.getMessage(): Some arguments of method 'Page.getResourceContent' can't be processed
82 error.toString(): Invalid params(-32602): Some arguments of method 'Page.getResourceContent' can't be processed. 'params' object must contain required parameter 'frameId' with type 'String'. 'params' object must contain required parameter 'url' with type 'String'.
8362-------------------------------------------------------
8463{
8564 error : {

@@error.toString(): Invalid params(-32602): Some arguments of method 'Page.getReso
9271 }
9372 id : 5
9473}
95 error.code: -32602
96 error.getMessage(): Some arguments of method 'Page.getResourceContent' can't be processed
97 error.toString(): Invalid params(-32602): Some arguments of method 'Page.getResourceContent' can't be processed. 'params' object must contain required parameter 'frameId' with type 'String'. 'params' object must contain required parameter 'url' with type 'String'.
9874-------------------------------------------------------
9975{
10076 error : {

@@error.toString(): Invalid params(-32602): Some arguments of method 'Page.getReso
10783 }
10884 id : 6
10985}
110 error.code: -32602
111 error.getMessage(): Some arguments of method 'Page.getResourceContent' can't be processed
112 error.toString(): Invalid params(-32602): Some arguments of method 'Page.getResourceContent' can't be processed. Parameter 'frameId' with type 'String' was not found. Parameter 'url' with type 'String' was not found.
11386-------------------------------------------------------
11487{
11588 error : {

@@error.toString(): Invalid params(-32602): Some arguments of method 'Page.getReso
12194 }
12295 id : 7
12396}
124 error.code: -32602
125 error.getMessage(): Some arguments of method 'Page.getResourceContent' can't be processed
126 error.toString(): Invalid params(-32602): Some arguments of method 'Page.getResourceContent' can't be processed. Parameter 'url' with type 'String' was not found.
12797-------------------------------------------------------
12898{
12999 error : {

@@error.toString(): Invalid params(-32602): Some arguments of method 'Page.getReso
132102 }
133103 id : 8
134104}
135 error.code: -32601
136 error.getMessage(): 'Page.test' wasn't found
137 error.toString(): Method not found(-32601): 'Page.test' wasn't found.
138105-------------------------------------------------------
139106{
140107 error : {

@@error.toString(): Method not found(-32601): 'Page.test' wasn't found.
143110 }
144111 id : 9
145112}
146 error.code: -32601
147 error.getMessage(): 'Page.test' wasn't found
148 error.toString(): Method not found(-32601): 'Page.test' wasn't found.
149113-------------------------------------------------------
150114{
151115 error : {

@@error.toString(): Method not found(-32601): 'Page.test' wasn't found.
154118 }
155119 id : 10
156120}
157 error.code: -32601
158 error.getMessage(): 'Page.test' wasn't found
159 error.toString(): Method not found(-32601): 'Page.test' wasn't found.
160121-------------------------------------------------------
161122{
162123 error : {

@@error.toString(): Method not found(-32601): 'Page.test' wasn't found.
165126 }
166127 id : 11
167128}
168 error.code: -32601
169 error.getMessage(): 'Page.test' wasn't found
170 error.toString(): Method not found(-32601): 'Page.test' wasn't found.
171129-------------------------------------------------------
172130{
173131 error : {

@@error.toString(): Method not found(-32601): 'Page.test' wasn't found.
176134 }
177135 id : 12
178136}
179 error.code: -32601
180 error.getMessage(): 'Page.test' wasn't found
181 error.toString(): Method not found(-32601): 'Page.test' wasn't found.
182137-------------------------------------------------------
183138{
184139 error : {

@@error.toString(): Method not found(-32601): 'Page.test' wasn't found.
187142 }
188143 id : 13
189144}
190 error.code: -32601
191 error.getMessage(): 'Page.test' wasn't found
192 error.toString(): Method not found(-32601): 'Page.test' wasn't found.
193145-------------------------------------------------------
194146{
195147 error : {

@@error.toString(): Method not found(-32601): 'Page.test' wasn't found.
198150 }
199151 id : 14
200152}
201 error.code: -32601
202 error.getMessage(): 'Page.test' wasn't found
203 error.toString(): Method not found(-32601): 'Page.test' wasn't found.
204153-------------------------------------------------------
205154{
206155 error : {

@@error.toString(): Method not found(-32601): 'Page.test' wasn't found.
209158 }
210159 id : 15
211160}
212 error.code: -32601
213 error.getMessage(): 'Page.test' wasn't found
214 error.toString(): Method not found(-32601): 'Page.test' wasn't found.
215161-------------------------------------------------------
216162{
217163 error : {

@@error.toString(): Method not found(-32601): 'Page.test' wasn't found.
220166 }
221167 id : 16
222168}
223 error.code: -32601
224 error.getMessage(): 'Page.test' wasn't found
225 error.toString(): Method not found(-32601): 'Page.test' wasn't found.
226169-------------------------------------------------------
227170

LayoutTests/inspector/report-protocol-errors.html

@@function test()
3333
3434 if (numberOfReports < messages.length) {
3535 InspectorTest.addObject(message);
36  InspectorTest.addResult("error.code: " + message.error.code);
37  InspectorTest.addResult("error.getMessage(): " + message.error.getMessage());
38  InspectorTest.addResult("error.toString(): " + message.error);
3936 InspectorTest.addResult("-------------------------------------------------------");
4037 }
4138

LayoutTests/inspector/styles/set-property-boundaries-expected.txt

11Tests that setting CSS property text out of boundaries does not crash.
22
33color: red;
4 Server error(-32000): INDEX_SIZE_ERR.
 4INDEX_SIZE_ERR
55