| Index: third_party/WebKit/Source/platform/v8_inspector/InjectedScriptNative.h
|
| diff --git a/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptNative.h b/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptNative.h
|
| index f7c99c78deb64ec06d32556d8507aa7a5544bf4b..9a80d57c2f74c47ed88b73e5b3e1a07feaca3136 100644
|
| --- a/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptNative.h
|
| +++ b/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptNative.h
|
| @@ -6,8 +6,8 @@
|
| #define InjectedScriptNative_h
|
|
|
| #include "platform/inspector_protocol/Collections.h"
|
| +#include "platform/inspector_protocol/String16.h"
|
| #include "wtf/PassOwnPtr.h"
|
| -#include "wtf/text/WTFString.h"
|
| #include <v8.h>
|
|
|
| namespace blink {
|
| @@ -20,22 +20,22 @@ public:
|
| void setOnInjectedScriptHost(v8::Local<v8::Object>);
|
| static InjectedScriptNative* fromInjectedScriptHost(v8::Local<v8::Object>);
|
|
|
| - int bind(v8::Local<v8::Value>, const String& groupName);
|
| + int bind(v8::Local<v8::Value>, const String16& groupName);
|
| void unbind(int id);
|
| v8::Local<v8::Value> objectForId(int id);
|
|
|
| - void releaseObjectGroup(const String& groupName);
|
| - String groupName(int objectId) const;
|
| + void releaseObjectGroup(const String16& groupName);
|
| + String16 groupName(int objectId) const;
|
|
|
| private:
|
| - void addObjectToGroup(int objectId, const String& groupName);
|
| + void addObjectToGroup(int objectId, const String16& groupName);
|
|
|
| int m_lastBoundObjectId;
|
| v8::Isolate* m_isolate;
|
| protocol::HashMap<int, OwnPtr<v8::Global<v8::Value>>> m_idToWrappedObject;
|
| - typedef protocol::HashMap<int, String> IdToObjectGroupName;
|
| + typedef protocol::HashMap<int, String16> IdToObjectGroupName;
|
| IdToObjectGroupName m_idToObjectGroupName;
|
| - typedef protocol::HashMap<String, protocol::Vector<int>> NameToObjectGroup;
|
| + typedef protocol::HashMap<String16, protocol::Vector<int>> NameToObjectGroup;
|
| NameToObjectGroup m_nameToObjectGroup;
|
| };
|
|
|
|
|