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

Side by Side Diff: ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb.cc

Issue 8295023: Move PPB/PPP_MouseLock out of dev/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and resolve conflicts. Created 9 years, 2 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 // Implements the untrusted side of the PPB_GetInterface method. 5 // Implements the untrusted side of the PPB_GetInterface method.
6 6
7 #include "native_client/src/shared/ppapi_proxy/plugin_globals.h" 7 #include "native_client/src/shared/ppapi_proxy/plugin_globals.h"
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <string.h> 9 #include <string.h>
10 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_audio.h" 10 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_audio.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 { PPB_INPUT_EVENT_INTERFACE, PluginInputEvent::GetInterface(), true }, 67 { PPB_INPUT_EVENT_INTERFACE, PluginInputEvent::GetInterface(), true },
68 { PPB_INSTANCE_INTERFACE, PluginInstance::GetInterface(), true }, 68 { PPB_INSTANCE_INTERFACE, PluginInstance::GetInterface(), true },
69 { PPB_KEYBOARD_INPUT_EVENT_INTERFACE, 69 { PPB_KEYBOARD_INPUT_EVENT_INTERFACE,
70 PluginInputEvent::GetKeyboardInterface(), true }, 70 PluginInputEvent::GetKeyboardInterface(), true },
71 { PPB_MEMORY_DEV_INTERFACE, PluginMemory::GetInterface(), true }, 71 { PPB_MEMORY_DEV_INTERFACE, PluginMemory::GetInterface(), true },
72 { PPB_MESSAGING_INTERFACE, PluginMessaging::GetInterface(), true }, 72 { PPB_MESSAGING_INTERFACE, PluginMessaging::GetInterface(), true },
73 { PPB_MOUSE_INPUT_EVENT_INTERFACE_1_0, 73 { PPB_MOUSE_INPUT_EVENT_INTERFACE_1_0,
74 PluginInputEvent::GetMouseInterface1_0(), true }, 74 PluginInputEvent::GetMouseInterface1_0(), true },
75 { PPB_MOUSE_INPUT_EVENT_INTERFACE_1_1, 75 { PPB_MOUSE_INPUT_EVENT_INTERFACE_1_1,
76 PluginInputEvent::GetMouseInterface1_1(), true }, 76 PluginInputEvent::GetMouseInterface1_1(), true },
77 { PPB_MOUSELOCK_DEV_INTERFACE, PluginMouseLock::GetInterface(), true }, 77 { PPB_MOUSELOCK_INTERFACE, PluginMouseLock::GetInterface(), true },
78 { PPB_OPENGLES2_INTERFACE, PluginGraphics3D::GetOpenGLESInterface(), 78 { PPB_OPENGLES2_INTERFACE, PluginGraphics3D::GetOpenGLESInterface(),
79 true }, 79 true },
80 { PPB_PDF_INTERFACE, PluginPDF::GetInterface(), true }, 80 { PPB_PDF_INTERFACE, PluginPDF::GetInterface(), true },
81 { PPB_SCROLLBAR_DEV_INTERFACE, PluginScrollbar::GetInterface(), true }, 81 { PPB_SCROLLBAR_DEV_INTERFACE, PluginScrollbar::GetInterface(), true },
82 { PPB_TESTING_DEV_INTERFACE, PluginTesting::GetInterface(), true }, 82 { PPB_TESTING_DEV_INTERFACE, PluginTesting::GetInterface(), true },
83 { PPB_URLLOADER_INTERFACE, PluginURLLoader::GetInterface(), true }, 83 { PPB_URLLOADER_INTERFACE, PluginURLLoader::GetInterface(), true },
84 { PPB_URLREQUESTINFO_INTERFACE, PluginURLRequestInfo::GetInterface(), true }, 84 { PPB_URLREQUESTINFO_INTERFACE, PluginURLRequestInfo::GetInterface(), true },
85 { PPB_URLRESPONSEINFO_INTERFACE, PluginURLResponseInfo::GetInterface(), 85 { PPB_URLRESPONSEINFO_INTERFACE, PluginURLResponseInfo::GetInterface(),
86 true }, 86 true },
87 { PPB_VAR_INTERFACE, PluginVar::GetInterface(), true }, 87 { PPB_VAR_INTERFACE, PluginVar::GetInterface(), true },
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 interface_name, NaClSrpcErrorString(srpc_result)); 126 interface_name, NaClSrpcErrorString(srpc_result));
127 if (srpc_result != NACL_SRPC_RESULT_OK || !browser_exports_interface) { 127 if (srpc_result != NACL_SRPC_RESULT_OK || !browser_exports_interface) {
128 interface_map[index].ppb_interface = NULL; 128 interface_map[index].ppb_interface = NULL;
129 ppb_interface = NULL; 129 ppb_interface = NULL;
130 } 130 }
131 interface_map[index].needs_browser_check = false; 131 interface_map[index].needs_browser_check = false;
132 return ppb_interface; 132 return ppb_interface;
133 } 133 }
134 134
135 } // namespace ppapi_proxy 135 } // namespace ppapi_proxy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698