| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ppapi/proxy/proxy_channel.h" | 5 #include "ppapi/proxy/proxy_channel.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "ipc/ipc_platform_file.h" | 8 #include "ipc/ipc_platform_file.h" |
| 9 #include "ipc/ipc_test_sink.h" | 9 #include "ipc/ipc_test_sink.h" |
| 10 | 10 |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 if (test_sink_) | 78 if (test_sink_) |
| 79 return test_sink_->Send(msg); | 79 return test_sink_->Send(msg); |
| 80 if (channel_.get()) | 80 if (channel_.get()) |
| 81 return channel_->Send(msg); | 81 return channel_->Send(msg); |
| 82 | 82 |
| 83 // Remote side crashed, drop this message. | 83 // Remote side crashed, drop this message. |
| 84 delete msg; | 84 delete msg; |
| 85 return false; | 85 return false; |
| 86 } | 86 } |
| 87 | 87 |
| 88 bool ProxyChannel::SendAndStayLocked(IPC::Message* msg) { | |
| 89 return Send(msg); | |
| 90 } | |
| 91 | |
| 92 } // namespace proxy | 88 } // namespace proxy |
| 93 } // namespace ppapi | 89 } // namespace ppapi |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 774763005:
Revert "Hold the Pepper proxy lock for all Pepper GL calls." (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master