Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(208)

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

Issue 304353015: Remove unused Isolate* parameters from toV8Context() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/bindings/v8/ScriptController.cpp ('k') | Source/bindings/v8/ScriptState.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 29 matching lines...) Expand all
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 "wtf/TemporaryChange.h" 42 #include "wtf/TemporaryChange.h"
43 43
44 namespace WebCore { 44 namespace WebCore {
45 45
46 ScriptPreprocessor::ScriptPreprocessor(const ScriptSourceCode& preprocessorSourc eCode, LocalFrame* frame) 46 ScriptPreprocessor::ScriptPreprocessor(const ScriptSourceCode& preprocessorSourc eCode, LocalFrame* frame)
47 : m_isPreprocessing(false) 47 : m_isPreprocessing(false)
48 { 48 {
49 RefPtr<DOMWrapperWorld> world = DOMWrapperWorld::ensureIsolatedWorld(ScriptP reprocessorIsolatedWorldId, DOMWrapperWorld::mainWorldExtensionGroup); 49 RefPtr<DOMWrapperWorld> world = DOMWrapperWorld::ensureIsolatedWorld(ScriptP reprocessorIsolatedWorldId, DOMWrapperWorld::mainWorldExtensionGroup);
50 m_scriptState = ScriptState::from(toV8Context(toIsolate(frame), frame, *worl d)); 50 m_scriptState = ScriptState::from(toV8Context(frame, *world));
51 51
52 ASSERT(frame); 52 ASSERT(frame);
53 v8::TryCatch tryCatch; 53 v8::TryCatch tryCatch;
54 tryCatch.SetVerbose(true); 54 tryCatch.SetVerbose(true);
55 Vector<ScriptSourceCode> sources; 55 Vector<ScriptSourceCode> sources;
56 sources.append(preprocessorSourceCode); 56 sources.append(preprocessorSourceCode);
57 Vector<ScriptValue> scriptResults; 57 Vector<ScriptValue> scriptResults;
58 frame->script().executeScriptInIsolatedWorld(ScriptPreprocessorIsolatedWorld Id, sources, DOMWrapperWorld::mainWorldExtensionGroup, &scriptResults); 58 frame->script().executeScriptInIsolatedWorld(ScriptPreprocessorIsolatedWorld Id, sources, DOMWrapperWorld::mainWorldExtensionGroup, &scriptResults);
59 59
60 if (scriptResults.size() != 1) { 60 if (scriptResults.size() != 1) {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 TemporaryChange<bool> isPreprocessing(m_isPreprocessing, true); 104 TemporaryChange<bool> isPreprocessing(m_isPreprocessing, true);
105 v8::Handle<v8::Value> resultValue = V8ScriptRunner::callAsFunction(isolate, m_preprocessorFunction.newLocal(isolate), m_scriptState->context()->Global(), WT F_ARRAY_LENGTH(argv), argv); 105 v8::Handle<v8::Value> resultValue = V8ScriptRunner::callAsFunction(isolate, m_preprocessorFunction.newLocal(isolate), m_scriptState->context()->Global(), WT F_ARRAY_LENGTH(argv), argv);
106 106
107 if (!resultValue.IsEmpty() && resultValue->IsString()) 107 if (!resultValue.IsEmpty() && resultValue->IsString())
108 return toCoreStringWithNullCheck(resultValue.As<v8::String>()); 108 return toCoreStringWithNullCheck(resultValue.As<v8::String>());
109 109
110 return sourceCode; 110 return sourceCode;
111 } 111 }
112 112
113 } // namespace WebCore 113 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/ScriptController.cpp ('k') | Source/bindings/v8/ScriptState.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698