| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010-2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2010-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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 } | 104 } |
| 105 | 105 |
| 106 class ClientMessageLoopAdapter : public MainThreadDebugger::ClientMessageLoop { | 106 class ClientMessageLoopAdapter : public MainThreadDebugger::ClientMessageLoop { |
| 107 public: | 107 public: |
| 108 ~ClientMessageLoopAdapter() override { s_instance = nullptr; } | 108 ~ClientMessageLoopAdapter() override { s_instance = nullptr; } |
| 109 | 109 |
| 110 static void ensureMainThreadDebuggerCreated(WebDevToolsAgentClient* client) { | 110 static void ensureMainThreadDebuggerCreated(WebDevToolsAgentClient* client) { |
| 111 if (s_instance) | 111 if (s_instance) |
| 112 return; | 112 return; |
| 113 std::unique_ptr<ClientMessageLoopAdapter> instance = | 113 std::unique_ptr<ClientMessageLoopAdapter> instance = |
| 114 wrapUnique(new ClientMessageLoopAdapter( | 114 WTF::wrapUnique(new ClientMessageLoopAdapter( |
| 115 wrapUnique(client->createClientMessageLoop()))); | 115 WTF::wrapUnique(client->createClientMessageLoop()))); |
| 116 s_instance = instance.get(); | 116 s_instance = instance.get(); |
| 117 MainThreadDebugger::instance()->setClientMessageLoop(std::move(instance)); | 117 MainThreadDebugger::instance()->setClientMessageLoop(std::move(instance)); |
| 118 } | 118 } |
| 119 | 119 |
| 120 static void webViewImplClosed(WebViewImpl* view) { | 120 static void webViewImplClosed(WebViewImpl* view) { |
| 121 if (s_instance) | 121 if (s_instance) |
| 122 s_instance->m_frozenViews.remove(view); | 122 s_instance->m_frozenViews.remove(view); |
| 123 } | 123 } |
| 124 | 124 |
| 125 static void webFrameWidgetImplClosed(WebFrameWidgetImpl* widget) { | 125 static void webFrameWidgetImplClosed(WebFrameWidgetImpl* widget) { |
| (...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 688 agentImpl->dispatchMessageFromFrontend(sessionId, descriptor->method(), | 688 agentImpl->dispatchMessageFromFrontend(sessionId, descriptor->method(), |
| 689 descriptor->message()); | 689 descriptor->message()); |
| 690 } | 690 } |
| 691 | 691 |
| 692 void WebDevToolsAgent::interruptAndDispatch(int sessionId, | 692 void WebDevToolsAgent::interruptAndDispatch(int sessionId, |
| 693 MessageDescriptor* rawDescriptor) { | 693 MessageDescriptor* rawDescriptor) { |
| 694 // rawDescriptor can't be a std::unique_ptr because interruptAndDispatch is a | 694 // rawDescriptor can't be a std::unique_ptr because interruptAndDispatch is a |
| 695 // WebKit API function. | 695 // WebKit API function. |
| 696 MainThreadDebugger::interruptMainThreadAndRun( | 696 MainThreadDebugger::interruptMainThreadAndRun( |
| 697 crossThreadBind(WebDevToolsAgentImpl::runDebuggerTask, sessionId, | 697 crossThreadBind(WebDevToolsAgentImpl::runDebuggerTask, sessionId, |
| 698 passed(wrapUnique(rawDescriptor)))); | 698 WTF::passed(WTF::wrapUnique(rawDescriptor)))); |
| 699 } | 699 } |
| 700 | 700 |
| 701 bool WebDevToolsAgent::shouldInterruptForMethod(const WebString& method) { | 701 bool WebDevToolsAgent::shouldInterruptForMethod(const WebString& method) { |
| 702 return method == "Debugger.pause" || method == "Debugger.setBreakpoint" || | 702 return method == "Debugger.pause" || method == "Debugger.setBreakpoint" || |
| 703 method == "Debugger.setBreakpointByUrl" || | 703 method == "Debugger.setBreakpointByUrl" || |
| 704 method == "Debugger.removeBreakpoint" || | 704 method == "Debugger.removeBreakpoint" || |
| 705 method == "Debugger.setBreakpointsActive"; | 705 method == "Debugger.setBreakpointsActive"; |
| 706 } | 706 } |
| 707 | 707 |
| 708 } // namespace blink | 708 } // namespace blink |
| OLD | NEW |