Source/bindings/core/v8/ScriptPreprocessor.cpp - Issue 707213002: bindings: Explicitly passes a v8::Isolate to DOMDataStore.

Side by Side Diff: Source/bindings/core/v8/ScriptPreprocessor.cpp

Issue 707213002: bindings: Explicitly passes a v8::Isolate to DOMDataStore. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2013 Google Inc. All rights reserved.	2 * Copyright (C) 2013 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 26 matching lines...) Expand all Loading...
37 #include "bindings/core/v8/V8Binding.h"	37 #include "bindings/core/v8/V8Binding.h"

38 #include "bindings/core/v8/V8ScriptRunner.h"	38 #include "bindings/core/v8/V8ScriptRunner.h"

39 #include "core/frame/FrameConsole.h"	39 #include "core/frame/FrameConsole.h"

40 #include "core/frame/FrameHost.h"	40 #include "core/frame/FrameHost.h"

41 #include "core/frame/LocalFrame.h"	41 #include "core/frame/LocalFrame.h"

42 #include "core/inspector/ConsoleMessage.h"	42 #include "core/inspector/ConsoleMessage.h"

43 #include "wtf/TemporaryChange.h"	43 #include "wtf/TemporaryChange.h"

44	44

45 namespace blink {	45 namespace blink {

46	46

47 ScriptPreprocessor::ScriptPreprocessor(const ScriptSourceCode& preprocessorSourc eCode, LocalFrame* frame)	47 ScriptPreprocessor::ScriptPreprocessor(const ScriptSourceCode& preprocessorSourc eCode, LocalFrame* frame, v8::Isolate* isolate)

48 : m_isPreprocessing(false)	48 : m_isPreprocessing(false)

49 {	49 {

50 RefPtr<DOMWrapperWorld> world = DOMWrapperWorld::ensureIsolatedWorld(ScriptP reprocessorIsolatedWorldId, DOMWrapperWorld::mainWorldExtensionGroup);	50 RefPtr<DOMWrapperWorld> world = DOMWrapperWorld::ensureIsolatedWorld(isolate , ScriptPreprocessorIsolatedWorldId, DOMWrapperWorld::mainWorldExtensionGroup);

51 m_scriptState = ScriptState::from(toV8Context(frame, *world));	51 m_scriptState = ScriptState::from(toV8Context(frame, *world));

52	52

53 v8::HandleScope handleScope(m_scriptState->isolate());	53 v8::HandleScope handleScope(m_scriptState->isolate());

54 ASSERT(frame);	54 ASSERT(frame);

55 v8::TryCatch tryCatch;	55 v8::TryCatch tryCatch;

56 tryCatch.SetVerbose(true);	56 tryCatch.SetVerbose(true);

57 Vector<ScriptSourceCode> sources;	57 Vector<ScriptSourceCode> sources;

58 sources.append(preprocessorSourceCode);	58 sources.append(preprocessorSourceCode);

59 Vector<v8::Local<v8::Value> > scriptResults;	59 Vector<v8::Local<v8::Value> > scriptResults;

60 frame->script().executeScriptInIsolatedWorld(ScriptPreprocessorIsolatedWorld Id, sources, DOMWrapperWorld::mainWorldExtensionGroup, &scriptResults);	60 frame->script().executeScriptInIsolatedWorld(ScriptPreprocessorIsolatedWorld Id, sources, DOMWrapperWorld::mainWorldExtensionGroup, &scriptResults);

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
106 TemporaryChange<bool> isPreprocessing(m_isPreprocessing, true);	106 TemporaryChange<bool> isPreprocessing(m_isPreprocessing, true);

107 v8::Handle<v8::Value> resultValue = V8ScriptRunner::callAsFunction(isolate, m_preprocessorFunction.newLocal(isolate), m_scriptState->context()->Global(), WT F_ARRAY_LENGTH(argv), argv);	107 v8::Handle<v8::Value> resultValue = V8ScriptRunner::callAsFunction(isolate, m_preprocessorFunction.newLocal(isolate), m_scriptState->context()->Global(), WT F_ARRAY_LENGTH(argv), argv);

108	108

109 if (!resultValue.IsEmpty() && resultValue->IsString())	109 if (!resultValue.IsEmpty() && resultValue->IsString())

110 return toCoreStringWithNullCheck(resultValue.As<v8::String>());	110 return toCoreStringWithNullCheck(resultValue.As<v8::String>());

111	111

112 return sourceCode;	112 return sourceCode;

113 }	113 }

114	114

115 } // namespace blink	115 } // namespace blink

OLD	NEW