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

Side by Side Diff: ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_instance.cc

Issue 9253011: Pepper SRPC proxy style and type nits (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad license to pass presubmit check Created 8 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
OLDNEW
1 // Copyright (c) 2011 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/shared/ppapi_proxy/browser_ppp_instance.h" 5 #include "native_client/src/shared/ppapi_proxy/browser_ppp_instance.h"
6 6
7 #include <stdio.h> 7 #include <stdio.h>
8 #include <string.h> 8 #include <string.h>
9 #include <limits> 9 #include <limits>
10 10
11 #include "native_client/src/include/checked_cast.h" 11 #include "native_client/src/include/checked_cast.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 strncpy(serial_array + pos, array[i], len); 58 strncpy(serial_array + pos, array[i], len);
59 pos += len; 59 pos += len;
60 } 60 }
61 return serial_array; 61 return serial_array;
62 } 62 }
63 63
64 PP_Bool DidCreate(PP_Instance instance, 64 PP_Bool DidCreate(PP_Instance instance,
65 uint32_t argc, 65 uint32_t argc,
66 const char* argn[], 66 const char* argn[],
67 const char* argv[]) { 67 const char* argv[]) {
68 DebugPrintf("PPP_Instance::DidCreate: instance=%"NACL_PRIu32"\n", instance); 68 DebugPrintf("PPP_Instance::DidCreate: instance=%"NACL_PRId32"\n", instance);
69 uint32_t argn_size; 69 uint32_t argn_size;
70 scoped_array<char> argn_serial(ArgArraySerialize(argc, argn, &argn_size)); 70 scoped_array<char> argn_serial(ArgArraySerialize(argc, argn, &argn_size));
71 if (argn_serial.get() == NULL) { 71 if (argn_serial.get() == NULL) {
72 return PP_FALSE; 72 return PP_FALSE;
73 } 73 }
74 uint32_t argv_size; 74 uint32_t argv_size;
75 scoped_array<char> argv_serial(ArgArraySerialize(argc, argv, &argv_size)); 75 scoped_array<char> argv_serial(ArgArraySerialize(argc, argv, &argv_size));
76 if (argv_serial.get() == NULL) { 76 if (argv_serial.get() == NULL) {
77 return PP_FALSE; 77 return PP_FALSE;
78 } 78 }
79 int32_t int_argc = static_cast<int32_t>(argc); 79 int32_t int_argc = static_cast<int32_t>(argc);
80 int32_t success; 80 int32_t success;
81 NaClSrpcError srpc_result = 81 NaClSrpcError srpc_result =
82 PppInstanceRpcClient::PPP_Instance_DidCreate(GetMainSrpcChannel(instance), 82 PppInstanceRpcClient::PPP_Instance_DidCreate(GetMainSrpcChannel(instance),
83 instance, 83 instance,
84 int_argc, 84 int_argc,
85 argn_size, 85 argn_size,
86 argn_serial.get(), 86 argn_serial.get(),
87 argv_size, 87 argv_size,
88 argv_serial.get(), 88 argv_serial.get(),
89 &success); 89 &success);
90 DebugPrintf("PPP_Instance::DidCreate: %s\n", 90 DebugPrintf("PPP_Instance::DidCreate: %s\n",
91 NaClSrpcErrorString(srpc_result)); 91 NaClSrpcErrorString(srpc_result));
92 if (srpc_result != NACL_SRPC_RESULT_OK) { 92 if (srpc_result != NACL_SRPC_RESULT_OK) {
93 return PP_FALSE; 93 return PP_FALSE;
94 } 94 }
95 return static_cast<PP_Bool>(success != 0); 95 return PP_FromBool(success);
96 } 96 }
97 97
98 void DidDestroy(PP_Instance instance) { 98 void DidDestroy(PP_Instance instance) {
99 DebugPrintf("PPP_Instance::DidDestroy: instance=%"NACL_PRIu32"\n", instance); 99 DebugPrintf("PPP_Instance::DidDestroy: instance=%"NACL_PRId32"\n", instance);
100 NaClSrpcError srpc_result = PppInstanceRpcClient::PPP_Instance_DidDestroy( 100 NaClSrpcError srpc_result = PppInstanceRpcClient::PPP_Instance_DidDestroy(
101 GetMainSrpcChannel(instance), instance); 101 GetMainSrpcChannel(instance), instance);
102 DebugPrintf("PPP_Instance::DidDestroy: %s\n", 102 DebugPrintf("PPP_Instance::DidDestroy: %s\n",
103 NaClSrpcErrorString(srpc_result)); 103 NaClSrpcErrorString(srpc_result));
104 } 104 }
105 105
106 void DidChangeView(PP_Instance instance, PP_Resource view) { 106 void DidChangeView(PP_Instance instance, PP_Resource view) {
107 DebugPrintf("PPP_Instance::DidChangeView: instance=%"NACL_PRIu32"\n", 107 DebugPrintf("PPP_Instance::DidChangeView: instance=%"NACL_PRId32"\n",
108 instance); 108 instance);
109 ViewData view_data; 109 ViewData view_data;
110 110
111 const PPB_View* view_interface = PPBViewInterface(); 111 const PPB_View* view_interface = PPBViewInterface();
112 view_interface->GetRect(view, &view_data.viewport_rect); 112 view_interface->GetRect(view, &view_data.viewport_rect);
113 view_data.is_fullscreen = view_interface->IsFullscreen(view); 113 view_data.is_fullscreen = view_interface->IsFullscreen(view);
114 view_data.is_page_visible = view_interface->IsPageVisible(view); 114 view_data.is_page_visible = view_interface->IsPageVisible(view);
115 view_interface->GetClipRect(view, &view_data.clip_rect); 115 view_interface->GetClipRect(view, &view_data.clip_rect);
116 116
117 NaClSrpcError srpc_result = PppInstanceRpcClient::PPP_Instance_DidChangeView( 117 NaClSrpcError srpc_result = PppInstanceRpcClient::PPP_Instance_DidChangeView(
118 GetMainSrpcChannel(instance), 118 GetMainSrpcChannel(instance),
119 instance, 119 instance,
120 view, 120 view,
121 sizeof(ViewData), 121 sizeof(ViewData),
122 reinterpret_cast<char*>(&view_data)); 122 reinterpret_cast<char*>(&view_data));
123 DebugPrintf("PPP_Instance::DidChangeView: %s\n", 123 DebugPrintf("PPP_Instance::DidChangeView: %s\n",
124 NaClSrpcErrorString(srpc_result)); 124 NaClSrpcErrorString(srpc_result));
125 } 125 }
126 126
127 void DidChangeFocus(PP_Instance instance, PP_Bool has_focus) { 127 void DidChangeFocus(PP_Instance instance, PP_Bool has_focus) {
128 DebugPrintf("PPP_Instance::DidChangeFocus: instance=%"NACL_PRIu32", " 128 DebugPrintf("PPP_Instance::DidChangeFocus: instance=%"NACL_PRId32", "
129 "has_focus = %d\n", instance, has_focus); 129 "has_focus = %d\n", instance, has_focus);
130 NaClSrpcError srpc_result = PppInstanceRpcClient::PPP_Instance_DidChangeFocus( 130 NaClSrpcError srpc_result = PppInstanceRpcClient::PPP_Instance_DidChangeFocus(
131 GetMainSrpcChannel(instance), 131 GetMainSrpcChannel(instance),
132 instance, 132 instance,
133 static_cast<bool>(PP_TRUE == has_focus)); 133 PP_ToBool(has_focus));
134 DebugPrintf("PPP_Instance::DidChangeFocus: %s\n", 134 DebugPrintf("PPP_Instance::DidChangeFocus: %s\n",
135 NaClSrpcErrorString(srpc_result)); 135 NaClSrpcErrorString(srpc_result));
136 } 136 }
137 137
138 PP_Bool HandleDocumentLoad(PP_Instance instance, PP_Resource url_loader) { 138 PP_Bool HandleDocumentLoad(PP_Instance instance, PP_Resource url_loader) {
139 DebugPrintf("PPP_Instance::HandleDocumentLoad: instance=%"NACL_PRIu32", " 139 DebugPrintf("PPP_Instance::HandleDocumentLoad: instance=%"NACL_PRId32", "
140 "url_loader=%"NACL_PRIu32"\n", instance, url_loader); 140 "url_loader=%"NACL_PRId32"\n", instance, url_loader);
141 141
142 int32_t result = 0; 142 int32_t result = 0;
143 NaClSrpcError srpc_result = 143 NaClSrpcError srpc_result =
144 PppInstanceRpcClient::PPP_Instance_HandleDocumentLoad( 144 PppInstanceRpcClient::PPP_Instance_HandleDocumentLoad(
145 GetMainSrpcChannel(instance), 145 GetMainSrpcChannel(instance),
146 instance, 146 instance,
147 url_loader, 147 url_loader,
148 &result); 148 &result);
149 149
150 DebugPrintf("PPP_Instance::HandleDocumentLoad: %s\n", 150 DebugPrintf("PPP_Instance::HandleDocumentLoad: %s\n",
(...skipping 10 matching lines...) Expand all
161 DidCreate, 161 DidCreate,
162 DidDestroy, 162 DidDestroy,
163 DidChangeView, 163 DidChangeView,
164 DidChangeFocus, 164 DidChangeFocus,
165 HandleDocumentLoad 165 HandleDocumentLoad
166 }; 166 };
167 return &instance_interface; 167 return &instance_interface;
168 } 168 }
169 169
170 } // namespace ppapi_proxy 170 } // namespace ppapi_proxy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698