summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorteravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-03 19:07:46 +0000
committerteravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-03 19:07:46 +0000
commitcfc881d2408de7b19aab96130e9ad757d5f40a7c (patch)
treec66631688ebdfb7443589348ea00c332cb7aeeb6
parent80eac81f0f122675305832e6d839a94f75663e68 (diff)
downloadchromium_src-cfc881d2408de7b19aab96130e9ad757d5f40a7c.zip
chromium_src-cfc881d2408de7b19aab96130e9ad757d5f40a7c.tar.gz
chromium_src-cfc881d2408de7b19aab96130e9ad757d5f40a7c.tar.bz2
IDL: Remove trailing commans in generated thunk files.
BUG= Review URL: https://chromiumcodereview.appspot.com/11679012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174988 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xppapi/generators/idl_thunk.py8
-rw-r--r--ppapi/thunk/ppb_audio_thunk.cc4
-rw-r--r--ppapi/thunk/ppb_console_thunk.cc2
-rw-r--r--ppapi/thunk/ppb_device_ref_thunk.cc4
-rw-r--r--ppapi/thunk/ppb_file_io_thunk.cc6
-rw-r--r--ppapi/thunk/ppb_file_system_thunk.cc4
-rw-r--r--ppapi/thunk/ppb_find_thunk.cc4
-rw-r--r--ppapi/thunk/ppb_flash_device_id_thunk.cc4
-rw-r--r--ppapi/thunk/ppb_instance_private_thunk.cc4
-rw-r--r--ppapi/thunk/ppb_instance_thunk.cc4
-rw-r--r--ppapi/thunk/ppb_resource_array_thunk.cc4
-rw-r--r--ppapi/thunk/ppb_websocket_thunk.cc4
-rw-r--r--ppapi/thunk/ppb_widget_thunk.cc6
13 files changed, 30 insertions, 28 deletions
diff --git a/ppapi/generators/idl_thunk.py b/ppapi/generators/idl_thunk.py
index 250054e..71b8624 100755
--- a/ppapi/generators/idl_thunk.py
+++ b/ppapi/generators/idl_thunk.py
@@ -389,12 +389,14 @@ class TGen(GeneratorByFile):
version_list.append((thunk_type, thunk_name))
out.Write('const %s %s = {\n' % (thunk_type, thunk_name))
+ generated_functions = []
for child in node.GetListOf('Member'):
rtype, name, arrays, args = cgen.GetComponents(
child, build, 'return')
- if child.InReleases([build]): # TEST
- out.Write(' &%s,\n' % name)
- out.Write('};\n\n')
+ if child.InReleases([build]):
+ generated_functions.append(name)
+ out.Write(',\n'.join([' &%s' % f for f in generated_functions]))
+ out.Write('\n};\n\n')
out.Write('} // namespace\n')
out.Write('\n')
diff --git a/ppapi/thunk/ppb_audio_thunk.cc b/ppapi/thunk/ppb_audio_thunk.cc
index d591cb8..1bd1692 100644
--- a/ppapi/thunk/ppb_audio_thunk.cc
+++ b/ppapi/thunk/ppb_audio_thunk.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// From ppb_audio.idl modified Tue Dec 4 10:41:02 2012.
+// From ppb_audio.idl modified Thu Dec 20 13:10:26 2012.
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/ppb_audio.h"
@@ -62,7 +62,7 @@ const PPB_Audio_1_0 g_ppb_audio_thunk_1_0 = {
&IsAudio,
&GetCurrentConfig,
&StartPlayback,
- &StopPlayback,
+ &StopPlayback
};
} // namespace
diff --git a/ppapi/thunk/ppb_console_thunk.cc b/ppapi/thunk/ppb_console_thunk.cc
index 7b28c3c..2dd5481 100644
--- a/ppapi/thunk/ppb_console_thunk.cc
+++ b/ppapi/thunk/ppb_console_thunk.cc
@@ -34,7 +34,7 @@ void LogWithSource(PP_Instance instance,
const PPB_Console_1_0 g_ppb_console_thunk_1_0 = {
&Log,
- &LogWithSource,
+ &LogWithSource
};
} // namespace
diff --git a/ppapi/thunk/ppb_device_ref_thunk.cc b/ppapi/thunk/ppb_device_ref_thunk.cc
index 051e5af..ca26125 100644
--- a/ppapi/thunk/ppb_device_ref_thunk.cc
+++ b/ppapi/thunk/ppb_device_ref_thunk.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// From dev/ppb_device_ref_dev.idl modified Tue Nov 20 13:28:29 2012.
+// From dev/ppb_device_ref_dev.idl modified Thu Dec 20 13:10:26 2012.
#include "ppapi/c/dev/ppb_device_ref_dev.h"
#include "ppapi/c/pp_errors.h"
@@ -40,7 +40,7 @@ struct PP_Var GetName(PP_Resource device_ref) {
const PPB_DeviceRef_Dev_0_1 g_ppb_deviceref_dev_thunk_0_1 = {
&IsDeviceRef,
&GetType,
- &GetName,
+ &GetName
};
} // namespace
diff --git a/ppapi/thunk/ppb_file_io_thunk.cc b/ppapi/thunk/ppb_file_io_thunk.cc
index 798f0a9..52bc524 100644
--- a/ppapi/thunk/ppb_file_io_thunk.cc
+++ b/ppapi/thunk/ppb_file_io_thunk.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// From ppb_file_io.idl modified Fri Dec 7 08:38:35 2012.
+// From ppb_file_io.idl modified Thu Dec 20 13:10:26 2012.
#include "ppapi/c/pp_completion_callback.h"
#include "ppapi/c/pp_errors.h"
@@ -138,7 +138,7 @@ const PPB_FileIO_1_0 g_ppb_fileio_thunk_1_0 = {
&Write,
&SetLength,
&Flush,
- &Close,
+ &Close
};
const PPB_FileIO_1_1 g_ppb_fileio_thunk_1_1 = {
@@ -152,7 +152,7 @@ const PPB_FileIO_1_1 g_ppb_fileio_thunk_1_1 = {
&SetLength,
&Flush,
&Close,
- &ReadToArray,
+ &ReadToArray
};
} // namespace
diff --git a/ppapi/thunk/ppb_file_system_thunk.cc b/ppapi/thunk/ppb_file_system_thunk.cc
index 6bbcbe7..df02ec6 100644
--- a/ppapi/thunk/ppb_file_system_thunk.cc
+++ b/ppapi/thunk/ppb_file_system_thunk.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// From ppb_file_system.idl modified Fri Dec 7 08:39:45 2012.
+// From ppb_file_system.idl modified Thu Dec 20 13:10:26 2012.
#include "ppapi/c/pp_completion_callback.h"
#include "ppapi/c/pp_errors.h"
@@ -51,7 +51,7 @@ const PPB_FileSystem_1_0 g_ppb_filesystem_thunk_1_0 = {
&Create,
&IsFileSystem,
&Open,
- &GetType,
+ &GetType
};
} // namespace
diff --git a/ppapi/thunk/ppb_find_thunk.cc b/ppapi/thunk/ppb_find_thunk.cc
index 4308122..33301ee 100644
--- a/ppapi/thunk/ppb_find_thunk.cc
+++ b/ppapi/thunk/ppb_find_thunk.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// From dev/ppb_find_dev.idl modified Mon Nov 26 10:29:49 2012.
+// From dev/ppb_find_dev.idl modified Thu Dec 20 13:10:26 2012.
#include "ppapi/c/dev/ppb_find_dev.h"
#include "ppapi/c/pp_errors.h"
@@ -35,7 +35,7 @@ void SelectedFindResultChanged(PP_Instance instance, int32_t index) {
const PPB_Find_Dev_0_3 g_ppb_find_dev_thunk_0_3 = {
&NumberOfFindResultsChanged,
- &SelectedFindResultChanged,
+ &SelectedFindResultChanged
};
} // namespace
diff --git a/ppapi/thunk/ppb_flash_device_id_thunk.cc b/ppapi/thunk/ppb_flash_device_id_thunk.cc
index 7c85fcd..09a3749 100644
--- a/ppapi/thunk/ppb_flash_device_id_thunk.cc
+++ b/ppapi/thunk/ppb_flash_device_id_thunk.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// From private/ppb_flash_device_id.idl modified Tue Dec 11 13:47:18 2012.
+// From private/ppb_flash_device_id.idl modified Thu Dec 20 13:10:26 2012.
#include "ppapi/c/pp_completion_callback.h"
#include "ppapi/c/pp_errors.h"
@@ -37,7 +37,7 @@ int32_t GetDeviceID(PP_Resource device_id,
const PPB_Flash_DeviceID_1_0 g_ppb_flash_deviceid_thunk_1_0 = {
&Create,
- &GetDeviceID,
+ &GetDeviceID
};
} // namespace
diff --git a/ppapi/thunk/ppb_instance_private_thunk.cc b/ppapi/thunk/ppb_instance_private_thunk.cc
index 18b8675..6205cd1 100644
--- a/ppapi/thunk/ppb_instance_private_thunk.cc
+++ b/ppapi/thunk/ppb_instance_private_thunk.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// From private/ppb_instance_private.idl modified Fri Dec 21 11:01:12 2012.
+// From private/ppb_instance_private.idl modified Thu Dec 27 10:36:33 2012.
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/private/ppb_instance_private.h"
@@ -43,7 +43,7 @@ struct PP_Var ExecuteScript(PP_Instance instance,
const PPB_Instance_Private_0_1 g_ppb_instance_private_thunk_0_1 = {
&GetWindowObject,
&GetOwnerElementObject,
- &ExecuteScript,
+ &ExecuteScript
};
} // namespace
diff --git a/ppapi/thunk/ppb_instance_thunk.cc b/ppapi/thunk/ppb_instance_thunk.cc
index 9576566..cf4b782 100644
--- a/ppapi/thunk/ppb_instance_thunk.cc
+++ b/ppapi/thunk/ppb_instance_thunk.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// From ppb_instance.idl modified Fri Dec 21 11:00:20 2012.
+// From ppb_instance.idl modified Thu Dec 27 10:36:33 2012.
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/ppb_instance.h"
@@ -33,7 +33,7 @@ PP_Bool IsFullFrame(PP_Instance instance) {
const PPB_Instance_1_0 g_ppb_instance_thunk_1_0 = {
&BindGraphics,
- &IsFullFrame,
+ &IsFullFrame
};
} // namespace
diff --git a/ppapi/thunk/ppb_resource_array_thunk.cc b/ppapi/thunk/ppb_resource_array_thunk.cc
index aec67b0..97226c5 100644
--- a/ppapi/thunk/ppb_resource_array_thunk.cc
+++ b/ppapi/thunk/ppb_resource_array_thunk.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// From dev/ppb_resource_array_dev.idl modified Mon Nov 26 10:53:45 2012.
+// From dev/ppb_resource_array_dev.idl modified Thu Dec 20 13:10:26 2012.
#include "ppapi/c/dev/ppb_resource_array_dev.h"
#include "ppapi/c/pp_errors.h"
@@ -50,7 +50,7 @@ const PPB_ResourceArray_Dev_0_1 g_ppb_resourcearray_dev_thunk_0_1 = {
&Create,
&IsResourceArray,
&GetSize,
- &GetAt,
+ &GetAt
};
} // namespace
diff --git a/ppapi/thunk/ppb_websocket_thunk.cc b/ppapi/thunk/ppb_websocket_thunk.cc
index ac1fa83..527e143 100644
--- a/ppapi/thunk/ppb_websocket_thunk.cc
+++ b/ppapi/thunk/ppb_websocket_thunk.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// From ppb_websocket.idl modified Fri Dec 21 10:55:08 2012.
+// From ppb_websocket.idl modified Thu Dec 27 10:36:33 2012.
#include "ppapi/c/pp_completion_callback.h"
#include "ppapi/c/pp_errors.h"
@@ -142,7 +142,7 @@ const PPB_WebSocket_1_0 g_ppb_websocket_thunk_1_0 = {
&GetExtensions,
&GetProtocol,
&GetReadyState,
- &GetURL,
+ &GetURL
};
} // namespace
diff --git a/ppapi/thunk/ppb_widget_thunk.cc b/ppapi/thunk/ppb_widget_thunk.cc
index c7e243e..fcb5fe3 100644
--- a/ppapi/thunk/ppb_widget_thunk.cc
+++ b/ppapi/thunk/ppb_widget_thunk.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// From dev/ppb_widget_dev.idl modified Fri Nov 16 11:26:06 2012.
+// From dev/ppb_widget_dev.idl modified Thu Dec 20 13:10:26 2012.
#include "ppapi/c/dev/ppb_widget_dev.h"
#include "ppapi/c/pp_errors.h"
@@ -63,7 +63,7 @@ const PPB_Widget_Dev_0_3 g_ppb_widget_dev_thunk_0_3 = {
&Paint,
&HandleEvent,
&GetLocation,
- &SetLocation,
+ &SetLocation
};
const PPB_Widget_Dev_0_4 g_ppb_widget_dev_thunk_0_4 = {
@@ -72,7 +72,7 @@ const PPB_Widget_Dev_0_4 g_ppb_widget_dev_thunk_0_4 = {
&HandleEvent,
&GetLocation,
&SetLocation,
- &SetScale,
+ &SetScale
};
} // namespace