| Index: third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
|
| diff --git a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
|
| index 495cae7a0af4aedb2d3ffe2466bd3ba0c593a66b..98873f4d10bfa4ed797abaf776fbdba2daf78910 100644
|
| --- a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
|
| +++ b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
|
| @@ -1179,7 +1179,7 @@ Node* InspectorDOMAgent::nodeForRemoteId(ErrorString* errorString, const String&
|
| return node;
|
| }
|
|
|
| -void InspectorDOMAgent::highlightNode(ErrorString* errorString, std::unique_ptr<protocol::DOM::HighlightConfig> highlightInspectorObject, const Maybe<int>& nodeId, const Maybe<int>& backendNodeId, const Maybe<String16>& objectId)
|
| +void InspectorDOMAgent::highlightNode(ErrorString* errorString, std::unique_ptr<protocol::DOM::HighlightConfig> highlightInspectorObject, const Maybe<int>& nodeId, const Maybe<int>& backendNodeId, const Maybe<String>& objectId)
|
| {
|
| Node* node = nullptr;
|
| if (nodeId.isJust()) {
|
| @@ -1386,7 +1386,7 @@ void InspectorDOMAgent::getAttributes(ErrorString* errorString, int nodeId, std:
|
| *result = buildArrayForElementAttributes(element);
|
| }
|
|
|
| -void InspectorDOMAgent::requestNode(ErrorString* errorString, const String16& objectId, int* nodeId)
|
| +void InspectorDOMAgent::requestNode(ErrorString* errorString, const String& objectId, int* nodeId)
|
| {
|
| Node* node = nodeForRemoteId(errorString, objectId);
|
| if (node)
|
| @@ -2041,7 +2041,7 @@ void InspectorDOMAgent::getHighlightObjectForTest(ErrorString* errorString, int
|
| *result = highlight.asProtocolValue();
|
| }
|
|
|
| -std::unique_ptr<protocol::Runtime::RemoteObject> InspectorDOMAgent::resolveNode(Node* node, const String16& objectGroup)
|
| +std::unique_ptr<protocol::Runtime::RemoteObject> InspectorDOMAgent::resolveNode(Node* node, const String& objectGroup)
|
| {
|
| Document* document = node->isDocumentNode() ? &node->document() : node->ownerDocument();
|
| LocalFrame* frame = document ? document->frame() : nullptr;
|
|
|