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/browser/ppapi_plugin_process_host.h" | 5 #include "content/browser/ppapi_plugin_process_host.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/base_switches.h" | 10 #include "base/base_switches.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "content/public/common/pepper_plugin_info.h" | 25 #include "content/public/common/pepper_plugin_info.h" |
26 #include "content/public/common/process_type.h" | 26 #include "content/public/common/process_type.h" |
27 #include "content/public/common/sandbox_type.h" | 27 #include "content/public/common/sandbox_type.h" |
28 #include "content/public/common/sandboxed_process_launcher_delegate.h" | 28 #include "content/public/common/sandboxed_process_launcher_delegate.h" |
29 #include "ipc/ipc_switches.h" | 29 #include "ipc/ipc_switches.h" |
30 #include "net/base/network_change_notifier.h" | 30 #include "net/base/network_change_notifier.h" |
31 #include "ppapi/proxy/ppapi_messages.h" | 31 #include "ppapi/proxy/ppapi_messages.h" |
32 #include "ui/base/ui_base_switches.h" | 32 #include "ui/base/ui_base_switches.h" |
33 | 33 |
34 #if defined(OS_WIN) | 34 #if defined(OS_WIN) |
| 35 #include "content/browser/renderer_host/dwrite_font_proxy_message_filter_win.h" |
35 #include "content/common/sandbox_win.h" | 36 #include "content/common/sandbox_win.h" |
36 #include "sandbox/win/src/process_mitigations.h" | 37 #include "sandbox/win/src/process_mitigations.h" |
37 #include "sandbox/win/src/sandbox_policy.h" | 38 #include "sandbox/win/src/sandbox_policy.h" |
38 #include "ui/gfx/win/dpi.h" | 39 #include "ui/gfx/win/dpi.h" |
39 #endif | 40 #endif |
40 | 41 |
41 namespace content { | 42 namespace content { |
42 | 43 |
43 // NOTE: changes to this class need to be reviewed by the security team. | 44 // NOTE: changes to this class need to be reviewed by the security team. |
44 class PpapiPluginSandboxedProcessLauncherDelegate | 45 class PpapiPluginSandboxedProcessLauncherDelegate |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
288 PROCESS_TYPE_PPAPI_PLUGIN, this)); | 289 PROCESS_TYPE_PPAPI_PLUGIN, this)); |
289 | 290 |
290 host_impl_.reset(new BrowserPpapiHostImpl(this, permissions_, info.name, | 291 host_impl_.reset(new BrowserPpapiHostImpl(this, permissions_, info.name, |
291 info.path, profile_data_directory, | 292 info.path, profile_data_directory, |
292 false /* in_process */, | 293 false /* in_process */, |
293 false /* external_plugin */)); | 294 false /* external_plugin */)); |
294 | 295 |
295 filter_ = new PepperMessageFilter(); | 296 filter_ = new PepperMessageFilter(); |
296 process_->AddFilter(filter_.get()); | 297 process_->AddFilter(filter_.get()); |
297 process_->GetHost()->AddFilter(host_impl_->message_filter().get()); | 298 process_->GetHost()->AddFilter(host_impl_->message_filter().get()); |
| 299 #if defined(OS_WIN) |
| 300 process_->AddFilter(new DWriteFontProxyMessageFilter()); |
| 301 #endif |
298 | 302 |
299 GetContentClient()->browser()->DidCreatePpapiPlugin(host_impl_.get()); | 303 GetContentClient()->browser()->DidCreatePpapiPlugin(host_impl_.get()); |
300 | 304 |
301 // Only request network status updates if the plugin has dev permissions. | 305 // Only request network status updates if the plugin has dev permissions. |
302 if (permissions_.HasPermission(ppapi::PERMISSION_DEV)) | 306 if (permissions_.HasPermission(ppapi::PERMISSION_DEV)) |
303 network_observer_.reset(new PluginNetworkObserver(this)); | 307 network_observer_.reset(new PluginNetworkObserver(this)); |
304 } | 308 } |
305 | 309 |
306 PpapiPluginProcessHost::PpapiPluginProcessHost() | 310 PpapiPluginProcessHost::PpapiPluginProcessHost() |
307 : is_broker_(true) { | 311 : is_broker_(true) { |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
512 // sent_requests_ queue should be the one that the plugin just created. | 516 // sent_requests_ queue should be the one that the plugin just created. |
513 Client* client = sent_requests_.front(); | 517 Client* client = sent_requests_.front(); |
514 sent_requests_.pop(); | 518 sent_requests_.pop(); |
515 | 519 |
516 const ChildProcessData& data = process_->GetData(); | 520 const ChildProcessData& data = process_->GetData(); |
517 client->OnPpapiChannelOpened(channel_handle, base::GetProcId(data.handle), | 521 client->OnPpapiChannelOpened(channel_handle, base::GetProcId(data.handle), |
518 data.id); | 522 data.id); |
519 } | 523 } |
520 | 524 |
521 } // namespace content | 525 } // namespace content |
OLD | NEW |