ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.c - Issue 10914053: Relocating files in the nacl repo that belong in chrome.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.c

Issue 10914053: Relocating files in the nacl repo that belong in chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge and fix windows Created 8 years, 3 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

« ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c ('K') | « ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.h ('k') | ppapi/native_client/src/untrusted/pnacl_support_extension/nacl.scons » ('j') | ppapi/native_client/tests/examples.html » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2012 The Chromium Authors. All rights reserved.	2 * Copyright (c) 2011 The Chromium Authors. All rights reserved.
	Nick Bray 2012/09/06 17:11:58 Dito. Bad merge? Dito. Bad merge? bradn 2012/09/06 18:53:16 Done. Show quoted text On 2012/09/06 17:11:58, Nick Bray wrote: > Dito. Bad merge? Done.
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/untrusted/pnacl_irt_shim/shim_ppapi.h"	7 #include "native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.h"

8	8

9 #include <string.h>	9 #include <string.h>

10 #include "native_client/src/shared/ppapi_proxy/ppruntime.h"	10 #include "native_client/src/shared/ppapi_proxy/ppruntime.h"

11 #include "native_client/src/untrusted/irt/irt.h"	11 #include "native_client/src/untrusted/irt/irt.h"

12 #include "native_client/src/untrusted/irt/irt_ppapi.h"	12 #include "native_client/src/untrusted/irt/irt_ppapi.h"

(...skipping 80 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
93 real_irt_ppapi_hook.ppapi_register_thread_creator;	93 real_irt_ppapi_hook.ppapi_register_thread_creator;

94 /*	94 /*

95 * Copy the interface structure into the client.	95 * Copy the interface structure into the client.

96 */	96 */

97 if (sizeof ppapi_hook <= tablesize) {	97 if (sizeof ppapi_hook <= tablesize) {

98 memcpy(table, &ppapi_hook, sizeof ppapi_hook);	98 memcpy(table, &ppapi_hook, sizeof ppapi_hook);

99 return sizeof ppapi_hook;	99 return sizeof ppapi_hook;

100 }	100 }

101 return 0;	101 return 0;

102 }	102 }

OLD	NEW