Pepper: Don't emit structs with no wrapping.

ppapi/generators/idl_gen_wrapper.py

 # 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.
 
 """Base class for generating wrapper functions for PPAPI methods.
 """
 
 from datetime import datetime
 import os
 import sys
@@ skipping 139 matching lines @@
   while (*next != NULL) {
     if (mystrcmp(name, (*next)->iface_macro) == 0) return *next;
     ++next;
   }
   return NULL;
 }
 
 const void *__%(wrapper_prefix)s_PPBGetInterface(const char *name) {
   struct %(wrapper_struct)s *wrapper = %(wrapper_prefix)sPPBShimIface(name);
   if (wrapper == NULL) {
     /* We don't have an IDL for this, for some reason. Take our chances. */

[jvoung (off chromium), 2013/06/20 19:46:57]

Can you update the emitted comment?

This is now not about taking chances, but is necessary.
Something like "We did not generate a wrapper for this, so return the real
interface."

     return (*__real_PPBGetInterface)(name);
   }
 
   /* Initialize the real_iface if it hasn't been. The wrapper depends on it. */
   if (wrapper->real_iface == NULL) {
     const void *iface = (*__real_PPBGetInterface)(name);
     if (NULL == iface) return NULL;
     wrapper->real_iface = iface;
   }
 
   if (wrapper->wrapped_iface) {
     return wrapper->wrapped_iface;
   } else {
     return wrapper->real_iface;
   }
 }
 
 const void *__%(wrapper_prefix)s_PPPGetInterface(const char *name) {
   struct %(wrapper_struct)s *wrapper = %(wrapper_prefix)sPPPShimIface(name);
   if (wrapper == NULL) {
     /* We don't have an IDL for this, for some reason. Take our chances. */

[jvoung (off chromium), 2013/06/20 19:46:57]

same update for comment.

     return (*__real_PPPGetInterface)(name);
   }
 
   /* Initialize the real_iface if it hasn't been. The wrapper depends on it. */
   if (wrapper->real_iface == NULL) {
     const void *iface = (*__real_PPPGetInterface)(name);
     if (NULL == iface) return NULL;
     wrapper->real_iface = iface;
   }
 
@@ skipping 165 matching lines @@
   def GetWrapperInfoName(self, iface):
     return '%s_WrapperInfo_%s' % (self.wrapper_prefix, iface.struct_name)
 
 
   def GenerateWrapperInfoAndCollection(self, iface_releases, out):
     for iface in iface_releases:
       iface_macro = self.cgen.GetInterfaceMacro(iface.node, iface.version)
       if iface.needs_wrapping:
         wrap_iface = '(void *) &%s_Wrappers_%s' % (self.wrapper_prefix,
                                                    iface.struct_name)
-      else:
-        wrap_iface = 'NULL /* Still need slot for real_iface */'
-      out.Write("""static struct %s %s = {
+        out.Write("""static struct %s %s = {
   .iface_macro = %s,
   .wrapped_iface = %s,
   .real_iface = NULL
 };\n\n""" % (self.GetWrapperMetadataName(),
              self.GetWrapperInfoName(iface),
              iface_macro,
              wrap_iface))
 
     # Now generate NULL terminated arrays of the above wrapper infos.
     ppb_wrapper_infos = []
     ppp_wrapper_infos = []
     for iface in iface_releases:
-      appender = PPKind.ChoosePPFunc(iface,
-                                     ppb_wrapper_infos.append,
-                                     ppp_wrapper_infos.append)
-      appender('  &%s' % self.GetWrapperInfoName(iface))
+      if iface.needs_wrapping:
+        appender = PPKind.ChoosePPFunc(iface,
+                                       ppb_wrapper_infos.append,
+                                       ppp_wrapper_infos.append)
+        appender('  &%s' % self.GetWrapperInfoName(iface))
     ppb_wrapper_infos.append('  NULL')
     ppp_wrapper_infos.append('  NULL')
     out.Write(
         'static struct %s *s_ppb_wrappers[] = {\n%s\n};\n\n' %
         (self.GetWrapperMetadataName(), ',\n'.join(ppb_wrapper_infos)))
     out.Write(
         'static struct %s *s_ppp_wrappers[] = {\n%s\n};\n\n' %
         (self.GetWrapperMetadataName(), ',\n'.join(ppp_wrapper_infos)))
 
 
   def DeclareWrapperInfos(self, iface_releases, out):
     """The wrapper methods usually need access to the real_iface, so we must
     declare these wrapper infos ahead of time (there is a circular dependency).
     """
     out.Write('/* BEGIN Declarations for all Wrapper Infos */\n\n')
     for iface in iface_releases:
-      out.Write('static struct %s %s;\n' %
-                (self.GetWrapperMetadataName(), self.GetWrapperInfoName(iface)))
+      if iface.needs_wrapping:
+        out.Write('static struct %s %s;\n' %
+                  (self.GetWrapperMetadataName(),
+                   self.GetWrapperInfoName(iface)))
     out.Write('/* END Declarations for all Wrapper Infos. */\n\n')
 
 
   def GenerateRange(self, ast, releases, options):
     """Generate shim code for a range of releases.
     """
 
     # Remember to set the output filename before running this.
     out_filename = self.output_file
     if out_filename is None:
@@ skipping 25 matching lines @@
     self.GenerateWrapperInterfaces(iface_releases, out)
 
     # Generate a table of the wrapped interface structs that can be looked up.
     self.GenerateWrapperInfoAndCollection(iface_releases, out)
 
     # Write out the IDL-invariant functions.
     self.GenerateFixedFunctions(out)
 
     out.Close()
     return 0