Changeset 80230 in webkit
- Timestamp:
- Mar 3, 2011 3:58:46 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r80227 r80230 1 2011-03-03 Yury Semikhatsky <yurys@chromium.org> 2 3 Reviewed by Pavel Feldman. 4 5 Web Inspector: inspector protocol should allow different domains to have methods with same name 6 https://bugs.webkit.org/show_bug.cgi?id=55558 7 8 * inspector/report-protocol-errors-expected.txt: 9 * inspector/report-protocol-errors.html: 10 1 11 2011-03-03 Kenji Imasaki <imasaki@chromium.org> 2 12 -
trunk/LayoutTests/inspector/report-protocol-errors-expected.txt
r79858 r80230 40 40 success : false 41 41 errors : { 42 0 : "Protocol Error: Invalid command was received. 'test' wasn't found ."42 0 : "Protocol Error: Invalid command was received. 'test' wasn't found in domain DOM." 43 43 } 44 44 } -
trunk/LayoutTests/inspector/report-protocol-errors.html
r79858 r80230 10 10 '{}', 11 11 '{"command":1}', 12 '{" command":"test"}',13 '{"seq":"not a number"," command":"test"}',14 '{"seq":1," command":"test"}',15 '{"seq":2," command":"resourceContent"}',16 '{"seq":3," command":"resourceContent","arguments":[]}',17 '{"seq":4," command":"resourceContent","arguments":{}}',18 '{"seq":5," command":"resourceContent","arguments":{"identifier":"not a number"}}',12 '{"domain":"Network","command":"resourceContent"}', 13 '{"seq":"not a number","domain":"Network","command":"resourceContent"}', 14 '{"seq":1,"domain":"DOM","command":"test"}', 15 '{"seq":2,"domain":"Network","command":"resourceContent"}', 16 '{"seq":3,"domain":"Network","command":"resourceContent","arguments":[]}', 17 '{"seq":4,"domain":"Network","command":"resourceContent","arguments":{}}', 18 '{"seq":5,"domain":"Network","command":"resourceContent","arguments":{"identifier":"not a number"}}', 19 19 ]; 20 20 var numberOfReports = 0; -
trunk/Source/WebCore/ChangeLog
r80228 r80230 1 2011-03-02 Yury Semikhatsky <yurys@chromium.org> 2 3 Reviewed by Pavel Feldman. 4 5 Web Inspector: inspector protocol should allow different domains to have methods with same name 6 https://bugs.webkit.org/show_bug.cgi?id=55558 7 8 * inspector/CodeGeneratorInspector.pm: each command is now identified by domain + command-name(was command-name only). 9 1 10 2011-03-02 Pavel Podivilov <podivilov@chromium.org> 2 11 -
trunk/Source/WebCore/inspector/CodeGeneratorInspector.pm
r80204 r80230 456 456 457 457 push(@backendConstantDeclarations, " static const char* ${fullQualifiedFunctionName}Cmd;"); 458 push(@backendConstantDefinitions, "const char* ${backendClassName}::${fullQualifiedFunctionName}Cmd = \"${fu nctionName}\";");458 push(@backendConstantDefinitions, "const char* ${backendClassName}::${fullQualifiedFunctionName}Cmd = \"${fullQualifiedFunctionName}\";"); 459 459 460 460 map($backendTypes{$_->type} = 1, @{$function->parameters}); # register required types … … 687 687 } 688 688 689 RefPtr<InspectorValue> domainValue = messageObject->get("domain"); 690 if (!domainValue) { 691 reportProtocolError(callId, "Protocol Error: Invalid message format. 'domain' property wasn't found."); 692 return; 693 } 694 695 String domain; 696 if (!domainValue->asString(&domain)) { 697 reportProtocolError(callId, "Protocol Error: Invalid message format. The type of 'domain' property should be string."); 698 return; 699 } 700 689 701 RefPtr<InspectorValue> callIdValue = messageObject->get("seq"); 690 702 if (!callIdValue) { … … 698 710 } 699 711 700 HashMap<String, CallHandler>::iterator it = dispatchMap.find( command);712 HashMap<String, CallHandler>::iterator it = dispatchMap.find(makeString(domain, "_", command)); 701 713 if (it == dispatchMap.end()) { 702 reportProtocolError(callId, makeString("Protocol Error: Invalid command was received. '", command, "' wasn't found ."));714 reportProtocolError(callId, makeString("Protocol Error: Invalid command was received. '", command, "' wasn't found in domain ", domain, ".")); 703 715 return; 704 716 }
Note: See TracChangeset
for help on using the changeset viewer.