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 "base/base_paths.h" | 5 #include "base/base_paths.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/debug/crash_logging.h" | |
7 #include "base/debug/debugger.h" | 8 #include "base/debug/debugger.h" |
8 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
9 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
10 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
11 #include "base/path_service.h" | 12 #include "base/path_service.h" |
12 #include "base/threading/platform_thread.h" | 13 #include "base/threading/platform_thread.h" |
13 #include "build/build_config.h" | 14 #include "build/build_config.h" |
14 #include "content/child/child_process.h" | 15 #include "content/child/child_process.h" |
15 #include "content/common/content_constants_internal.h" | 16 #include "content/common/content_constants_internal.h" |
16 #include "content/common/sandbox_linux/sandbox_linux.h" | 17 #include "content/common/sandbox_linux/sandbox_linux.h" |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
62 ppapi::proxy::PluginGlobals::Get()->PreCacheFontForFlash( | 63 ppapi::proxy::PluginGlobals::Get()->PreCacheFontForFlash( |
63 reinterpret_cast<const void*>(&logfont)); | 64 reinterpret_cast<const void*>(&logfont)); |
64 } | 65 } |
65 #endif | 66 #endif |
66 | 67 |
67 } // namespace | 68 } // namespace |
68 | 69 |
69 // Main function for starting the PPAPI plugin process. | 70 // Main function for starting the PPAPI plugin process. |
70 int PpapiPluginMain(const MainFunctionParams& parameters) { | 71 int PpapiPluginMain(const MainFunctionParams& parameters) { |
71 const base::CommandLine& command_line = parameters.command_line; | 72 const base::CommandLine& command_line = parameters.command_line; |
73 base::debug::SetCrashKeyValue( | |
74 "plugin-path", command_line.GetSwitchValueASCII("plugin-path")); | |
Mark Mentovai
2015/11/21 14:53:07
switches::kPluginPath for the one on the right sid
scottmg
2015/11/24 19:04:25
I hadn't even checked, but looking now, it turns o
| |
72 | 75 |
73 #if defined(OS_WIN) | 76 #if defined(OS_WIN) |
74 g_target_services = parameters.sandbox_info->target_services; | 77 g_target_services = parameters.sandbox_info->target_services; |
75 #endif | 78 #endif |
76 | 79 |
77 // If |g_target_services| is not null this process is sandboxed. One side | 80 // If |g_target_services| is not null this process is sandboxed. One side |
78 // effect is that we can't pop dialogs like ChildProcess::WaitForDebugger() | 81 // effect is that we can't pop dialogs like ChildProcess::WaitForDebugger() |
79 // does. | 82 // does. |
80 if (command_line.HasSwitch(switches::kPpapiStartupDialog)) { | 83 if (command_line.HasSwitch(switches::kPpapiStartupDialog)) { |
81 if (g_target_services) | 84 if (g_target_services) |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
145 | 148 |
146 blink::WebFontRendering::setUseDirectWrite(use_direct_write); | 149 blink::WebFontRendering::setUseDirectWrite(use_direct_write); |
147 blink::WebFontRendering::setDeviceScaleFactor(gfx::GetDPIScale()); | 150 blink::WebFontRendering::setDeviceScaleFactor(gfx::GetDPIScale()); |
148 #endif | 151 #endif |
149 | 152 |
150 main_message_loop.Run(); | 153 main_message_loop.Run(); |
151 return 0; | 154 return 0; |
152 } | 155 } |
153 | 156 |
154 } // namespace content | 157 } // namespace content |
OLD | NEW |