Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(256)

Side by Side Diff: ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc

Issue 337463002: Remove LoadModule SRPC for non-SFI mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "native_client/src/include/nacl_macros.h" 5 #include "native_client/src/include/nacl_macros.h"
6 #include "ppapi/c/pp_errors.h" 6 #include "ppapi/c/pp_errors.h"
7 #include "ppapi/cpp/module.h" 7 #include "ppapi/cpp/module.h"
8 #include "ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h" 8 #include "ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h"
9 #include "ppapi/native_client/src/trusted/plugin/utility.h" 9 #include "ppapi/native_client/src/trusted/plugin/utility.h"
10 10
11 namespace plugin { 11 namespace plugin {
12 12
13 bool SelLdrLauncherChrome::Start(const char* url) { 13 bool SelLdrLauncherChrome::Start(const char* url) {
14 NACL_NOTREACHED(); 14 NACL_NOTREACHED();
15 return false; 15 return false;
16 } 16 }
17 17
18 void SelLdrLauncherChrome::Start( 18 void SelLdrLauncherChrome::Start(
19 PP_Instance instance, 19 PP_Instance instance,
20 bool main_service_runtime, 20 bool main_service_runtime,
21 const char* url, 21 const char* url,
22 const PP_NaClFileInfo* file_info,
22 bool uses_irt, 23 bool uses_irt,
23 bool uses_ppapi, 24 bool uses_ppapi,
24 bool uses_nonsfi_mode, 25 bool uses_nonsfi_mode,
25 bool enable_ppapi_dev, 26 bool enable_ppapi_dev,
26 bool enable_dyncode_syscalls, 27 bool enable_dyncode_syscalls,
27 bool enable_exception_handling, 28 bool enable_exception_handling,
28 bool enable_crash_throttling, 29 bool enable_crash_throttling,
29 const PPP_ManifestService* manifest_service_interface, 30 const PPP_ManifestService* manifest_service_interface,
30 void* manifest_service_user_data, 31 void* manifest_service_user_data,
31 pp::CompletionCallback callback) { 32 pp::CompletionCallback callback) {
32 if (!GetNaClInterface()) { 33 if (!GetNaClInterface()) {
33 pp::Module::Get()->core()->CallOnMainThread(0, callback, PP_ERROR_FAILED); 34 pp::Module::Get()->core()->CallOnMainThread(0, callback, PP_ERROR_FAILED);
34 return; 35 return;
35 } 36 }
36 GetNaClInterface()->LaunchSelLdr( 37 GetNaClInterface()->LaunchSelLdr(
37 instance, 38 instance,
38 PP_FromBool(main_service_runtime), 39 PP_FromBool(main_service_runtime),
39 url, 40 url,
41 file_info,
40 PP_FromBool(uses_irt), 42 PP_FromBool(uses_irt),
41 PP_FromBool(uses_ppapi), 43 PP_FromBool(uses_ppapi),
42 PP_FromBool(uses_nonsfi_mode), 44 PP_FromBool(uses_nonsfi_mode),
43 PP_FromBool(enable_ppapi_dev), 45 PP_FromBool(enable_ppapi_dev),
44 PP_FromBool(enable_dyncode_syscalls), 46 PP_FromBool(enable_dyncode_syscalls),
45 PP_FromBool(enable_exception_handling), 47 PP_FromBool(enable_exception_handling),
46 PP_FromBool(enable_crash_throttling), 48 PP_FromBool(enable_crash_throttling),
47 manifest_service_interface, 49 manifest_service_interface,
48 manifest_service_user_data, 50 manifest_service_user_data,
49 &channel_, 51 &channel_,
50 callback.pp_completion_callback()); 52 callback.pp_completion_callback());
51 } 53 }
52 54
53 } // namespace plugin 55 } // namespace plugin
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698