Index: Source/bindings/core/v8/ScriptController.cpp |
diff --git a/Source/bindings/core/v8/ScriptController.cpp b/Source/bindings/core/v8/ScriptController.cpp |
index a0bffd4e4483eebdfc06d3a676f34067af75a67e..939f7fded44d36b091bd2584988f1e1f288fe604 100644 |
--- a/Source/bindings/core/v8/ScriptController.cpp |
+++ b/Source/bindings/core/v8/ScriptController.cpp |
@@ -572,8 +572,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; |
+ ScriptSourceCode maybeProcessedSourceCode = InspectorInstrumentation::preprocess(frame(), sourceCode); |
+ const ScriptSourceCode& sourceCodeToCompile = maybeProcessedSourceCode.isNull() ? sourceCode : maybeProcessedSourceCode; |
v8::Local<v8::Value> object = executeScriptAndReturnValue(scriptState->context(), sourceCodeToCompile, corsStatus, compilationFinishTime); |
m_sourceURL = savedSourceURL; |
@@ -584,7 +584,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); |