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 "chromecast/renderer/cast_render_process_observer.h" | 5 #include "chromecast/renderer/cast_render_process_observer.h" |
6 | 6 |
7 #include "chromecast/renderer/media/cma_message_filter_proxy.h" | 7 #include "chromecast/renderer/media/cma_message_filter_proxy.h" |
8 #include "content/public/renderer/render_thread.h" | 8 #include "content/public/renderer/render_thread.h" |
9 | 9 |
10 namespace chromecast { | 10 namespace chromecast { |
11 namespace shell { | 11 namespace shell { |
12 | 12 |
13 CastRenderProcessObserver::CastRenderProcessObserver() { | 13 CastRenderProcessObserver::CastRenderProcessObserver( |
| 14 const std::vector<scoped_refptr<IPC::MessageFilter>>& |
| 15 platform_message_filters) |
| 16 : platform_message_filters_(platform_message_filters) { |
14 content::RenderThread* thread = content::RenderThread::Get(); | 17 content::RenderThread* thread = content::RenderThread::Get(); |
15 thread->AddObserver(this); | 18 thread->AddObserver(this); |
16 CreateCustomFilters(); | 19 CreateCustomFilters(); |
17 } | 20 } |
18 | 21 |
19 CastRenderProcessObserver::~CastRenderProcessObserver() { | 22 CastRenderProcessObserver::~CastRenderProcessObserver() { |
20 // CastRenderProcessObserver outlives content::RenderThread. | 23 // CastRenderProcessObserver outlives content::RenderThread. |
21 // No need to explicitly call RemoveObserver in teardown. | 24 // No need to explicitly call RemoveObserver in teardown. |
22 } | 25 } |
23 | 26 |
24 void CastRenderProcessObserver::CreateCustomFilters() { | 27 void CastRenderProcessObserver::CreateCustomFilters() { |
| 28 content::RenderThread* thread = content::RenderThread::Get(); |
25 #if !defined(OS_ANDROID) | 29 #if !defined(OS_ANDROID) |
26 content::RenderThread* thread = content::RenderThread::Get(); | |
27 cma_message_filter_proxy_ = | 30 cma_message_filter_proxy_ = |
28 new media::CmaMessageFilterProxy(thread->GetIOMessageLoopProxy()); | 31 new media::CmaMessageFilterProxy(thread->GetIOMessageLoopProxy()); |
29 thread->AddFilter(cma_message_filter_proxy_.get()); | 32 thread->AddFilter(cma_message_filter_proxy_.get()); |
30 #endif // !defined(OS_ANDROID) | 33 #endif // !defined(OS_ANDROID) |
| 34 for (const auto& filter : platform_message_filters_) { |
| 35 thread->AddFilter(filter.get()); |
| 36 } |
31 } | 37 } |
32 | 38 |
33 void CastRenderProcessObserver::OnRenderProcessShutdown() { | 39 void CastRenderProcessObserver::OnRenderProcessShutdown() { |
| 40 content::RenderThread* thread = content::RenderThread::Get(); |
34 #if !defined(OS_ANDROID) | 41 #if !defined(OS_ANDROID) |
35 content::RenderThread* thread = content::RenderThread::Get(); | |
36 if (cma_message_filter_proxy_.get()) { | 42 if (cma_message_filter_proxy_.get()) { |
37 thread->RemoveFilter(cma_message_filter_proxy_.get()); | 43 thread->RemoveFilter(cma_message_filter_proxy_.get()); |
38 cma_message_filter_proxy_ = NULL; | 44 cma_message_filter_proxy_ = NULL; |
39 } | 45 } |
40 #endif // !defined(OS_ANDROID) | 46 #endif // !defined(OS_ANDROID) |
| 47 for (auto& filter : platform_message_filters_) { |
| 48 if (filter.get()) { |
| 49 thread->RemoveFilter(filter.get()); |
| 50 filter = nullptr; |
| 51 } |
| 52 } |
| 53 platform_message_filters_.clear(); |
41 } | 54 } |
42 | 55 |
43 } // namespace shell | 56 } // namespace shell |
44 } // namespace chromecast | 57 } // namespace chromecast |
OLD | NEW |