Changeset 103174 in webkit
- Timestamp:
- Dec 18, 2011 7:05:58 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r103170 r103174 1 2011-12-18 Peter Rybin <peter.rybin@gmail.com> 2 3 Web Inspector: Switch to type-safe JSON ConsoleMessage.cpp, InspectorDOMAgent.cpp, InspectorDebuggerAgent.cpp, ScriptCallFrame.cpp 4 https://bugs.webkit.org/show_bug.cgi?id=74549 5 6 Reviewed by Pavel Feldman. 7 8 Expected file modified as JSON properties are now in different 9 order. 10 11 * inspector/protocol/console-agent-expected.txt: 12 1 13 2011-12-18 Alexandru Chiculita <achicu@adobe.com> 2 14 -
trunk/LayoutTests/inspector/protocol/console-agent-expected.txt
r100137 r103174 55 55 message : { 56 56 source : "console-api" 57 level : "log" 58 text : "test" 57 59 type : "log" 58 level : "log"59 60 line : 1 60 61 url : "" 61 62 repeatCount : 1 62 text : "test"63 63 parameters : [ 64 64 { -
trunk/Source/WebCore/ChangeLog
r103173 r103174 1 2011-12-18 Peter Rybin <peter.rybin@gmail.com> 2 3 Web Inspector: Switch to type-safe JSON ConsoleMessage.cpp, InspectorDOMAgent.cpp, InspectorDebuggerAgent.cpp, ScriptCallFrame.cpp 4 https://bugs.webkit.org/show_bug.cgi?id=74549 5 6 Reviewed by Pavel Feldman. 7 8 Work with InspectorObject is replaced with type-safe generated API 9 usage. 10 Inspector.json and Inspector-0.1.json are also changed to better 11 reflect data types that are actually being transmitted. 12 13 * inspector/ConsoleMessage.cpp: 14 (WebCore::ConsoleMessage::addToFrontend): 15 * inspector/Inspector-0.1.json: 16 * inspector/Inspector.json: 17 * inspector/InspectorDOMAgent.cpp: 18 (WebCore::InspectorDOMAgent::buildObjectForNode): 19 (WebCore::InspectorDOMAgent::buildObjectForEventListener): 20 * inspector/InspectorDebuggerAgent.cpp: 21 (WebCore::InspectorDebuggerAgent::resolveBreakpoint): 22 * inspector/ScriptCallFrame.cpp: 23 (WebCore::ScriptCallFrame::buildInspectorObject): 24 1 25 2011-12-18 Peter Rybin <peter.rybin@gmail.com> 2 26 -
trunk/Source/WebCore/inspector/ConsoleMessage.cpp
r100137 r103174 135 135 void ConsoleMessage::addToFrontend(InspectorFrontend::Console* frontend, InjectedScriptManager* injectedScriptManager) 136 136 { 137 RefPtr<InspectorObject> jsonObj = InspectorObject::create(); 138 jsonObj->setString("source", messageSourceValue(m_source)); 137 RefPtr<TypeBuilder::Console::ConsoleMessage> jsonObj = TypeBuilder::Console::ConsoleMessage::create() 138 .setSource(messageSourceValue(m_source)) 139 .setLevel(messageLevelValue(m_level)) 140 .setText(m_message); 139 141 // FIXME: only send out type for ConsoleAPI source messages. 140 jsonObj->setString("type", messageTypeValue(m_type)); 141 jsonObj->setString("level", messageLevelValue(m_level)); 142 jsonObj->setNumber("line", static_cast<int>(m_line)); 143 jsonObj->setString("url", m_url); 144 jsonObj->setNumber("repeatCount", static_cast<int>(m_repeatCount)); 145 jsonObj->setString("text", m_message); 142 jsonObj->setType(messageTypeValue(m_type)); 143 jsonObj->setLine(static_cast<int>(m_line)); 144 jsonObj->setUrl(m_url); 145 jsonObj->setRepeatCount(static_cast<int>(m_repeatCount)); 146 146 if (m_source == NetworkMessageSource && !m_requestId.isEmpty()) 147 jsonObj->set String("networkRequestId",m_requestId);147 jsonObj->setNetworkRequestId(m_requestId); 148 148 if (m_arguments && m_arguments->argumentCount()) { 149 149 InjectedScript injectedScript = injectedScriptManager->injectedScriptFor(m_arguments->globalState()); … … 158 158 jsonArgs->pushValue(inspectorValue); 159 159 } 160 jsonObj->set Array("parameters",jsonArgs);160 jsonObj->setParameters(jsonArgs); 161 161 } 162 162 } 163 163 if (m_callStack) 164 jsonObj->set Array("stackTrace",m_callStack->buildInspectorArray());164 jsonObj->setStackTrace(m_callStack->buildInspectorArray()); 165 165 frontend->messageAdded(jsonObj); 166 166 } -
trunk/Source/WebCore/inspector/Inspector-0.1.json
r98326 r103174 370 370 { "name": "functionName", "type": "string", "description": "JavaScript function name." }, 371 371 { "name": "url", "type": "string", "description": "JavaScript script name or url." }, 372 { "name": "lineNumber", "type": " string", "description": "JavaScript script line number." },373 { "name": "columnNumber", "type": " string", "description": "JavaScript script column number." }372 { "name": "lineNumber", "type": "integer", "description": "JavaScript script line number." }, 373 { "name": "columnNumber", "type": "integer", "description": "JavaScript script column number." } 374 374 ] 375 375 }, -
trunk/Source/WebCore/inspector/Inspector.json
r102903 r103174 449 449 { "name": "functionName", "type": "string", "description": "JavaScript function name." }, 450 450 { "name": "url", "type": "string", "description": "JavaScript script name or url." }, 451 { "name": "lineNumber", "type": " string", "description": "JavaScript script line number." },452 { "name": "columnNumber", "type": " string", "description": "JavaScript script column number." }451 { "name": "lineNumber", "type": "integer", "description": "JavaScript script line number." }, 452 { "name": "columnNumber", "type": "integer", "description": "JavaScript script column number." } 453 453 ] 454 454 }, -
trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp
r101367 r103174 1126 1126 PassRefPtr<InspectorObject> InspectorDOMAgent::buildObjectForNode(Node* node, int depth, NodeToIdMap* nodesMap) 1127 1127 { 1128 RefPtr<InspectorObject> value = InspectorObject::create();1129 1130 1128 int id = bind(node, nodesMap); 1131 1129 String nodeName; … … 1156 1154 } 1157 1155 1158 value->setNumber("nodeId", id); 1159 value->setNumber("nodeType", node->nodeType()); 1160 value->setString("nodeName", nodeName); 1161 value->setString("localName", localName); 1162 value->setString("nodeValue", nodeValue); 1156 RefPtr<TypeBuilder::DOM::Node> value = TypeBuilder::DOM::Node::create() 1157 .setNodeId(id) 1158 .setNodeType(node->nodeType()) 1159 .setNodeName(nodeName) 1160 .setLocalName(localName) 1161 .setNodeValue(nodeValue); 1163 1162 1164 1163 if (node->nodeType() == Node::ELEMENT_NODE || node->nodeType() == Node::DOCUMENT_NODE || node->nodeType() == Node::DOCUMENT_FRAGMENT_NODE) { 1165 1164 int nodeCount = innerChildNodeCount(node); 1166 value->set Number("childNodeCount",nodeCount);1165 value->setChildNodeCount(nodeCount); 1167 1166 RefPtr<InspectorArray> children = buildArrayForContainerChildren(node, depth, nodesMap); 1168 1167 if (children->length() > 0) … … 1174 1173 if (node->isFrameOwnerElement()) { 1175 1174 HTMLFrameOwnerElement* frameOwner = static_cast<HTMLFrameOwnerElement*>(node); 1176 value->set String("documentURL",documentURLString(frameOwner->contentDocument()));1175 value->setDocumentURL(documentURLString(frameOwner->contentDocument())); 1177 1176 } 1178 1177 } else if (node->nodeType() == Node::DOCUMENT_NODE) { 1179 1178 Document* document = static_cast<Document*>(node); 1180 value->set String("documentURL",documentURLString(document));1181 value->set String("xmlVersion",document->xmlVersion());1179 value->setDocumentURL(documentURLString(document)); 1180 value->setXmlVersion(document->xmlVersion()); 1182 1181 } 1183 1182 } else if (node->nodeType() == Node::DOCUMENT_TYPE_NODE) { 1184 1183 DocumentType* docType = static_cast<DocumentType*>(node); 1185 value->set String("publicId",docType->publicId());1186 value->setS tring("systemId",docType->systemId());1187 value->set String("internalSubset",docType->internalSubset());1184 value->setPublicId(docType->publicId()); 1185 value->setSystemId(docType->systemId()); 1186 value->setInternalSubset(docType->internalSubset()); 1188 1187 } else if (node->nodeType() == Node::ATTRIBUTE_NODE) { 1189 1188 Attr* attribute = static_cast<Attr*>(node); 1190 value->set String("name",attribute->name());1191 value->set String("value",attribute->value());1189 value->setName(attribute->name()); 1190 value->setValue(attribute->value()); 1192 1191 } 1193 1192 return value.release(); … … 1236 1235 { 1237 1236 RefPtr<EventListener> eventListener = registeredEventListener.listener; 1238 RefPtr< InspectorObject> value = InspectorObject::create();1239 value->setString("type", eventType);1240 value->setBoolean("useCapture", registeredEventListener.useCapture);1241 value->setBoolean("isAttribute", eventListener->isAttribute());1242 value->setNumber("nodeId", pushNodePathToFrontend(node));1243 value->setString("handlerBody",eventListenerHandlerBody(node->document(), eventListener.get()));1237 RefPtr<TypeBuilder::DOM::EventListener> value = TypeBuilder::DOM::EventListener::create() 1238 .setType(eventType) 1239 .setUseCapture(registeredEventListener.useCapture) 1240 .setIsAttribute(eventListener->isAttribute()) 1241 .setNodeId(pushNodePathToFrontend(node)) 1242 .setHandlerBody(eventListenerHandlerBody(node->document(), eventListener.get())); 1244 1243 String sourceName; 1245 1244 int lineNumber; 1246 1245 if (eventListenerHandlerLocation(node->document(), eventListener.get(), sourceName, lineNumber)) { 1247 RefPtr< InspectorObject> location = InspectorObject::create();1248 location->setString("scriptId", sourceName);1249 location->setNumber("lineNumber",lineNumber);1250 value->set Object("location",location);1246 RefPtr<TypeBuilder::Debugger::Location> location = TypeBuilder::Debugger::Location::create() 1247 .setScriptId(sourceName) 1248 .setLineNumber(lineNumber); 1249 value->setLocation(location); 1251 1250 } 1252 1251 return value.release(); -
trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp
r101651 r103174 319 319 debugServerBreakpointIdsIterator->second.append(debugServerBreakpointId); 320 320 321 RefPtr< InspectorObject> location = InspectorObject::create();322 location->setString("scriptId", scriptId);323 location->setNumber("lineNumber",actualLineNumber);324 location->set Number("columnNumber",actualColumnNumber);321 RefPtr<TypeBuilder::Debugger::Location> location = TypeBuilder::Debugger::Location::create() 322 .setScriptId(scriptId) 323 .setLineNumber(actualLineNumber); 324 location->setColumnNumber(actualColumnNumber); 325 325 return location; 326 326 } -
trunk/Source/WebCore/inspector/ScriptCallFrame.cpp
r95901 r103174 32 32 #include "ScriptCallFrame.h" 33 33 34 #include "InspectorFrontend.h" 34 35 #include "InspectorValues.h" 35 36 #include <wtf/RefPtr.h> … … 59 60 PassRefPtr<InspectorObject> ScriptCallFrame::buildInspectorObject() const 60 61 { 61 RefPtr< InspectorObject> frame = InspectorObject::create();62 frame->setString("functionName", m_functionName);63 frame->setString("url", m_scriptName);64 frame->setNumber("lineNumber", m_lineNumber);65 frame->setNumber("columnNumber",m_column);62 RefPtr<TypeBuilder::Console::CallFrame> frame = TypeBuilder::Console::CallFrame::create() 63 .setFunctionName(m_functionName) 64 .setUrl(m_scriptName) 65 .setLineNumber(m_lineNumber) 66 .setColumnNumber(m_column); 66 67 return frame; 67 68 }
Note: See TracChangeset
for help on using the changeset viewer.