Pepper: Unify Buffer and BufferTrusted APIs.

ppapi/generators/idl_thunk.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """ Generator for C++ style thunks """
 
 import glob
 import os
 import re
@@ skipping 74 matching lines @@
 
 def _MakeEnterLine(filenode, interface, arg, handle_errors, callback, meta):
   """Returns an EnterInstance/EnterResource string for a function."""
   if arg[0] == 'PP_Instance':
     if callback is None:
       return 'EnterInstance enter(%s);' % arg[1]
     else:
       return 'EnterInstance enter(%s, %s);' % (arg[1], callback)
   elif arg[0] == 'PP_Resource':
     api_name = interface.GetName()
+    if api_name.endswith('Trusted'):
+      api_name = api_name[:-len('Trusted')]
     if api_name.endswith('_Dev'):
       api_name = api_name[:-len('_Dev')]
     api_name += '_API'
 
     enter_type = 'EnterResource<%s>' % api_name
     # The API header matches the file name, not the interface name.
     api_basename = _GetBaseFileName(filenode)
     if api_basename.endswith('_dev'):
       # Clip off _dev suffix.
       api_basename = api_basename[:-len('_dev')]
+    if api_basename.endswith('_trusted'):
+      # Clip off _dev suffix.

[dmichael (off chromium), 2013/03/20 16:50:37]

s/_dev/_trusted

[teravest, 2013/03/20 17:03:27]

Done.

+      api_basename = api_basename[:-len('_trusted')]
     meta.AddApi(api_basename + '_api')
 
     if callback is None:
       return '%s enter(%s, %s);' % (enter_type, arg[1],
                                     str(handle_errors).lower())
     else:
       return '%s enter(%s, %s, %s);' % (enter_type, arg[1],
                                         callback,
                                         str(handle_errors).lower())
   else:
@@ skipping 363 matching lines @@
     print "Golden file for M13-M14 failed."
     failed = 1
   else:
     print "Golden file for M13-M14 passed."
 
   return failed
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))