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

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

Issue 7300010: Add PPB_Memory_Dev. This is the first of a few CLs needed to pull MemAlloc and (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Clean up thunk.h Created 9 years, 5 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
« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/plugins/ppapi/ppb_memory_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 13 matching lines...) Expand all
24 #include "ppapi/c/dev/ppb_file_io_dev.h" 24 #include "ppapi/c/dev/ppb_file_io_dev.h"
25 #include "ppapi/c/dev/ppb_file_io_trusted_dev.h" 25 #include "ppapi/c/dev/ppb_file_io_trusted_dev.h"
26 #include "ppapi/c/dev/ppb_file_ref_dev.h" 26 #include "ppapi/c/dev/ppb_file_ref_dev.h"
27 #include "ppapi/c/dev/ppb_file_system_dev.h" 27 #include "ppapi/c/dev/ppb_file_system_dev.h"
28 #include "ppapi/c/dev/ppb_find_dev.h" 28 #include "ppapi/c/dev/ppb_find_dev.h"
29 #include "ppapi/c/dev/ppb_font_dev.h" 29 #include "ppapi/c/dev/ppb_font_dev.h"
30 #include "ppapi/c/dev/ppb_fullscreen_dev.h" 30 #include "ppapi/c/dev/ppb_fullscreen_dev.h"
31 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h" 31 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"
32 #include "ppapi/c/dev/ppb_graphics_3d_dev.h" 32 #include "ppapi/c/dev/ppb_graphics_3d_dev.h"
33 #include "ppapi/c/dev/ppb_layer_compositor_dev.h" 33 #include "ppapi/c/dev/ppb_layer_compositor_dev.h"
34 #include "ppapi/c/dev/ppb_memory_dev.h"
34 #include "ppapi/c/dev/ppb_opengles_dev.h" 35 #include "ppapi/c/dev/ppb_opengles_dev.h"
35 #include "ppapi/c/dev/ppb_scrollbar_dev.h" 36 #include "ppapi/c/dev/ppb_scrollbar_dev.h"
36 #include "ppapi/c/dev/ppb_surface_3d_dev.h" 37 #include "ppapi/c/dev/ppb_surface_3d_dev.h"
37 #include "ppapi/c/dev/ppb_testing_dev.h" 38 #include "ppapi/c/dev/ppb_testing_dev.h"
38 #include "ppapi/c/dev/ppb_transport_dev.h" 39 #include "ppapi/c/dev/ppb_transport_dev.h"
39 #include "ppapi/c/dev/ppb_url_util_dev.h" 40 #include "ppapi/c/dev/ppb_url_util_dev.h"
40 #include "ppapi/c/dev/ppb_var_deprecated.h" 41 #include "ppapi/c/dev/ppb_var_deprecated.h"
41 #include "ppapi/c/dev/ppb_video_decoder_dev.h" 42 #include "ppapi/c/dev/ppb_video_decoder_dev.h"
42 #include "ppapi/c/dev/ppb_video_layer_dev.h" 43 #include "ppapi/c/dev/ppb_video_layer_dev.h"
43 #include "ppapi/c/dev/ppb_widget_dev.h" 44 #include "ppapi/c/dev/ppb_widget_dev.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 #include "webkit/plugins/ppapi/ppb_directory_reader_impl.h" 83 #include "webkit/plugins/ppapi/ppb_directory_reader_impl.h"
83 #include "webkit/plugins/ppapi/ppb_flash_clipboard_impl.h" 84 #include "webkit/plugins/ppapi/ppb_flash_clipboard_impl.h"
84 #include "webkit/plugins/ppapi/ppb_flash_file_impl.h" 85 #include "webkit/plugins/ppapi/ppb_flash_file_impl.h"
85 #include "webkit/plugins/ppapi/ppb_flash_impl.h" 86 #include "webkit/plugins/ppapi/ppb_flash_impl.h"
86 #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h" 87 #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h"
87 #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h" 88 #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h"
88 #include "webkit/plugins/ppapi/ppb_font_impl.h" 89 #include "webkit/plugins/ppapi/ppb_font_impl.h"
89 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h" 90 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
90 #include "webkit/plugins/ppapi/ppb_image_data_impl.h" 91 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
91 #include "webkit/plugins/ppapi/ppb_layer_compositor_impl.h" 92 #include "webkit/plugins/ppapi/ppb_layer_compositor_impl.h"
93 #include "webkit/plugins/ppapi/ppb_memory_impl.h"
92 #include "webkit/plugins/ppapi/ppb_opengles_impl.h" 94 #include "webkit/plugins/ppapi/ppb_opengles_impl.h"
93 #include "webkit/plugins/ppapi/ppb_proxy_impl.h" 95 #include "webkit/plugins/ppapi/ppb_proxy_impl.h"
94 #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h" 96 #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h"
95 #include "webkit/plugins/ppapi/ppb_uma_private_impl.h" 97 #include "webkit/plugins/ppapi/ppb_uma_private_impl.h"
96 #include "webkit/plugins/ppapi/ppb_url_util_impl.h" 98 #include "webkit/plugins/ppapi/ppb_url_util_impl.h"
97 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h" 99 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h"
98 #include "webkit/plugins/ppapi/ppb_video_layer_impl.h" 100 #include "webkit/plugins/ppapi/ppb_video_layer_impl.h"
99 #include "webkit/plugins/ppapi/resource_tracker.h" 101 #include "webkit/plugins/ppapi/resource_tracker.h"
100 #include "webkit/plugins/ppapi/var.h" 102 #include "webkit/plugins/ppapi/var.h"
101 #include "webkit/plugins/ppapi/webkit_forwarding_impl.h" 103 #include "webkit/plugins/ppapi/webkit_forwarding_impl.h"
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 if (strcmp(name, PPB_IMAGEDATA_INTERFACE) == 0) 287 if (strcmp(name, PPB_IMAGEDATA_INTERFACE) == 0)
286 return ::ppapi::thunk::GetPPB_ImageData_Thunk(); 288 return ::ppapi::thunk::GetPPB_ImageData_Thunk();
287 if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE) == 0) 289 if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE) == 0)
288 return ::ppapi::thunk::GetPPB_ImageDataTrusted_Thunk(); 290 return ::ppapi::thunk::GetPPB_ImageDataTrusted_Thunk();
289 if (strcmp(name, PPB_INSTANCE_INTERFACE_0_4) == 0) 291 if (strcmp(name, PPB_INSTANCE_INTERFACE_0_4) == 0)
290 return ::ppapi::thunk::GetPPB_Instance_0_4_Thunk(); 292 return ::ppapi::thunk::GetPPB_Instance_0_4_Thunk();
291 if (strcmp(name, PPB_INSTANCE_INTERFACE_0_5) == 0) 293 if (strcmp(name, PPB_INSTANCE_INTERFACE_0_5) == 0)
292 return ::ppapi::thunk::GetPPB_Instance_0_5_Thunk(); 294 return ::ppapi::thunk::GetPPB_Instance_0_5_Thunk();
293 if (strcmp(name, PPB_INSTANCE_PRIVATE_INTERFACE) == 0) 295 if (strcmp(name, PPB_INSTANCE_PRIVATE_INTERFACE) == 0)
294 return ::ppapi::thunk::GetPPB_Instance_Private_Thunk(); 296 return ::ppapi::thunk::GetPPB_Instance_Private_Thunk();
297 if (strcmp(name, PPB_MEMORY_DEV_INTERFACE) == 0)
298 return PPB_Memory_Impl::GetInterface();
295 if (strcmp(name, PPB_MESSAGING_INTERFACE) == 0) 299 if (strcmp(name, PPB_MESSAGING_INTERFACE) == 0)
296 return PluginInstance::GetMessagingInterface(); 300 return PluginInstance::GetMessagingInterface();
297 if (strcmp(name, PPB_PROXY_PRIVATE_INTERFACE) == 0) 301 if (strcmp(name, PPB_PROXY_PRIVATE_INTERFACE) == 0)
298 return PPB_Proxy_Impl::GetInterface(); 302 return PPB_Proxy_Impl::GetInterface();
299 if (strcmp(name, PPB_SCROLLBAR_DEV_INTERFACE_0_4) == 0) 303 if (strcmp(name, PPB_SCROLLBAR_DEV_INTERFACE_0_4) == 0)
300 return ::ppapi::thunk::GetPPB_Scrollbar_Thunk(); 304 return ::ppapi::thunk::GetPPB_Scrollbar_Thunk();
301 if (strcmp(name, PPB_SCROLLBAR_DEV_INTERFACE_0_3) == 0) 305 if (strcmp(name, PPB_SCROLLBAR_DEV_INTERFACE_0_3) == 0)
302 return PPB_Scrollbar_Impl::Get0_3Interface(); 306 return PPB_Scrollbar_Impl::Get0_3Interface();
303 if (strcmp(name, PPB_UMA_PRIVATE_INTERFACE) == 0) 307 if (strcmp(name, PPB_UMA_PRIVATE_INTERFACE) == 0)
304 return PPB_UMA_Private_Impl::GetInterface(); 308 return PPB_UMA_Private_Impl::GetInterface();
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 int retval = entry_points_.initialize_module(pp_module(), &GetInterface); 581 int retval = entry_points_.initialize_module(pp_module(), &GetInterface);
578 if (retval != 0) { 582 if (retval != 0) {
579 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; 583 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
580 return false; 584 return false;
581 } 585 }
582 return true; 586 return true;
583 } 587 }
584 588
585 } // namespace ppapi 589 } // namespace ppapi
586 } // namespace webkit 590 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/plugins/ppapi/ppb_memory_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698