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/common/sandbox_win.h" | 5 #include "content/common/sandbox_win.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/base_switches.h" | 9 #include "base/base_switches.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
557 g_target_services = target_services; | 557 g_target_services = target_services; |
558 return sandbox::SBOX_ALL_OK == result; | 558 return sandbox::SBOX_ALL_OK == result; |
559 } | 559 } |
560 | 560 |
561 bool ShouldUseDirectWrite() { | 561 bool ShouldUseDirectWrite() { |
562 // If the flag is currently on, and we're on Win7 or above, we enable | 562 // If the flag is currently on, and we're on Win7 or above, we enable |
563 // DirectWrite. Skia does not require the additions to DirectWrite in QFE | 563 // DirectWrite. Skia does not require the additions to DirectWrite in QFE |
564 // 2670838, so a Win7 check is sufficient. We do not currently attempt to | 564 // 2670838, so a Win7 check is sufficient. We do not currently attempt to |
565 // support Vista, where SP2 and the Platform Update are required. | 565 // support Vista, where SP2 and the Platform Update are required. |
566 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 566 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
567 return command_line.HasSwitch(switches::kEnableDirectWrite) && | 567 return !command_line.HasSwitch(switches::kDisableDirectWrite) && |
568 base::win::GetVersion() >= base::win::VERSION_WIN7; | 568 base::win::GetVersion() >= base::win::VERSION_WIN7; |
569 } | 569 } |
570 | 570 |
571 base::ProcessHandle StartSandboxedProcess( | 571 base::ProcessHandle StartSandboxedProcess( |
572 SandboxedProcessLauncherDelegate* delegate, | 572 SandboxedProcessLauncherDelegate* delegate, |
573 CommandLine* cmd_line) { | 573 CommandLine* cmd_line) { |
574 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); | 574 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); |
575 std::string type_str = cmd_line->GetSwitchValueASCII(switches::kProcessType); | 575 std::string type_str = cmd_line->GetSwitchValueASCII(switches::kProcessType); |
576 | 576 |
577 TRACE_EVENT_BEGIN_ETW("StartProcessWithAccess", 0, type_str); | 577 TRACE_EVENT_BEGIN_ETW("StartProcessWithAccess", 0, type_str); |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
741 } | 741 } |
742 | 742 |
743 return false; | 743 return false; |
744 } | 744 } |
745 | 745 |
746 bool BrokerAddTargetPeer(HANDLE peer_process) { | 746 bool BrokerAddTargetPeer(HANDLE peer_process) { |
747 return g_broker_services->AddTargetPeer(peer_process) == sandbox::SBOX_ALL_OK; | 747 return g_broker_services->AddTargetPeer(peer_process) == sandbox::SBOX_ALL_OK; |
748 } | 748 } |
749 | 749 |
750 } // namespace content | 750 } // namespace content |
OLD | NEW |