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

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

Issue 7782020: Revert 99855 - Move PPAPI graphics3d and opengles interfaces out of Dev. (Closed) Base URL: svn://svn.chromium.org/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
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011 The Chromium Authors. All rights reserved. 2 * Copyright (c) 2011 The Chromium Authors. All rights reserved.
3 * Use of this source code is governed by a BSD-style license that can be 3 * Use of this source code is governed by a BSD-style license that can be
4 * found in the LICENSE file. 4 * found in the LICENSE file.
5 */ 5 */
6 6
7 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.h" 7 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.h"
8 8
9 #include "gpu/command_buffer/client/gles2_implementation.h" 9 #include "gpu/command_buffer/client/gles2_implementation.h"
10 #include "native_client/src/shared/ppapi_proxy/command_buffer_nacl.h" 10 #include "native_client/src/shared/ppapi_proxy/command_buffer_nacl.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 252
253 if ((PP_OK_COMPLETIONPENDING != pp_error) && (PP_OK != pp_error)) 253 if ((PP_OK_COMPLETIONPENDING != pp_error) && (PP_OK != pp_error))
254 return pp_error; 254 return pp_error;
255 255
256 impl()->SwapBuffers(); 256 impl()->SwapBuffers();
257 return PP_OK_COMPLETIONPENDING; 257 return PP_OK_COMPLETIONPENDING;
258 } 258 }
259 259
260 260
261 // static 261 // static
262 const PPB_Graphics3D* PluginGraphics3D::GetInterface() { 262 const PPB_Graphics3D_Dev* PluginGraphics3D::GetInterface() {
263 static const PPB_Graphics3D intf = { 263 static const PPB_Graphics3D_Dev intf = {
264 &GetAttribMaxValue, 264 &GetAttribMaxValue,
265 &Create, 265 &Create,
266 &IsGraphics3D, 266 &IsGraphics3D,
267 &GetAttribs, 267 &GetAttribs,
268 &SetAttribs, 268 &SetAttribs,
269 &GetError, 269 &GetError,
270 &ResizeBuffers, 270 &ResizeBuffers,
271 &SwapBuffs, 271 &SwapBuffs,
272 }; 272 };
273 return &intf; 273 return &intf;
274 } 274 }
275 275
276 } // namespace ppapi_proxy 276 } // namespace ppapi_proxy
277 277
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698