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

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp

Issue 2737863002: DevTools: move counter-related devtools.timeline trace events into probe:: probes. (Closed)
Patch Set: Created 3 years, 9 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
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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 source, isolate(), accessControlStatus, v8CacheOptions), 143 source, isolate(), accessControlStatus, v8CacheOptions),
144 script, tryCatch)) 144 script, tryCatch))
145 return result; 145 return result;
146 146
147 if (!v8Call(V8ScriptRunner::runCompiledScript(isolate(), script, 147 if (!v8Call(V8ScriptRunner::runCompiledScript(isolate(), script,
148 frame()->document()), 148 frame()->document()),
149 result, tryCatch)) 149 result, tryCatch))
150 return result; 150 return result;
151 } 151 }
152 152
153 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"),
154 "UpdateCounters", TRACE_EVENT_SCOPE_THREAD, "data",
155 InspectorUpdateCountersEvent::data());
156
157 return result; 153 return result;
158 } 154 }
159 155
160 LocalWindowProxy* ScriptController::windowProxy(DOMWrapperWorld& world) { 156 LocalWindowProxy* ScriptController::windowProxy(DOMWrapperWorld& world) {
161 LocalWindowProxy* windowProxy = m_windowProxyManager->windowProxy(world); 157 LocalWindowProxy* windowProxy = m_windowProxyManager->windowProxy(world);
162 windowProxy->initializeIfNeeded(); 158 windowProxy->initializeIfNeeded();
163 return windowProxy; 159 return windowProxy;
164 } 160 }
165 161
166 bool ScriptController::shouldBypassMainWorldCSP() { 162 bool ScriptController::shouldBypassMainWorldCSP() {
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 for (size_t i = 0; i < resultArray->Length(); ++i) { 375 for (size_t i = 0; i < resultArray->Length(); ++i) {
380 v8::Local<v8::Value> value; 376 v8::Local<v8::Value> value;
381 if (!resultArray->Get(scriptState->context(), i).ToLocal(&value)) 377 if (!resultArray->Get(scriptState->context(), i).ToLocal(&value))
382 return; 378 return;
383 results->push_back(value); 379 results->push_back(value);
384 } 380 }
385 } 381 }
386 } 382 }
387 383
388 } // namespace blink 384 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698