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

Side by Side Diff: ppapi/proxy/irt_ppapi.c

Issue 140573003: Connect PPAPI IPC channels for non-SFI mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix build error Created 6 years, 10 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
« no previous file with comments | « ppapi/ppapi_proxy.gypi ('k') | ppapi/proxy/plugin_main_irt.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2014 The Chromium Authors. All rights reserved. 2 * Copyright 2014 The Chromium Authors. All rights reserved.
3 * Use of this source code is governed by a BSD-style license that can be 3 * Use of this source code is governed by a BSD-style license that can be
4 * found in the LICENSE file. 4 * found in the LICENSE file.
5 */ 5 */
6 6
7 #include "native_client/src/public/irt_core.h" 7 #include "native_client/src/public/irt_core.h"
8 #include "native_client/src/untrusted/irt/irt.h" 8 #include "native_client/src/untrusted/irt/irt.h"
9 #include "native_client/src/untrusted/irt/irt_private.h" 9 #include "native_client/src/untrusted/irt/irt_private.h"
10 #include "ppapi/nacl_irt/irt_ppapi.h" 10 #include "ppapi/nacl_irt/irt_ppapi.h"
11 #include "ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h" 11 #include "ppapi/proxy/plugin_main_irt.h"
12 12
13 struct PP_StartFunctions g_pp_functions; 13 struct PP_StartFunctions g_pp_functions;
14 14
15 static int irt_ppapi_start(const struct PP_StartFunctions* funcs) { 15 static int irt_ppapi_start(const struct PP_StartFunctions* funcs) {
16 /* Disable NaCl's open_resource() interface on this thread. */ 16 /* Disable NaCl's open_resource() interface on this thread. */
17 g_is_main_thread = 1; 17 g_is_main_thread = 1;
18 18
19 g_pp_functions = *funcs; 19 g_pp_functions = *funcs;
20 return PpapiPluginMain(); 20 return PpapiPluginMain();
21 } 21 }
(...skipping 27 matching lines...) Expand all
49 if (result != 0) 49 if (result != 0)
50 return result; 50 return result;
51 return nacl_irt_query_list(interface_ident, table, tablesize, 51 return nacl_irt_query_list(interface_ident, table, tablesize,
52 irt_interfaces, sizeof(irt_interfaces)); 52 irt_interfaces, sizeof(irt_interfaces));
53 } 53 }
54 54
55 void nacl_irt_start(uint32_t* info) { 55 void nacl_irt_start(uint32_t* info) {
56 nacl_irt_init(info); 56 nacl_irt_init(info);
57 nacl_irt_enter_user_code(info, chrome_irt_query); 57 nacl_irt_enter_user_code(info, chrome_irt_query);
58 } 58 }
OLDNEW
« no previous file with comments | « ppapi/ppapi_proxy.gypi ('k') | ppapi/proxy/plugin_main_irt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698