Chromium Code Reviews| 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 "native_client/src/shared/platform/nacl_check.h" | 5 #include "native_client/src/shared/platform/nacl_check.h" |
| 6 | 6 |
| 7 #include "ppapi/c/dev/ppb_cursor_control_dev.h" | |
| 8 #include "ppapi/c/dev/ppb_font_dev.h" | 7 #include "ppapi/c/dev/ppb_font_dev.h" |
| 9 #include "ppapi/c/dev/ppb_memory_dev.h" | 8 #include "ppapi/c/dev/ppb_memory_dev.h" |
| 10 #include "ppapi/c/dev/ppb_scrollbar_dev.h" | 9 #include "ppapi/c/dev/ppb_scrollbar_dev.h" |
| 11 #include "ppapi/c/dev/ppb_testing_dev.h" | 10 #include "ppapi/c/dev/ppb_testing_dev.h" |
| 12 #include "ppapi/c/dev/ppb_var_deprecated.h" | 11 #include "ppapi/c/dev/ppb_var_deprecated.h" |
| 13 #include "ppapi/c/dev/ppb_widget_dev.h" | 12 #include "ppapi/c/dev/ppb_widget_dev.h" |
| 14 #include "ppapi/c/ppb_audio.h" | 13 #include "ppapi/c/ppb_audio.h" |
| 15 #include "ppapi/c/ppb_audio_config.h" | 14 #include "ppapi/c/ppb_audio_config.h" |
| 16 #include "ppapi/c/ppb_core.h" | 15 #include "ppapi/c/ppb_core.h" |
| 17 #include "ppapi/c/ppb_file_io.h" | 16 #include "ppapi/c/ppb_file_io.h" |
| 18 #include "ppapi/c/ppb_file_ref.h" | 17 #include "ppapi/c/ppb_file_ref.h" |
| 19 #include "ppapi/c/ppb_file_system.h" | 18 #include "ppapi/c/ppb_file_system.h" |
| 20 #include "ppapi/c/ppb_fullscreen.h" | 19 #include "ppapi/c/ppb_fullscreen.h" |
| 21 #include "ppapi/c/ppb_graphics_2d.h" | 20 #include "ppapi/c/ppb_graphics_2d.h" |
| 22 #include "ppapi/c/ppb_graphics_3d.h" | 21 #include "ppapi/c/ppb_graphics_3d.h" |
| 23 #include "ppapi/c/ppb_image_data.h" | 22 #include "ppapi/c/ppb_image_data.h" |
| 24 #include "ppapi/c/ppb_input_event.h" | 23 #include "ppapi/c/ppb_input_event.h" |
| 25 #include "ppapi/c/ppb_instance.h" | 24 #include "ppapi/c/ppb_instance.h" |
| 26 #include "ppapi/c/ppb_messaging.h" | 25 #include "ppapi/c/ppb_messaging.h" |
| 26 #include "ppapi/c/ppb_mouse_cursor.h" | |
| 27 #include "ppapi/c/ppb_opengles2.h" | 27 #include "ppapi/c/ppb_opengles2.h" |
| 28 #include "ppapi/c/ppb_url_loader.h" | 28 #include "ppapi/c/ppb_url_loader.h" |
| 29 #include "ppapi/c/ppb_url_request_info.h" | 29 #include "ppapi/c/ppb_url_request_info.h" |
| 30 #include "ppapi/c/ppb_url_response_info.h" | 30 #include "ppapi/c/ppb_url_response_info.h" |
| 31 #include "ppapi/c/ppb_var.h" | 31 #include "ppapi/c/ppb_var.h" |
| 32 #include "ppapi/c/ppb_view.h" | 32 #include "ppapi/c/ppb_view.h" |
| 33 | 33 |
| 34 #include "native_client/tests/ppapi_test_lib/get_browser_interface.h" | 34 #include "native_client/tests/ppapi_test_lib/get_browser_interface.h" |
| 35 #include "native_client/tests/ppapi_test_lib/internal_utils.h" | 35 #include "native_client/tests/ppapi_test_lib/internal_utils.h" |
| 36 | 36 |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 149 } | 149 } |
| 150 | 150 |
| 151 const PPB_WheelInputEvent* PPBWheelInputEvent() { | 151 const PPB_WheelInputEvent* PPBWheelInputEvent() { |
| 152 return reinterpret_cast<const PPB_WheelInputEvent*>( | 152 return reinterpret_cast<const PPB_WheelInputEvent*>( |
| 153 GetBrowserInterfaceSafe(PPB_WHEEL_INPUT_EVENT_INTERFACE)); | 153 GetBrowserInterfaceSafe(PPB_WHEEL_INPUT_EVENT_INTERFACE)); |
| 154 } | 154 } |
| 155 | 155 |
| 156 | 156 |
| 157 // Dev interfaces. | 157 // Dev interfaces. |
| 158 | 158 |
| 159 const PPB_CursorControl_Dev* PPBCursorControlDev() { | 159 const PPB_MouseCursor_1_0* PPBMouseCursor() { |
| 160 return reinterpret_cast<const PPB_CursorControl_Dev*>( | 160 return reinterpret_cast<const PPB_MouseCursor_1_0*>( |
| 161 // Change to GetBrowserInterfaceSafe when moving out of dev. | 161 // Change to GetBrowserInterfaceSafe when moving out of dev. |
|
dmichael (off chromium)
2012/03/26 17:43:17
So it should use GetBrowserInterfaceSafe, and move
| |
| 162 GetBrowserInterface(PPB_CURSOR_CONTROL_DEV_INTERFACE)); | 162 GetBrowserInterface(PPB_MOUSE_CURSOR_INTERFACE_1_0)); |
| 163 } | 163 } |
| 164 | 164 |
| 165 const PPB_Font_Dev* PPBFontDev() { | 165 const PPB_Font_Dev* PPBFontDev() { |
| 166 return reinterpret_cast<const PPB_Font_Dev*>( | 166 return reinterpret_cast<const PPB_Font_Dev*>( |
| 167 // Change to GetBrowserInterfaceSafe when moving out of dev. | 167 // Change to GetBrowserInterfaceSafe when moving out of dev. |
| 168 GetBrowserInterface(PPB_FONT_DEV_INTERFACE)); | 168 GetBrowserInterface(PPB_FONT_DEV_INTERFACE)); |
| 169 } | 169 } |
| 170 | 170 |
| 171 const PPB_Memory_Dev* PPBMemoryDev() { | 171 const PPB_Memory_Dev* PPBMemoryDev() { |
| 172 return reinterpret_cast<const PPB_Memory_Dev*>( | 172 return reinterpret_cast<const PPB_Memory_Dev*>( |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 189 const PPB_View* PPBView() { | 189 const PPB_View* PPBView() { |
| 190 return reinterpret_cast<const PPB_View*>( | 190 return reinterpret_cast<const PPB_View*>( |
| 191 GetBrowserInterface(PPB_VIEW_INTERFACE)); | 191 GetBrowserInterface(PPB_VIEW_INTERFACE)); |
| 192 } | 192 } |
| 193 | 193 |
| 194 const PPB_Widget_Dev* PPBWidgetDev() { | 194 const PPB_Widget_Dev* PPBWidgetDev() { |
| 195 return reinterpret_cast<const PPB_Widget_Dev*>( | 195 return reinterpret_cast<const PPB_Widget_Dev*>( |
| 196 // Change to GetBrowserInterfaceSafe when moving out of dev. | 196 // Change to GetBrowserInterfaceSafe when moving out of dev. |
| 197 GetBrowserInterface(PPB_WIDGET_DEV_INTERFACE)); | 197 GetBrowserInterface(PPB_WIDGET_DEV_INTERFACE)); |
| 198 } | 198 } |
| OLD | NEW |