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

Side by Side Diff: sky/engine/bindings/core/v8/ScriptController.cpp

Issue 771323002: Remove a couple more core/ header includes from v8_inspector (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2009 Apple Inc. All rights reserved.
4 * Copyright (C) 2014 Opera Software ASA. All rights reserved. 4 * Copyright (C) 2014 Opera Software ASA. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are 7 * modification, are permitted provided that the following conditions are
8 * met: 8 * met:
9 * 9 *
10 * * Redistributions of source code must retain the above copyright 10 * * Redistributions of source code must retain the above copyright
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 v8::Local<v8::Value> ScriptController::callFunction(ExecutionContext* context, v 8::Handle<v8::Function> function, v8::Handle<v8::Value> receiver, int argc, v8:: Handle<v8::Value> info[], v8::Isolate* isolate) 115 v8::Local<v8::Value> ScriptController::callFunction(ExecutionContext* context, v 8::Handle<v8::Function> function, v8::Handle<v8::Value> receiver, int argc, v8:: Handle<v8::Value> info[], v8::Isolate* isolate)
116 { 116 {
117 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "FunctionCall", "data", devToolsTraceEventData(context, function, isolate)); 117 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "FunctionCall", "data", devToolsTraceEventData(context, function, isolate));
118 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), " CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::current CallStack()); 118 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), " CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::current CallStack());
119 119
120 return V8ScriptRunner::callFunction(function, context, receiver, argc, info, isolate); 120 return V8ScriptRunner::callFunction(function, context, receiver, argc, info, isolate);
121 } 121 }
122 122
123 v8::Local<v8::Value> ScriptController::executeScriptAndReturnValue(v8::Handle<v8 ::Context> context, const ScriptSourceCode& source) 123 v8::Local<v8::Value> ScriptController::executeScriptAndReturnValue(v8::Handle<v8 ::Context> context, const ScriptSourceCode& source)
124 { 124 {
125 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "EvaluateScript ", "data", InspectorEvaluateScriptEvent::data(m_frame, source.url().string(), so urce.startLine())); 125 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "EvaluateScript ", "data", InspectorEvaluateScriptEvent::data(source.url().string(), source.star tLine()));
126 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), " CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::current CallStack()); 126 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), " CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::current CallStack());
127 127
128 v8::Local<v8::Value> result; 128 v8::Local<v8::Value> result;
129 { 129 {
130 V8CacheOptions v8CacheOptions(V8CacheOptionsOff); 130 V8CacheOptions v8CacheOptions(V8CacheOptionsOff);
131 if (m_frame->settings()) 131 if (m_frame->settings())
132 v8CacheOptions = m_frame->settings()->v8CacheOptions(); 132 v8CacheOptions = m_frame->settings()->v8CacheOptions();
133 133
134 // Isolate exceptions that occur when compiling and executing 134 // Isolate exceptions that occur when compiling and executing
135 // the code. These exceptions should not interfere with 135 // the code. These exceptions should not interfere with
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 scriptModule.resolvedDependencies.append(actual); 357 scriptModule.resolvedDependencies.append(actual);
358 } 358 }
359 } 359 }
360 } 360 }
361 } 361 }
362 362
363 V8ScriptRunner::runModule(m_isolate, m_frame->document(), scriptModule); 363 V8ScriptRunner::runModule(m_isolate, m_frame->document(), scriptModule);
364 } 364 }
365 365
366 } // namespace blink 366 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698