Source/bindings/core/v8/ScriptController.cpp - Issue 847803002: Make ScriptStreamer and dependents Oilpan friendly.

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: Source/bindings/core/v8/ScriptController.cpp

Issue 847803002: Make ScriptStreamer and dependents Oilpan friendly. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: nullptr tidying Created 5 years, 11 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

« Source/bindings/core/v8/PageScriptDebugServer.cpp ('K') | « Source/bindings/core/v8/ScriptController.h ('k') | Source/bindings/core/v8/ScriptDebugServer.h » ('j') | Source/bindings/core/v8/ScriptStreamer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/bindings/core/v8/ScriptController.cpp

diff --git a/Source/bindings/core/v8/ScriptController.cpp b/Source/bindings/core/v8/ScriptController.cpp

index c1eaba00f5c7426dd549a57177c314b5751059bc..b6524e74a3e01e1adbd8205f8171fe2902b1e276 100644

--- a/Source/bindings/core/v8/ScriptController.cpp

+++ b/Source/bindings/core/v8/ScriptController.cpp

@@ -571,8 +571,8 @@ v8::Local<v8::Value> ScriptController::evaluateScriptInMainWorld(const ScriptSou

if (frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument())

frame()->loader().didAccessInitialDocument();

- OwnPtr<ScriptSourceCode> maybeProcessedSourceCode = InspectorInstrumentation::preprocess(frame(), sourceCode);

- const ScriptSourceCode& sourceCodeToCompile = maybeProcessedSourceCode ? *maybeProcessedSourceCode : sourceCode;

+ Nullable<ScriptSourceCode> maybeProcessedSourceCode = InspectorInstrumentation::preprocess(frame(), sourceCode);

+ const ScriptSourceCode& sourceCodeToCompile = maybeProcessedSourceCode.isNull() ? sourceCode : maybeProcessedSourceCode.get();

v8::Local<v8::Value> object = executeScriptAndReturnValue(scriptState->context(), sourceCodeToCompile, corsStatus, compilationFinishTime);

m_sourceURL = savedSourceURL;

@@ -583,7 +583,7 @@ v8::Local<v8::Value> ScriptController::evaluateScriptInMainWorld(const ScriptSou

return handleScope.Escape(object);

}

-void ScriptController::executeScriptInIsolatedWorld(int worldID, const Vector<ScriptSourceCode>& sources, int extensionGroup, Vector<v8::Local<v8::Value> >* results)

+void ScriptController::executeScriptInIsolatedWorld(int worldID, const WillBeHeapVector<ScriptSourceCode>& sources, int extensionGroup, Vector<v8::Local<v8::Value> >* results)

{

ASSERT(worldID > 0);