Modified: trunk/Source/WebCore/ChangeLog (159271 => 159272)
--- trunk/Source/WebCore/ChangeLog 2013-11-14 02:58:05 UTC (rev 159271)
+++ trunk/Source/WebCore/ChangeLog 2013-11-14 03:01:16 UTC (rev 159272)
@@ -1,5 +1,18 @@
2013-11-13 Joseph Pecoraro <[email protected]>
+ Web Inspector: InspectorBackendDispatcher improvements
+ https://bugs.webkit.org/show_bug.cgi?id=124330
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorBackendDispatcher.cpp:
+ (WebCore::InspectorBackendDispatcher::sendResponse):
+ (WebCore::InspectorBackendDispatcher::reportProtocolError):
+ * inspector/InspectorBackendDispatcher.h:
+ (WebCore::InspectorSupplementalBackendDispatcher::InspectorSupplementalBackendDispatcher):
+
+2013-11-13 Joseph Pecoraro <[email protected]>
+
Unreviewed Windows Build Fix after r159268.
Missed adding InspectorBackendDispatcher.h and cpp to the Windows build.
Modified: trunk/Source/WebCore/inspector/InspectorBackendDispatcher.cpp (159271 => 159272)
--- trunk/Source/WebCore/inspector/InspectorBackendDispatcher.cpp 2013-11-14 02:58:05 UTC (rev 159271)
+++ trunk/Source/WebCore/inspector/InspectorBackendDispatcher.cpp 2013-11-14 03:01:16 UTC (rev 159272)
@@ -154,8 +154,8 @@
}
RefPtr<InspectorObject> responseMessage = InspectorObject::create();
- responseMessage->setObject("result", result);
- responseMessage->setNumber("id", callId);
+ responseMessage->setObject(ASCIILiteral("result"), result);
+ responseMessage->setNumber(ASCIILiteral("id"), callId);
m_inspectorFrontendChannel->sendMessageToFrontend(responseMessage->toJSONString());
}
@@ -166,35 +166,34 @@
void InspectorBackendDispatcher::reportProtocolError(const long* const callId, CommonErrorCode errorCode, const String& errorMessage, PassRefPtr<InspectorArray> data) const
{
- DEFINE_STATIC_LOCAL(Vector<int>, commonErrors, ());
- if (!commonErrors.size()) {
- commonErrors.insert(ParseError, -32700);
- commonErrors.insert(InvalidRequest, -32600);
- commonErrors.insert(MethodNotFound, -32601);
- commonErrors.insert(InvalidParams, -32602);
- commonErrors.insert(InternalError, -32603);
- commonErrors.insert(ServerError, -32000);
- }
+ static const int errorCodes[] = {
+ -32700, // ParseError
+ -32600, // InvalidRequest
+ -32601, // MethodNotFound
+ -32602, // InvalidParams
+ -32603, // InternalError
+ -32000, // ServerError
+ };
ASSERT(errorCode >= 0);
- ASSERT((unsigned)errorCode < commonErrors.size());
- ASSERT(commonErrors[errorCode]);
+ ASSERT((unsigned)errorCode < WTF_ARRAY_LENGTH(errorCodes));
+ ASSERT(errorCodes[errorCode]);
if (!m_inspectorFrontendChannel)
return;
RefPtr<InspectorObject> error = InspectorObject::create();
- error->setNumber("code", commonErrors[errorCode]);
- error->setString("message", errorMessage);
+ error->setNumber(ASCIILiteral("code"), errorCodes[errorCode]);
+ error->setString(ASCIILiteral("message"), errorMessage);
if (data)
- error->setArray("data", data);
+ error->setArray(ASCIILiteral("data"), data);
RefPtr<InspectorObject> message = InspectorObject::create();
- message->setObject("error", error.release());
+ message->setObject(ASCIILiteral("error"), error.release());
if (callId)
- message->setNumber("id", *callId);
+ message->setNumber(ASCIILiteral("id"), *callId);
else
- message->setValue("id", InspectorValue::null());
+ message->setValue(ASCIILiteral("id"), InspectorValue::null());
m_inspectorFrontendChannel->sendMessageToFrontend(message->toJSONString());
}
Modified: trunk/Source/WebCore/inspector/InspectorBackendDispatcher.h (159271 => 159272)
--- trunk/Source/WebCore/inspector/InspectorBackendDispatcher.h 2013-11-14 02:58:05 UTC (rev 159271)
+++ trunk/Source/WebCore/inspector/InspectorBackendDispatcher.h 2013-11-14 03:01:16 UTC (rev 159272)
@@ -40,7 +40,7 @@
class InspectorSupplementalBackendDispatcher : public RefCounted<InspectorSupplementalBackendDispatcher> {
public:
- InspectorSupplementalBackendDispatcher(InspectorBackendDispatcher *backendDispatcher) : m_backendDispatcher(backendDispatcher) { }
+ InspectorSupplementalBackendDispatcher(InspectorBackendDispatcher* backendDispatcher) : m_backendDispatcher(backendDispatcher) { }
virtual ~InspectorSupplementalBackendDispatcher() { }
virtual void dispatch(long callId, const String& method, PassRefPtr<InspectorObject> message) = 0;
protected:
