| Index: webkit/plugins/ppapi/ppb_opengles_impl.cc
|
| ===================================================================
|
| --- webkit/plugins/ppapi/ppb_opengles_impl.cc (revision 99860)
|
| +++ webkit/plugins/ppapi/ppb_opengles_impl.cc (working copy)
|
| @@ -9,7 +9,7 @@
|
| namespace webkit {
|
| namespace ppapi {
|
|
|
| -const PPB_OpenGLES2* PPB_OpenGLES_Impl::GetInterface() {
|
| +const PPB_OpenGLES2_Dev* PPB_OpenGLES_Impl::GetInterface() {
|
| return ::ppapi::OpenGLES2Impl::GetInterface();
|
| }
|
|
|
|
|
| Property changes on: webkit/plugins/ppapi/ppb_opengles_impl.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/ppb_opengles_impl.cc:r3734-4217,4606-5108,5177-5263
|
|
|
|
|