| 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 "webkit/plugins/ppapi/resource_creation_impl.h" | 5 #include "webkit/plugins/ppapi/resource_creation_impl.h" |
| 6 | 6 |
| 7 #include "ppapi/c/pp_size.h" | 7 #include "ppapi/c/pp_size.h" |
| 8 #include "ppapi/shared_impl/ppb_audio_config_shared.h" | 8 #include "ppapi/shared_impl/ppb_audio_config_shared.h" |
| 9 #include "ppapi/shared_impl/private/ppb_browser_font_trusted_shared.h" | 9 #include "ppapi/shared_impl/private/ppb_browser_font_trusted_shared.h" |
| 10 #include "ppapi/shared_impl/ppb_input_event_shared.h" | 10 #include "ppapi/shared_impl/ppb_input_event_shared.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 #include "webkit/plugins/ppapi/ppb_tcp_server_socket_private_impl.h" | 31 #include "webkit/plugins/ppapi/ppb_tcp_server_socket_private_impl.h" |
| 32 #include "webkit/plugins/ppapi/ppb_tcp_socket_private_impl.h" | 32 #include "webkit/plugins/ppapi/ppb_tcp_socket_private_impl.h" |
| 33 #include "webkit/plugins/ppapi/ppb_transport_impl.h" | 33 #include "webkit/plugins/ppapi/ppb_transport_impl.h" |
| 34 #include "webkit/plugins/ppapi/ppb_udp_socket_private_impl.h" | 34 #include "webkit/plugins/ppapi/ppb_udp_socket_private_impl.h" |
| 35 #include "webkit/plugins/ppapi/ppb_url_loader_impl.h" | 35 #include "webkit/plugins/ppapi/ppb_url_loader_impl.h" |
| 36 #include "webkit/plugins/ppapi/ppb_url_request_info_impl.h" | 36 #include "webkit/plugins/ppapi/ppb_url_request_info_impl.h" |
| 37 #include "webkit/plugins/ppapi/ppb_video_capture_impl.h" | 37 #include "webkit/plugins/ppapi/ppb_video_capture_impl.h" |
| 38 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h" | 38 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h" |
| 39 #include "webkit/plugins/ppapi/ppb_video_layer_impl.h" | 39 #include "webkit/plugins/ppapi/ppb_video_layer_impl.h" |
| 40 #include "webkit/plugins/ppapi/ppb_websocket_impl.h" | 40 #include "webkit/plugins/ppapi/ppb_websocket_impl.h" |
| 41 #include "webkit/plugins/ppapi/ppb_x509_certificate_private_impl.h" |
| 41 #include "webkit/plugins/ppapi/resource_helper.h" | 42 #include "webkit/plugins/ppapi/resource_helper.h" |
| 42 | 43 |
| 43 using ppapi::InputEventData; | 44 using ppapi::InputEventData; |
| 44 using ppapi::PPB_InputEvent_Shared; | 45 using ppapi::PPB_InputEvent_Shared; |
| 45 using ppapi::PPB_ResourceArray_Shared; | 46 using ppapi::PPB_ResourceArray_Shared; |
| 46 using ppapi::StringVar; | 47 using ppapi::StringVar; |
| 47 | 48 |
| 48 namespace webkit { | 49 namespace webkit { |
| 49 namespace ppapi { | 50 namespace ppapi { |
| 50 | 51 |
| (...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 data.event_time_stamp = time_stamp; | 340 data.event_time_stamp = time_stamp; |
| 340 data.event_modifiers = modifiers; | 341 data.event_modifiers = modifiers; |
| 341 data.wheel_delta = *wheel_delta; | 342 data.wheel_delta = *wheel_delta; |
| 342 data.wheel_ticks = *wheel_ticks; | 343 data.wheel_ticks = *wheel_ticks; |
| 343 data.wheel_scroll_by_page = PP_ToBool(scroll_by_page); | 344 data.wheel_scroll_by_page = PP_ToBool(scroll_by_page); |
| 344 | 345 |
| 345 return (new PPB_InputEvent_Shared(::ppapi::OBJECT_IS_IMPL, | 346 return (new PPB_InputEvent_Shared(::ppapi::OBJECT_IS_IMPL, |
| 346 instance, data))->GetReference(); | 347 instance, data))->GetReference(); |
| 347 } | 348 } |
| 348 | 349 |
| 350 PP_Resource ResourceCreationImpl::CreateX509CertificatePrivate( |
| 351 PP_Instance instance) { |
| 352 return PPB_X509Certificate_Private_Impl::CreateResource(instance); |
| 353 } |
| 354 |
| 349 } // namespace ppapi | 355 } // namespace ppapi |
| 350 } // namespace webkit | 356 } // namespace webkit |
| OLD | NEW |