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

Side by Side Diff: third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp

Issue 2249663003: Revert of [DevTools] Rename entities in js_protocol, remove deprecated ones. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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) 2011 Google Inc. All rights reserved. 2 * Copyright (c) 2011 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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId); 273 LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId);
274 frame->settings()->setForceMainWorldInitialization(false); 274 frame->settings()->setForceMainWorldInitialization(false);
275 } 275 }
276 276
277 bool MainThreadDebugger::canExecuteScripts(int contextGroupId) 277 bool MainThreadDebugger::canExecuteScripts(int contextGroupId)
278 { 278 {
279 LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId); 279 LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId);
280 return frame->script().canExecuteScripts(NotAboutToExecuteScript); 280 return frame->script().canExecuteScripts(NotAboutToExecuteScript);
281 } 281 }
282 282
283 void MainThreadDebugger::runIfWaitingForDebugger(int contextGroupId) 283 void MainThreadDebugger::resumeStartup(int contextGroupId)
284 { 284 {
285 LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId); 285 LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId);
286 if (m_clientMessageLoop) 286 if (m_clientMessageLoop)
287 m_clientMessageLoop->runIfWaitingForDebugger(frame); 287 m_clientMessageLoop->resumeStartup(frame);
288 } 288 }
289 289
290 void MainThreadDebugger::consoleAPIMessage(int contextGroupId, V8ConsoleAPIType type, const String16& message, const String16& url, unsigned lineNumber, unsigne d columnNumber, V8StackTrace* stackTrace) 290 void MainThreadDebugger::consoleAPIMessage(int contextGroupId, V8ConsoleAPIType type, const String16& message, const String16& url, unsigned lineNumber, unsigne d columnNumber, V8StackTrace* stackTrace)
291 { 291 {
292 LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId); 292 LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId);
293 if (!frame) 293 if (!frame)
294 return; 294 return;
295 if (type == V8ConsoleAPIType::kClear && frame->host()) 295 if (type == V8ConsoleAPIType::kClear && frame->host())
296 frame->host()->consoleMessageStorage().clear(); 296 frame->host()->consoleMessageStorage().clear();
297 std::unique_ptr<SourceLocation> location = SourceLocation::create(url, lineN umber, columnNumber, stackTrace ? stackTrace->clone() : nullptr, 0); 297 std::unique_ptr<SourceLocation> location = SourceLocation::create(url, lineN umber, columnNumber, stackTrace ? stackTrace->clone() : nullptr, 0);
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 return; 403 return;
404 if (!nodes->Set(context, index++, toV8(node, info.Holder(), info.Get Isolate())).FromMaybe(false)) 404 if (!nodes->Set(context, index++, toV8(node, info.Holder(), info.Get Isolate())).FromMaybe(false))
405 return; 405 return;
406 } 406 }
407 info.GetReturnValue().Set(nodes); 407 info.GetReturnValue().Set(nodes);
408 } 408 }
409 exceptionState.throwIfNeeded(); 409 exceptionState.throwIfNeeded();
410 } 410 }
411 411
412 } // namespace blink 412 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698