| Index: third_party/WebKit/Source/platform/v8_inspector/InjectedScriptNative.cpp
|
| diff --git a/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptNative.cpp b/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptNative.cpp
|
| index 8dd253f4a51703fe5a5bec0f184ff2f7d8f7d25b..ca68b74a5273389e49e222d927661d672f068454 100644
|
| --- a/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptNative.cpp
|
| +++ b/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptNative.cpp
|
| @@ -38,7 +38,7 @@ InjectedScriptNative* InjectedScriptNative::fromInjectedScriptHost(v8::Local<v8:
|
| return static_cast<InjectedScriptNative*>(external->Value());
|
| }
|
|
|
| -int InjectedScriptNative::bind(v8::Local<v8::Value> value, const String& groupName)
|
| +int InjectedScriptNative::bind(v8::Local<v8::Value> value, const String16& groupName)
|
| {
|
| if (m_lastBoundObjectId <= 0)
|
| m_lastBoundObjectId = 1;
|
| @@ -59,7 +59,7 @@ v8::Local<v8::Value> InjectedScriptNative::objectForId(int id)
|
| return m_idToWrappedObject.contains(id) ? m_idToWrappedObject.get(id)->Get(m_isolate) : v8::Local<v8::Value>();
|
| }
|
|
|
| -void InjectedScriptNative::addObjectToGroup(int objectId, const String& groupName)
|
| +void InjectedScriptNative::addObjectToGroup(int objectId, const String16& groupName)
|
| {
|
| if (groupName.isEmpty())
|
| return;
|
| @@ -74,7 +74,7 @@ void InjectedScriptNative::addObjectToGroup(int objectId, const String& groupNam
|
| it->second->append(objectId);
|
| }
|
|
|
| -void InjectedScriptNative::releaseObjectGroup(const String& groupName)
|
| +void InjectedScriptNative::releaseObjectGroup(const String16& groupName)
|
| {
|
| if (groupName.isEmpty())
|
| return;
|
| @@ -86,10 +86,10 @@ void InjectedScriptNative::releaseObjectGroup(const String& groupName)
|
| m_nameToObjectGroup.remove(groupName);
|
| }
|
|
|
| -String InjectedScriptNative::groupName(int objectId) const
|
| +String16 InjectedScriptNative::groupName(int objectId) const
|
| {
|
| if (objectId <= 0)
|
| - return String();
|
| + return String16();
|
| return m_idToObjectGroupName.get(objectId);
|
| }
|
|
|
|
|