third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.cpp - Issue 1767883002: DevTools: generate string16-based handlers for v8_inspector.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.cpp

Issue 1767883002: DevTools: generate string16-based handlers for v8_inspector. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: for landing 2 Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.h ('k') | third_party/WebKit/Source/platform/v8_inspector/InjectedScriptNative.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.cpp

diff --git a/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.cpp b/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.cpp

index f4c81cc56f61d46d6e4fd8560e75c757f41f8f48..9ea797783003ed37a58a1eea77864020a21b9016 100644

--- a/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.cpp

+++ b/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.cpp

@@ -95,7 +95,7 @@ void InjectedScriptManager::discardInjectedScript(int contextId)

m_idToInjectedScript.remove(contextId);

}

-void InjectedScriptManager::releaseObjectGroup(const String& objectGroup)

+void InjectedScriptManager::releaseObjectGroup(const String16& objectGroup)

{

protocol::Vector<int> keys;

for (auto& it : m_idToInjectedScript)

@@ -129,7 +129,7 @@ InjectedScript* InjectedScriptManager::injectedScriptFor(v8::Local<v8::Context>

return nullptr;

OwnPtr<InjectedScriptNative> injectedScriptNative = adoptPtr(new InjectedScriptNative(context->GetIsolate()));

- String injectedScriptSource(reinterpret_cast<const char*>(InjectedScriptSource_js), sizeof(InjectedScriptSource_js));

+ String16 injectedScriptSource(reinterpret_cast<const char*>(InjectedScriptSource_js), sizeof(InjectedScriptSource_js));

v8::Local<v8::Object> object = createInjectedScript(injectedScriptSource, context, contextId, injectedScriptNative.get());

OwnPtr<InjectedScript> result = adoptPtr(new InjectedScript(this, context, object, m_client, injectedScriptNative.release(), contextId));

@@ -141,7 +141,7 @@ InjectedScript* InjectedScriptManager::injectedScriptFor(v8::Local<v8::Context>

return resultPtr;

}

-v8::Local<v8::Object> InjectedScriptManager::createInjectedScript(const String& source, v8::Local<v8::Context> context, int id, InjectedScriptNative* injectedScriptNative)

+v8::Local<v8::Object> InjectedScriptManager::createInjectedScript(const String16& source, v8::Local<v8::Context> context, int id, InjectedScriptNative* injectedScriptNative)

{

v8::Isolate* isolate = context->GetIsolate();

v8::Context::Scope scope(context);