src/trusted/plugin/ppapi/module_ppapi.cc - Issue 6218004: Resource64->32, NaCl side.

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: src/trusted/plugin/ppapi/module_ppapi.cc

Issue 6218004: Resource64->32, NaCl side. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client

Patch Set: First Created 9 years, 11 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

OLD	NEW
1 /*	1 /*

2 * Copyright 2010 The Native Client Authors. All rights reserved.	2 * Copyright 2010 The Native Client Authors. All rights reserved.

3 * Use of this source code is governed by a BSD-style license that can	3 * Use of this source code is governed by a BSD-style license that can

4 * be found in the LICENSE file.	4 * be found in the LICENSE file.

5 */	5 */

6	6

7 #include "native_client/src/trusted/desc/nrd_all_modules.h"	7 #include "native_client/src/trusted/desc/nrd_all_modules.h"

8 #include "native_client/src/trusted/handle_pass/browser_handle.h"	8 #include "native_client/src/trusted/handle_pass/browser_handle.h"

9 #include "native_client/src/trusted/plugin/ppapi/plugin_ppapi.h"	9 #include "native_client/src/trusted/plugin/ppapi/plugin_ppapi.h"

10 #include "native_client/src/trusted/plugin/nacl_entry_points.h"	10 #include "native_client/src/trusted/plugin/nacl_entry_points.h"

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44	44

45 NaClNrdAllModulesInit();	45 NaClNrdAllModulesInit();

46	46

47 #if NACL_WINDOWS && !defined(NACL_STANDALONE)	47 #if NACL_WINDOWS && !defined(NACL_STANDALONE)

48 NaClHandlePassBrowserInit();	48 NaClHandlePassBrowserInit();

49 #endif	49 #endif

50 return true;	50 return true;

51 }	51 }

52	52

53 virtual pp::Instance* CreateInstance(PP_Instance pp_instance) {	53 virtual pp::Instance* CreateInstance(PP_Instance pp_instance) {

54 PLUGIN_PRINTF(("ModulePpapi::CreateInstance (pp_instance=%"NACL_PRId64")\n",	54 PLUGIN_PRINTF(("ModulePpapi::CreateInstance (pp_instance=%"NACL_PRId32")\n",

55 pp_instance));	55 pp_instance));

56 PluginPpapi* plugin = PluginPpapi::New(pp_instance);	56 PluginPpapi* plugin = PluginPpapi::New(pp_instance);

57 PLUGIN_PRINTF(("ModulePpapi::CreateInstance (return %p)\n",	57 PLUGIN_PRINTF(("ModulePpapi::CreateInstance (return %p)\n",

58 static_cast<void* >(plugin)));	58 static_cast<void* >(plugin)));

59 return plugin;	59 return plugin;

60 }	60 }

61 };	61 };

62	62

63 } // namespace plugin	63 } // namespace plugin

64	64

65	65

66 namespace pp {	66 namespace pp {

67	67

68 Module* CreateModule() {	68 Module* CreateModule() {

69 PLUGIN_PRINTF(("CreateModule ()\n"));	69 PLUGIN_PRINTF(("CreateModule ()\n"));

70 return new plugin::ModulePpapi();	70 return new plugin::ModulePpapi();

71 }	71 }

72	72

73 } // namespace pp	73 } // namespace pp

OLD	NEW

« no previous file with comments | « src/shared/ppapi_proxy/untrusted/srpcgen/ppb_rpc.h ('k') | src/trusted/plugin/ppapi/plugin_ppapi.cc » ('j') | tests/fake_browser_ppapi/fake_host.h » ('J')