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

Unified Diff: Source/bindings/v8/V8Binding.cpp

Issue 295163005: Remove ScriptState::current() from IDBRequest (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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 | « Source/bindings/v8/V8Binding.h ('k') | Source/bindings/v8/V8GCController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/v8/V8Binding.cpp
diff --git a/Source/bindings/v8/V8Binding.cpp b/Source/bindings/v8/V8Binding.cpp
index e2c63d9d3f84f461a36ba0f755862035d10305f2..a03187eabab6280a96c799868359f8952fe9a002 100644
--- a/Source/bindings/v8/V8Binding.cpp
+++ b/Source/bindings/v8/V8Binding.cpp
@@ -745,23 +745,33 @@ PassRefPtr<JSONValue> v8ToJSONValue(v8::Isolate* isolate, v8::Handle<v8::Value>
return nullptr;
}
-PassOwnPtr<V8ExecutionScope> V8ExecutionScope::create(v8::Isolate* isolate)
+PassOwnPtr<V8TestingScope> V8TestingScope::create(v8::Isolate* isolate)
{
- return adoptPtr(new V8ExecutionScope(isolate));
+ return adoptPtr(new V8TestingScope(isolate));
}
-V8ExecutionScope::V8ExecutionScope(v8::Isolate* isolate)
+V8TestingScope::V8TestingScope(v8::Isolate* isolate)
: m_handleScope(isolate)
, m_contextScope(v8::Context::New(isolate))
- , m_scriptState(ScriptState::create(isolate->GetCurrentContext(), DOMWrapperWorld::create()))
+ , m_scriptState(ScriptStateForTesting::create(isolate->GetCurrentContext(), DOMWrapperWorld::create()))
{
}
-V8ExecutionScope::~V8ExecutionScope()
+V8TestingScope::~V8TestingScope()
{
m_scriptState->disposePerContextData();
}
+ScriptState* V8TestingScope::scriptState() const
+{
+ return m_scriptState.get();
+}
+
+v8::Isolate* V8TestingScope::isolate() const
+{
+ return m_scriptState->isolate();
+}
+
void GetDevToolsFunctionInfo(v8::Handle<v8::Function> function, v8::Isolate* isolate, int& scriptId, String& resourceName, int& lineNumber)
{
v8::Handle<v8::Function> originalFunction = getBoundFunction(function);
@@ -786,14 +796,4 @@ PassRefPtr<TraceEvent::ConvertableToTraceFormat> devToolsTraceEventData(Executio
return InspectorFunctionCallEvent::data(context, scriptId, resourceName, lineNumber);
}
-ScriptState* V8ExecutionScope::scriptState() const
-{
- return m_scriptState.get();
-}
-
-v8::Isolate* V8ExecutionScope::isolate() const
-{
- return m_scriptState->isolate();
-}
-
} // namespace WebCore
« no previous file with comments | « Source/bindings/v8/V8Binding.h ('k') | Source/bindings/v8/V8GCController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698