| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/nacl/loader/nonsfi/nonsfi_main.h" | 5 #include "components/nacl/loader/nonsfi/nonsfi_main.h" |
| 6 | 6 |
| 7 #include "base/debug/leak_annotations.h" | 7 #include "base/debug/leak_annotations.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/threading/platform_thread.h" | 10 #include "base/threading/platform_thread.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 | 36 |
| 37 virtual ~PluginMainDelegate() { | 37 virtual ~PluginMainDelegate() { |
| 38 } | 38 } |
| 39 | 39 |
| 40 virtual void ThreadMain() OVERRIDE { | 40 virtual void ThreadMain() OVERRIDE { |
| 41 base::PlatformThread::SetName("NaClMainThread"); | 41 base::PlatformThread::SetName("NaClMainThread"); |
| 42 | 42 |
| 43 // This will only happen once per process, so we give the permission to | 43 // This will only happen once per process, so we give the permission to |
| 44 // create Singletons. | 44 // create Singletons. |
| 45 base::ThreadRestrictions::SetSingletonAllowed(true); | 45 base::ThreadRestrictions::SetSingletonAllowed(true); |
| 46 ppapi::StartUpPlugin(); | |
| 47 uintptr_t info[] = { | 46 uintptr_t info[] = { |
| 48 0, // Do not use fini. | 47 0, // Do not use fini. |
| 49 0, // envc. | 48 0, // envc. |
| 50 0, // argc. | 49 0, // argc. |
| 51 0, // Null terminate for argv. | 50 0, // Null terminate for argv. |
| 52 0, // Null terminate for envv. | 51 0, // Null terminate for envv. |
| 53 AT_SYSINFO, | 52 AT_SYSINFO, |
| 54 reinterpret_cast<uintptr_t>(&NaClIrtInterface), | 53 reinterpret_cast<uintptr_t>(&NaClIrtInterface), |
| 55 AT_NULL, | 54 AT_NULL, |
| 56 0, // Null terminate for auxv. | 55 0, // Null terminate for auxv. |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 LOG(ERROR) << "MainStart: Failed to set up bootstrap channel."; | 197 LOG(ERROR) << "MainStart: Failed to set up bootstrap channel."; |
| 199 return; | 198 return; |
| 200 } | 199 } |
| 201 | 200 |
| 202 // Start the SRPC server loop. | 201 // Start the SRPC server loop. |
| 203 ServiceAccept(secure_port.get()); | 202 ServiceAccept(secure_port.get()); |
| 204 } | 203 } |
| 205 | 204 |
| 206 } // namespace nonsfi | 205 } // namespace nonsfi |
| 207 } // namespace nacl | 206 } // namespace nacl |
| OLD | NEW |