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

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

Issue 14362015: WIP enum / V8PerContextData solution (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 8 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/WebKit/chromium/src/WebScopedCompilation.cpp ('k') | Source/bindings/v8/ScriptDebugServer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/v8/ScriptController.cpp
diff --git a/Source/bindings/v8/ScriptController.cpp b/Source/bindings/v8/ScriptController.cpp
index 5bbaff5f5256d47c045df42fc74f79ce538b8263..b36f75d02779e8fcb08be27e20e4b0f38e164b20 100644
--- a/Source/bindings/v8/ScriptController.cpp
+++ b/Source/bindings/v8/ScriptController.cpp
@@ -272,7 +272,7 @@ v8::Local<v8::Value> ScriptController::compileAndRunScript(const ScriptSourceCod
v8::Handle<v8::Script> script = ScriptSourceCode::compileScript(code, source.url(), source.startPosition(), scriptData.get(), m_isolate);
TRACE_EVENT_END0("v8", "v8.compile");
TRACE_EVENT0("v8", "v8.run");
-
+
// Keep Frame (and therefore ScriptController) alive.
RefPtr<Frame> protect(m_frame);
result = ScriptRunner::runCompiledScript(script, m_frame->document());
@@ -678,12 +678,13 @@ bool ScriptController::setContextDebugId(int debugId)
return false;
v8::HandleScope scope;
v8::Handle<v8::Context> context = m_windowShell->context();
- return V8PerContextDebugData::setContextDebugData(context, "page", debugId);
+ V8PerContextDebugData::setDebugDataForPage(context, debugId);
+ return true;
}
int ScriptController::contextDebugId(v8::Handle<v8::Context> context)
{
- return V8PerContextDebugData::contextDebugId(context);
+ return V8PerContextDebugData::debugId(context);
}
void ScriptController::updateDocument()
« no previous file with comments | « Source/WebKit/chromium/src/WebScopedCompilation.cpp ('k') | Source/bindings/v8/ScriptDebugServer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698