Index: third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
diff --git a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
index 73163b175666f3be871c98b5009fbc8e0be1c14d..9abd76a60501e91c0bb1d8764def42a03604dcec 100644 |
--- a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
@@ -632,7 +632,7 @@ void WebDevToolsAgentImpl::sendProtocolResponse(int sessionId, int callId, PassO |
m_stateCookie = stateToSend; |
} |
- m_client->sendProtocolMessage(sessionId, callId, message->toJSONString(), stateToSend); |
+ m_client->sendProtocolMessage(sessionId, callId, String(message->toJSONString()), stateToSend); |
dgozman
2016/03/08 01:35:12
operator WebString
|
} |
void WebDevToolsAgentImpl::sendProtocolNotification(PassOwnPtr<protocol::DictionaryValue> message) |
@@ -694,7 +694,7 @@ void WebDevToolsAgentImpl::flushPendingProtocolNotifications() |
if (m_attached) { |
m_agents.flushPendingProtocolNotifications(); |
for (size_t i = 0; i < m_notificationQueue.size(); ++i) |
- m_client->sendProtocolMessage(m_notificationQueue[i].first, 0, m_notificationQueue[i].second->toJSONString(), WebString()); |
+ m_client->sendProtocolMessage(m_notificationQueue[i].first, 0, String(m_notificationQueue[i].second->toJSONString()), WebString()); |
dgozman
2016/03/08 01:35:12
ditto
|
} |
m_notificationQueue.clear(); |
} |
@@ -735,8 +735,8 @@ void WebDevToolsAgent::interruptAndDispatch(int sessionId, MessageDescriptor* ra |
bool WebDevToolsAgent::shouldInterruptForMessage(const WebString& message) |
{ |
- String commandName; |
- if (!protocol::Dispatcher::getCommandName(message, &commandName)) |
+ String16 commandName; |
+ if (!protocol::Dispatcher::getCommandName(String(message), &commandName)) |
dgozman
2016/03/08 01:35:12
ditto
|
return false; |
return commandName == "Debugger.pause" |
|| commandName == "Debugger.setBreakpoint" |