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 "content/renderer/pepper/pepper_hung_plugin_filter.h" | 5 #include "content/renderer/pepper/pepper_hung_plugin_filter.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "content/child/child_process.h" | 8 #include "content/child/child_process.h" |
9 #include "content/common/frame_messages.h" | 9 #include "content/common/frame_messages.h" |
10 #include "content/renderer/render_thread_impl.h" | 10 #include "content/renderer/render_thread_impl.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 } | 49 } |
50 | 50 |
51 void PepperHungPluginFilter::EndBlockOnSyncMessage() { | 51 void PepperHungPluginFilter::EndBlockOnSyncMessage() { |
52 base::AutoLock lock(lock_); | 52 base::AutoLock lock(lock_); |
53 pending_sync_message_count_--; | 53 pending_sync_message_count_--; |
54 DCHECK(pending_sync_message_count_ >= 0); | 54 DCHECK(pending_sync_message_count_ >= 0); |
55 | 55 |
56 MayHaveBecomeUnhung(); | 56 MayHaveBecomeUnhung(); |
57 } | 57 } |
58 | 58 |
59 void PepperHungPluginFilter::OnFilterAdded(IPC::Sender* sender) {} | |
60 | |
61 void PepperHungPluginFilter::OnFilterRemoved() { | 59 void PepperHungPluginFilter::OnFilterRemoved() { |
62 base::AutoLock lock(lock_); | 60 base::AutoLock lock(lock_); |
63 MayHaveBecomeUnhung(); | 61 MayHaveBecomeUnhung(); |
64 } | 62 } |
65 | 63 |
66 void PepperHungPluginFilter::OnChannelError() { | 64 void PepperHungPluginFilter::OnChannelError() { |
67 base::AutoLock lock(lock_); | 65 base::AutoLock lock(lock_); |
68 MayHaveBecomeUnhung(); | 66 MayHaveBecomeUnhung(); |
69 } | 67 } |
70 | 68 |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 hung_plugin_showing_ = true; | 147 hung_plugin_showing_ = true; |
150 SendHungMessage(true); | 148 SendHungMessage(true); |
151 } | 149 } |
152 | 150 |
153 void PepperHungPluginFilter::SendHungMessage(bool is_hung) { | 151 void PepperHungPluginFilter::SendHungMessage(bool is_hung) { |
154 filter_->Send(new FrameHostMsg_PepperPluginHung( | 152 filter_->Send(new FrameHostMsg_PepperPluginHung( |
155 frame_routing_id_, plugin_child_id_, plugin_path_, is_hung)); | 153 frame_routing_id_, plugin_child_id_, plugin_path_, is_hung)); |
156 } | 154 } |
157 | 155 |
158 } // namespace content | 156 } // namespace content |
OLD | NEW |