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

Side by Side Diff: webkit/plugins/ppapi/plugin_module.cc

Issue 7790016: Hookup Gpu blacklist with NaCl Pepper3D access. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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) 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/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "ppapi/c/ppb_url_loader.h" 58 #include "ppapi/c/ppb_url_loader.h"
59 #include "ppapi/c/ppb_url_request_info.h" 59 #include "ppapi/c/ppb_url_request_info.h"
60 #include "ppapi/c/ppb_url_response_info.h" 60 #include "ppapi/c/ppb_url_response_info.h"
61 #include "ppapi/c/ppb_var.h" 61 #include "ppapi/c/ppb_var.h"
62 #include "ppapi/c/ppp.h" 62 #include "ppapi/c/ppp.h"
63 #include "ppapi/c/ppp_instance.h" 63 #include "ppapi/c/ppp_instance.h"
64 #include "ppapi/c/private/ppb_flash.h" 64 #include "ppapi/c/private/ppb_flash.h"
65 #include "ppapi/c/private/ppb_flash_clipboard.h" 65 #include "ppapi/c/private/ppb_flash_clipboard.h"
66 #include "ppapi/c/private/ppb_flash_file.h" 66 #include "ppapi/c/private/ppb_flash_file.h"
67 #include "ppapi/c/private/ppb_flash_tcp_socket.h" 67 #include "ppapi/c/private/ppb_flash_tcp_socket.h"
68 #include "ppapi/c/private/ppb_gpu_blacklist_private.h"
68 #include "ppapi/c/private/ppb_instance_private.h" 69 #include "ppapi/c/private/ppb_instance_private.h"
69 #include "ppapi/c/private/ppb_pdf.h" 70 #include "ppapi/c/private/ppb_pdf.h"
70 #include "ppapi/c/private/ppb_proxy_private.h" 71 #include "ppapi/c/private/ppb_proxy_private.h"
71 #include "ppapi/c/private/ppb_uma_private.h" 72 #include "ppapi/c/private/ppb_uma_private.h"
72 #include "ppapi/c/trusted/ppb_audio_trusted.h" 73 #include "ppapi/c/trusted/ppb_audio_trusted.h"
73 #include "ppapi/c/trusted/ppb_broker_trusted.h" 74 #include "ppapi/c/trusted/ppb_broker_trusted.h"
74 #include "ppapi/c/trusted/ppb_buffer_trusted.h" 75 #include "ppapi/c/trusted/ppb_buffer_trusted.h"
75 #include "ppapi/c/trusted/ppb_file_io_trusted.h" 76 #include "ppapi/c/trusted/ppb_file_io_trusted.h"
76 #include "ppapi/c/trusted/ppb_image_data_trusted.h" 77 #include "ppapi/c/trusted/ppb_image_data_trusted.h"
77 #include "ppapi/c/trusted/ppb_url_loader_trusted.h" 78 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
78 #include "ppapi/shared_impl/input_event_impl.h" 79 #include "ppapi/shared_impl/input_event_impl.h"
79 #include "ppapi/shared_impl/time_conversion.h" 80 #include "ppapi/shared_impl/time_conversion.h"
80 #include "ppapi/thunk/enter.h" 81 #include "ppapi/thunk/enter.h"
81 #include "ppapi/thunk/thunk.h" 82 #include "ppapi/thunk/thunk.h"
82 #include "webkit/plugins/plugin_switches.h" 83 #include "webkit/plugins/plugin_switches.h"
83 #include "webkit/plugins/ppapi/callbacks.h" 84 #include "webkit/plugins/ppapi/callbacks.h"
84 #include "webkit/plugins/ppapi/common.h" 85 #include "webkit/plugins/ppapi/common.h"
85 #include "webkit/plugins/ppapi/ppapi_interface_factory.h" 86 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
86 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" 87 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
87 #include "webkit/plugins/ppapi/ppb_console_impl.h" 88 #include "webkit/plugins/ppapi/ppb_console_impl.h"
88 #include "webkit/plugins/ppapi/ppb_crypto_impl.h" 89 #include "webkit/plugins/ppapi/ppb_crypto_impl.h"
89 #include "webkit/plugins/ppapi/ppb_directory_reader_impl.h" 90 #include "webkit/plugins/ppapi/ppb_directory_reader_impl.h"
90 #include "webkit/plugins/ppapi/ppb_flash_clipboard_impl.h" 91 #include "webkit/plugins/ppapi/ppb_flash_clipboard_impl.h"
91 #include "webkit/plugins/ppapi/ppb_flash_file_impl.h" 92 #include "webkit/plugins/ppapi/ppb_flash_file_impl.h"
92 #include "webkit/plugins/ppapi/ppb_flash_impl.h" 93 #include "webkit/plugins/ppapi/ppb_flash_impl.h"
93 #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h" 94 #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h"
94 #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h" 95 #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h"
95 #include "webkit/plugins/ppapi/ppb_font_impl.h" 96 #include "webkit/plugins/ppapi/ppb_font_impl.h"
97 #include "webkit/plugins/ppapi/ppb_gpu_blacklist_private_impl.h"
96 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h" 98 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
97 #include "webkit/plugins/ppapi/ppb_image_data_impl.h" 99 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
98 #include "webkit/plugins/ppapi/ppb_layer_compositor_impl.h" 100 #include "webkit/plugins/ppapi/ppb_layer_compositor_impl.h"
99 #include "webkit/plugins/ppapi/ppb_memory_impl.h" 101 #include "webkit/plugins/ppapi/ppb_memory_impl.h"
100 #include "webkit/plugins/ppapi/ppb_opengles_impl.h" 102 #include "webkit/plugins/ppapi/ppb_opengles_impl.h"
101 #include "webkit/plugins/ppapi/ppb_proxy_impl.h" 103 #include "webkit/plugins/ppapi/ppb_proxy_impl.h"
102 #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h" 104 #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h"
103 #include "webkit/plugins/ppapi/ppb_uma_private_impl.h" 105 #include "webkit/plugins/ppapi/ppb_uma_private_impl.h"
104 #include "webkit/plugins/ppapi/ppb_url_util_impl.h" 106 #include "webkit/plugins/ppapi/ppb_url_util_impl.h"
105 #include "webkit/plugins/ppapi/ppb_var_impl.h" 107 #include "webkit/plugins/ppapi/ppb_var_impl.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 if (strcmp(name, PPB_FLASH_FILE_MODULELOCAL_INTERFACE) == 0) 274 if (strcmp(name, PPB_FLASH_FILE_MODULELOCAL_INTERFACE) == 0)
273 return PPB_Flash_File_ModuleLocal_Impl::GetInterface(); 275 return PPB_Flash_File_ModuleLocal_Impl::GetInterface();
274 if (strcmp(name, PPB_FLASH_MENU_INTERFACE) == 0) 276 if (strcmp(name, PPB_FLASH_MENU_INTERFACE) == 0)
275 return ::ppapi::thunk::GetPPB_Flash_Menu_Thunk(); 277 return ::ppapi::thunk::GetPPB_Flash_Menu_Thunk();
276 if (strcmp(name, PPB_FLASH_TCPSOCKET_INTERFACE) == 0) 278 if (strcmp(name, PPB_FLASH_TCPSOCKET_INTERFACE) == 0)
277 return ::ppapi::thunk::GetPPB_Flash_TCPSocket_Thunk(); 279 return ::ppapi::thunk::GetPPB_Flash_TCPSocket_Thunk();
278 if (strcmp(name, PPB_FONT_DEV_INTERFACE) == 0) 280 if (strcmp(name, PPB_FONT_DEV_INTERFACE) == 0)
279 return ::ppapi::thunk::GetPPB_Font_Thunk(); 281 return ::ppapi::thunk::GetPPB_Font_Thunk();
280 if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE) == 0) 282 if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE) == 0)
281 return ::ppapi::thunk::GetPPB_Fullscreen_Thunk(); 283 return ::ppapi::thunk::GetPPB_Fullscreen_Thunk();
284 if (strcmp(name, PPB_GPU_BLACKLIST_INTERFACE) == 0)
285 return PPB_GpuBlacklist_Private_Impl::GetInterface();
282 if (strcmp(name, PPB_GRAPHICS_2D_INTERFACE_1_0) == 0) 286 if (strcmp(name, PPB_GRAPHICS_2D_INTERFACE_1_0) == 0)
283 return ::ppapi::thunk::GetPPB_Graphics2D_Thunk(); 287 return ::ppapi::thunk::GetPPB_Graphics2D_Thunk();
284 if (strcmp(name, PPB_IMAGEDATA_INTERFACE_1_0) == 0) 288 if (strcmp(name, PPB_IMAGEDATA_INTERFACE_1_0) == 0)
285 return ::ppapi::thunk::GetPPB_ImageData_Thunk(); 289 return ::ppapi::thunk::GetPPB_ImageData_Thunk();
286 if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE) == 0) 290 if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE) == 0)
287 return ::ppapi::thunk::GetPPB_ImageDataTrusted_Thunk(); 291 return ::ppapi::thunk::GetPPB_ImageDataTrusted_Thunk();
288 if (strcmp(name, PPB_INPUT_EVENT_INTERFACE_1_0) == 0) 292 if (strcmp(name, PPB_INPUT_EVENT_INTERFACE_1_0) == 0)
289 return ::ppapi::thunk::GetPPB_InputEvent_Thunk(); 293 return ::ppapi::thunk::GetPPB_InputEvent_Thunk();
290 if (strcmp(name, PPB_INSTANCE_INTERFACE_1_0) == 0) 294 if (strcmp(name, PPB_INSTANCE_INTERFACE_1_0) == 0)
291 return ::ppapi::thunk::GetPPB_Instance_1_0_Thunk(); 295 return ::ppapi::thunk::GetPPB_Instance_1_0_Thunk();
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 int retval = entry_points.initialize_module(pp_module(), &GetInterface); 602 int retval = entry_points.initialize_module(pp_module(), &GetInterface);
599 if (retval != 0) { 603 if (retval != 0) {
600 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; 604 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
601 return false; 605 return false;
602 } 606 }
603 return true; 607 return true;
604 } 608 }
605 609
606 } // namespace ppapi 610 } // namespace ppapi
607 } // namespace webkit 611 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/plugin_switches.cc ('k') | webkit/plugins/ppapi/ppb_gpu_blacklist_private_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698