OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/plugin_module.h" | 5 #include "webkit/plugins/ppapi/plugin_module.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
44 #include "ppapi/c/dev/ppb_zoom_dev.h" | 44 #include "ppapi/c/dev/ppb_zoom_dev.h" |
45 #include "ppapi/c/pp_module.h" | 45 #include "ppapi/c/pp_module.h" |
46 #include "ppapi/c/pp_resource.h" | 46 #include "ppapi/c/pp_resource.h" |
47 #include "ppapi/c/pp_var.h" | 47 #include "ppapi/c/pp_var.h" |
48 #include "ppapi/c/ppb_audio.h" | 48 #include "ppapi/c/ppb_audio.h" |
49 #include "ppapi/c/ppb_audio_config.h" | 49 #include "ppapi/c/ppb_audio_config.h" |
50 #include "ppapi/c/ppb_core.h" | 50 #include "ppapi/c/ppb_core.h" |
51 #include "ppapi/c/ppb_file_io.h" | 51 #include "ppapi/c/ppb_file_io.h" |
52 #include "ppapi/c/ppb_file_ref.h" | 52 #include "ppapi/c/ppb_file_ref.h" |
53 #include "ppapi/c/ppb_file_system.h" | 53 #include "ppapi/c/ppb_file_system.h" |
54 #include "ppapi/c/ppb_fullscreen.h" | |
54 #include "ppapi/c/ppb_graphics_2d.h" | 55 #include "ppapi/c/ppb_graphics_2d.h" |
55 #include "ppapi/c/ppb_graphics_3d.h" | 56 #include "ppapi/c/ppb_graphics_3d.h" |
56 #include "ppapi/c/ppb_image_data.h" | 57 #include "ppapi/c/ppb_image_data.h" |
57 #include "ppapi/c/ppb_instance.h" | 58 #include "ppapi/c/ppb_instance.h" |
58 #include "ppapi/c/ppb_messaging.h" | 59 #include "ppapi/c/ppb_messaging.h" |
59 #include "ppapi/c/ppb_opengles2.h" | 60 #include "ppapi/c/ppb_opengles2.h" |
60 #include "ppapi/c/ppb_url_loader.h" | 61 #include "ppapi/c/ppb_url_loader.h" |
61 #include "ppapi/c/ppb_url_request_info.h" | 62 #include "ppapi/c/ppb_url_request_info.h" |
62 #include "ppapi/c/ppb_url_response_info.h" | 63 #include "ppapi/c/ppb_url_response_info.h" |
63 #include "ppapi/c/ppb_var.h" | 64 #include "ppapi/c/ppb_var.h" |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
268 if (strcmp(name, PPB_FLASH_FILE_MODULELOCAL_INTERFACE) == 0) | 269 if (strcmp(name, PPB_FLASH_FILE_MODULELOCAL_INTERFACE) == 0) |
269 return PPB_Flash_File_ModuleLocal_Impl::GetInterface(); | 270 return PPB_Flash_File_ModuleLocal_Impl::GetInterface(); |
270 if (strcmp(name, PPB_FLASH_MENU_INTERFACE) == 0) | 271 if (strcmp(name, PPB_FLASH_MENU_INTERFACE) == 0) |
271 return ::ppapi::thunk::GetPPB_Flash_Menu_Thunk(); | 272 return ::ppapi::thunk::GetPPB_Flash_Menu_Thunk(); |
272 if (strcmp(name, PPB_FLASH_TCPSOCKET_INTERFACE) == 0) | 273 if (strcmp(name, PPB_FLASH_TCPSOCKET_INTERFACE) == 0) |
273 return ::ppapi::thunk::GetPPB_Flash_TCPSocket_Thunk(); | 274 return ::ppapi::thunk::GetPPB_Flash_TCPSocket_Thunk(); |
274 if (strcmp(name, PPB_FLASH_UDPSOCKET_INTERFACE) == 0) | 275 if (strcmp(name, PPB_FLASH_UDPSOCKET_INTERFACE) == 0) |
275 return ::ppapi::thunk::GetPPB_Flash_UDPSocket_Thunk(); | 276 return ::ppapi::thunk::GetPPB_Flash_UDPSocket_Thunk(); |
276 if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE_0_4) == 0) | 277 if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE_0_4) == 0) |
277 return ::ppapi::thunk::GetPPB_FlashFullscreen_Thunk(); | 278 return ::ppapi::thunk::GetPPB_FlashFullscreen_Thunk(); |
279 if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE_0_5) == 0) | |
dmichael (off chromium)
2011/10/14 15:20:55
Why not PPB_FULLSCREEN_INTERFACE or PPB_FULLSCREEN
polina
2011/10/14 19:15:04
I guess I just copied the one right above it.
Sure
dmichael(do not use this one)
2011/10/14 19:23:00
What's the intent? I thought you were trying to ad
polina
2011/10/14 19:24:48
The intent is to be backwards-compatible in case t
| |
280 return ::ppapi::thunk::GetPPB_Fullscreen_Thunk(); | |
278 if (strcmp(name, PPB_GPU_BLACKLIST_INTERFACE) == 0) | 281 if (strcmp(name, PPB_GPU_BLACKLIST_INTERFACE) == 0) |
279 return PPB_GpuBlacklist_Private_Impl::GetInterface(); | 282 return PPB_GpuBlacklist_Private_Impl::GetInterface(); |
280 if (strcmp(name, PPB_GRAPHICS_3D_TRUSTED_INTERFACE) == 0) | 283 if (strcmp(name, PPB_GRAPHICS_3D_TRUSTED_INTERFACE) == 0) |
281 return ::ppapi::thunk::GetPPB_Graphics3DTrusted_Thunk(); | 284 return ::ppapi::thunk::GetPPB_Graphics3DTrusted_Thunk(); |
282 if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE) == 0) | 285 if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE) == 0) |
283 return ::ppapi::thunk::GetPPB_ImageDataTrusted_Thunk(); | 286 return ::ppapi::thunk::GetPPB_ImageDataTrusted_Thunk(); |
284 if (strcmp(name, PPB_INPUT_EVENT_INTERFACE_1_0) == 0) | 287 if (strcmp(name, PPB_INPUT_EVENT_INTERFACE_1_0) == 0) |
285 return ::ppapi::thunk::GetPPB_InputEvent_Thunk(); | 288 return ::ppapi::thunk::GetPPB_InputEvent_Thunk(); |
286 if (strcmp(name, PPB_INSTANCE_PRIVATE_INTERFACE) == 0) | 289 if (strcmp(name, PPB_INSTANCE_PRIVATE_INTERFACE) == 0) |
287 return ::ppapi::thunk::GetPPB_Instance_Private_Thunk(); | 290 return ::ppapi::thunk::GetPPB_Instance_Private_Thunk(); |
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
539 int retval = entry_points.initialize_module(pp_module(), &GetInterface); | 542 int retval = entry_points.initialize_module(pp_module(), &GetInterface); |
540 if (retval != 0) { | 543 if (retval != 0) { |
541 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; | 544 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; |
542 return false; | 545 return false; |
543 } | 546 } |
544 return true; | 547 return true; |
545 } | 548 } |
546 | 549 |
547 } // namespace ppapi | 550 } // namespace ppapi |
548 } // namespace webkit | 551 } // namespace webkit |
OLD | NEW |