| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "sky/tools/debugger/debugger.h" | 5 #include "sky/tools/debugger/debugger.h" |
| 6 | 6 |
| 7 namespace sky { | 7 namespace sky { |
| 8 namespace debugger { | 8 namespace debugger { |
| 9 | 9 |
| 10 SkyDebugger::SkyDebugger() | 10 SkyDebugger::SkyDebugger() |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 } | 100 } |
| 101 | 101 |
| 102 void SkyDebugger::Shutdown() { | 102 void SkyDebugger::Shutdown() { |
| 103 // Make sure we shut down mojo before quitting the message loop or things | 103 // Make sure we shut down mojo before quitting the message loop or things |
| 104 // like blink::shutdown() may try to talk to the message loop and crash. | 104 // like blink::shutdown() may try to talk to the message loop and crash. |
| 105 window_manager_app_.reset(); | 105 window_manager_app_.reset(); |
| 106 | 106 |
| 107 // TODO(eseidel): This still hits an X11 error which I don't understand | 107 // TODO(eseidel): This still hits an X11 error which I don't understand |
| 108 // "X Error of failed request: GLXBadDrawable", crbug.com/430581 | 108 // "X Error of failed request: GLXBadDrawable", crbug.com/430581 |
| 109 mojo::ApplicationImpl::Terminate(); | 109 mojo::ApplicationImpl::Terminate(); |
| 110 // TODO(eseidel): REMOVE THIS, temporarily fast-exit now to stop confusing |
| 111 // folks with exit-time crashes due to GLXBadDrawable above. |
| 112 exit(0); |
| 110 } | 113 } |
| 111 | 114 |
| 112 void SkyDebugger::InjectInspector() { | 115 void SkyDebugger::InjectInspector() { |
| 113 InspectorServicePtr inspector_service; | 116 InspectorServicePtr inspector_service; |
| 114 mojo::ConnectToService(viewer_services_.get(), &inspector_service); | 117 mojo::ConnectToService(viewer_services_.get(), &inspector_service); |
| 115 inspector_service->Inject(); | 118 inspector_service->Inject(); |
| 116 } | 119 } |
| 117 | 120 |
| 118 } // namespace debugger | 121 } // namespace debugger |
| 119 } // namespace sky | 122 } // namespace sky |
| OLD | NEW |