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/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <map> | 9 #include <map> |
10 #include <vector> | 10 #include <vector> |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
139 #else | 139 #else |
140 // TODO(port) | 140 // TODO(port) |
141 #include "base/memory/scoped_handle.h" | 141 #include "base/memory/scoped_handle.h" |
142 #include "content/child/npapi/np_channel_base.h" | 142 #include "content/child/npapi/np_channel_base.h" |
143 #endif | 143 #endif |
144 | 144 |
145 #if defined(ENABLE_PLUGINS) | 145 #if defined(ENABLE_PLUGINS) |
146 #include "content/renderer/npapi/plugin_channel_host.h" | 146 #include "content/renderer/npapi/plugin_channel_host.h" |
147 #endif | 147 #endif |
148 | 148 |
149 // TODO(sky): remove ifdef, temporary until mac sorted out. | |
150 #if !defined(OS_MACOSX) | |
151 #include "content/renderer/mojo_message_filter.h" | |
152 #endif | |
153 | |
149 using base::ThreadRestrictions; | 154 using base::ThreadRestrictions; |
150 using blink::WebDocument; | 155 using blink::WebDocument; |
151 using blink::WebFrame; | 156 using blink::WebFrame; |
152 using blink::WebNetworkStateNotifier; | 157 using blink::WebNetworkStateNotifier; |
153 using blink::WebRuntimeFeatures; | 158 using blink::WebRuntimeFeatures; |
154 using blink::WebScriptController; | 159 using blink::WebScriptController; |
155 using blink::WebSecurityPolicy; | 160 using blink::WebSecurityPolicy; |
156 using blink::WebString; | 161 using blink::WebString; |
157 using blink::WebView; | 162 using blink::WebView; |
158 | 163 |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
386 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); | 391 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); |
387 AddFilter(audio_message_filter_.get()); | 392 AddFilter(audio_message_filter_.get()); |
388 | 393 |
389 midi_message_filter_ = new MidiMessageFilter(GetIOMessageLoopProxy()); | 394 midi_message_filter_ = new MidiMessageFilter(GetIOMessageLoopProxy()); |
390 AddFilter(midi_message_filter_.get()); | 395 AddFilter(midi_message_filter_.get()); |
391 | 396 |
392 AddFilter((new IndexedDBMessageFilter(thread_safe_sender()))->GetFilter()); | 397 AddFilter((new IndexedDBMessageFilter(thread_safe_sender()))->GetFilter()); |
393 | 398 |
394 AddFilter((new EmbeddedWorkerContextMessageFilter())->GetFilter()); | 399 AddFilter((new EmbeddedWorkerContextMessageFilter())->GetFilter()); |
395 | 400 |
401 // TODO(sky): remove ifdef, temporary until mac sorted out. | |
402 #if !defined(OS_MACOSX) | |
403 // MojoMessageFilter deletes itself as necessary. | |
404 new MojoMessageFilter(this); | |
darin (slow to review)
2014/03/14 22:03:36
Don't you need to call AddFilter? Oh, wait... I se
sky
2014/03/14 22:45:12
Done.
| |
405 #endif | |
406 | |
396 GetContentClient()->renderer()->RenderThreadStarted(); | 407 GetContentClient()->renderer()->RenderThreadStarted(); |
397 | 408 |
398 InitSkiaEventTracer(); | 409 InitSkiaEventTracer(); |
399 | 410 |
400 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 411 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
401 if (command_line.HasSwitch(cc::switches::kEnableGpuBenchmarking)) | 412 if (command_line.HasSwitch(cc::switches::kEnableGpuBenchmarking)) |
402 RegisterExtension(GpuBenchmarkingExtension::Get()); | 413 RegisterExtension(GpuBenchmarkingExtension::Get()); |
403 | 414 |
404 is_impl_side_painting_enabled_ = | 415 is_impl_side_painting_enabled_ = |
405 command_line.HasSwitch(switches::kEnableImplSidePainting) && | 416 command_line.HasSwitch(switches::kEnableImplSidePainting) && |
(...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1487 hidden_widget_count_--; | 1498 hidden_widget_count_--; |
1488 | 1499 |
1489 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 1500 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
1490 return; | 1501 return; |
1491 } | 1502 } |
1492 | 1503 |
1493 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 1504 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
1494 } | 1505 } |
1495 | 1506 |
1496 } // namespace content | 1507 } // namespace content |
OLD | NEW |