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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 | 159 |
160 #if defined(OS_MACOSX) | 160 #if defined(OS_MACOSX) |
161 #include "base/mac/mac_util.h" | 161 #include "base/mac/mac_util.h" |
162 #include "content/renderer/webscrollbarbehavior_impl_mac.h" | 162 #include "content/renderer/webscrollbarbehavior_impl_mac.h" |
163 #endif | 163 #endif |
164 | 164 |
165 #if defined(OS_POSIX) | 165 #if defined(OS_POSIX) |
166 #include "ipc/ipc_channel_posix.h" | 166 #include "ipc/ipc_channel_posix.h" |
167 #endif | 167 #endif |
168 | 168 |
| 169 #if defined(USE_OZONE) |
| 170 #include "content/child/child_client_native_pixmap_factory_message_filter_ozone.
h" |
| 171 #endif |
| 172 |
169 #if defined(OS_WIN) | 173 #if defined(OS_WIN) |
170 #include <windows.h> | 174 #include <windows.h> |
171 #include <objbase.h> | 175 #include <objbase.h> |
172 #else | 176 #else |
173 // TODO(port) | 177 // TODO(port) |
174 #include "content/child/npapi/np_channel_base.h" | 178 #include "content/child/npapi/np_channel_base.h" |
175 #endif | 179 #endif |
176 | 180 |
177 #if defined(ENABLE_PLUGINS) | 181 #if defined(ENABLE_PLUGINS) |
178 #include "content/renderer/npapi/plugin_channel_host.h" | 182 #include "content/renderer/npapi/plugin_channel_host.h" |
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
730 | 734 |
731 bluetooth_message_filter_ = new BluetoothMessageFilter(thread_safe_sender()); | 735 bluetooth_message_filter_ = new BluetoothMessageFilter(thread_safe_sender()); |
732 AddFilter(bluetooth_message_filter_->GetFilter()); | 736 AddFilter(bluetooth_message_filter_->GetFilter()); |
733 | 737 |
734 AddFilter((new IndexedDBMessageFilter(thread_safe_sender()))->GetFilter()); | 738 AddFilter((new IndexedDBMessageFilter(thread_safe_sender()))->GetFilter()); |
735 | 739 |
736 AddFilter((new CacheStorageMessageFilter(thread_safe_sender()))->GetFilter()); | 740 AddFilter((new CacheStorageMessageFilter(thread_safe_sender()))->GetFilter()); |
737 | 741 |
738 AddFilter((new ServiceWorkerContextMessageFilter())->GetFilter()); | 742 AddFilter((new ServiceWorkerContextMessageFilter())->GetFilter()); |
739 | 743 |
| 744 #if defined(USE_OZONE) |
| 745 client_native_pixmap_factory_message_filter_ = |
| 746 new ChildClientNativePixmapFactoryMessageFilter(); |
| 747 AddFilter(client_native_pixmap_factory_message_filter_.get()); |
| 748 #endif |
| 749 |
740 GetContentClient()->renderer()->RenderThreadStarted(); | 750 GetContentClient()->renderer()->RenderThreadStarted(); |
741 | 751 |
742 InitSkiaEventTracer(); | 752 InitSkiaEventTracer(); |
743 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( | 753 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
744 skia::SkiaMemoryDumpProvider::GetInstance()); | 754 skia::SkiaMemoryDumpProvider::GetInstance()); |
745 | 755 |
746 const base::CommandLine& command_line = | 756 const base::CommandLine& command_line = |
747 *base::CommandLine::ForCurrentProcess(); | 757 *base::CommandLine::ForCurrentProcess(); |
748 | 758 |
749 cc::LayerSettings layer_settings; | 759 cc::LayerSettings layer_settings; |
(...skipping 1293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2043 } | 2053 } |
2044 | 2054 |
2045 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2055 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
2046 size_t erased = | 2056 size_t erased = |
2047 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2057 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
2048 routing_id_); | 2058 routing_id_); |
2049 DCHECK_EQ(1u, erased); | 2059 DCHECK_EQ(1u, erased); |
2050 } | 2060 } |
2051 | 2061 |
2052 } // namespace content | 2062 } // namespace content |
OLD | NEW |