OLD | NEW |
---|---|
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 "ppapi/proxy/ppb_instance_proxy.h" | 5 #include "ppapi/proxy/ppb_instance_proxy.h" |
6 | 6 |
7 #include "base/memory/ref_counted.h" | 7 #include "base/memory/ref_counted.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "ppapi/c/pp_errors.h" | 9 #include "ppapi/c/pp_errors.h" |
10 #include "ppapi/c/pp_time.h" | 10 #include "ppapi/c/pp_time.h" |
(...skipping 1127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1138 EnterInstanceNoLock enter(instance); | 1138 EnterInstanceNoLock enter(instance); |
1139 if (enter.succeeded()) | 1139 if (enter.succeeded()) |
1140 enter.functions()->DeliverSamples(instance, audio_frames, &block_info); | 1140 enter.functions()->DeliverSamples(instance, audio_frames, &block_info); |
1141 } | 1141 } |
1142 | 1142 |
1143 void PPB_Instance_Proxy::OnHostMsgSetCursor( | 1143 void PPB_Instance_Proxy::OnHostMsgSetCursor( |
1144 PP_Instance instance, | 1144 PP_Instance instance, |
1145 int32_t type, | 1145 int32_t type, |
1146 const ppapi::HostResource& custom_image, | 1146 const ppapi::HostResource& custom_image, |
1147 const PP_Point& hot_spot) { | 1147 const PP_Point& hot_spot) { |
1148 if (!dispatcher()->permissions().HasPermission(PERMISSION_DEV)) | |
yzshen1
2013/02/08 21:51:11
Is this caused by a sync? It seems to have nothing
Wez
2013/02/10 04:47:02
Mix up w/ a branch for an un-related CL. :(
| |
1149 return; | |
1150 EnterInstanceNoLock enter(instance); | 1148 EnterInstanceNoLock enter(instance); |
1151 if (enter.succeeded()) { | 1149 if (enter.succeeded()) { |
1152 enter.functions()->SetCursor( | 1150 enter.functions()->SetCursor( |
1153 instance, static_cast<PP_MouseCursor_Type>(type), | 1151 instance, static_cast<PP_MouseCursor_Type>(type), |
1154 custom_image.host_resource(), &hot_spot); | 1152 custom_image.host_resource(), &hot_spot); |
1155 } | 1153 } |
1156 } | 1154 } |
1157 | 1155 |
1158 void PPB_Instance_Proxy::OnHostMsgSetTextInputType(PP_Instance instance, | 1156 void PPB_Instance_Proxy::OnHostMsgSetTextInputType(PP_Instance instance, |
1159 PP_TextInput_Type type) { | 1157 PP_TextInput_Type type) { |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1227 PP_Instance instance) { | 1225 PP_Instance instance) { |
1228 InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())-> | 1226 InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())-> |
1229 GetInstanceData(instance); | 1227 GetInstanceData(instance); |
1230 if (!data) | 1228 if (!data) |
1231 return; // Instance was probably deleted. | 1229 return; // Instance was probably deleted. |
1232 data->should_do_request_surrounding_text = false; | 1230 data->should_do_request_surrounding_text = false; |
1233 } | 1231 } |
1234 | 1232 |
1235 } // namespace proxy | 1233 } // namespace proxy |
1236 } // namespace ppapi | 1234 } // namespace ppapi |
OLD | NEW |