Changeset 126206 in webkit

Timestamp:

Aug 21, 2012 4:09:56 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

CodeGeneratorInspector.py: Generate guards for type validators
​https://bugs.webkit.org/show_bug.cgi?id=94511

Patch by Thiago Marcos P. Santos <​thiago.santos@intel.com> on 2012-08-21
Reviewed by Yury Semikhatsky.

Fix regression when building debug and one of the generated types is
disabled by a compile flag. We should generate guards for these type
validators the same way as we are doing on the include headers.

• inspector/CodeGeneratorInspector.py:

(TypeBindings.create_type_declaration_.EnumBinding.get_code_generator.CodeGenerator.generate_type_builder):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/CodeGeneratorInspector.py (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-21  Thiago Marcos P. Santos  <thiago.santos@intel.com>
+
+        CodeGeneratorInspector.py: Generate guards for type validators
+        https://bugs.webkit.org/show_bug.cgi?id=94511
+
+        Reviewed by Yury Semikhatsky.
+
+        Fix regression when building debug and one of the generated types is
+        disabled by a compile flag. We should generate guards for these type
+        validators the same way as we are doing on the include headers.
+
+        * inspector/CodeGeneratorInspector.py:
+        (TypeBindings.create_type_declaration_.EnumBinding.get_code_generator.CodeGenerator.generate_type_builder):
+
 2012-08-21  Florin Malita  <fmalita@chromium.org>
 

trunk/Source/WebCore/inspector/CodeGeneratorInspector.py

@@ -1 +1 @@
 #!/usr/bin/env python
 # Copyright (c) 2011 Google Inc. All rights reserved.
+# Copyright (c) 2012 Intel Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -910 +911 @@
 
                                     validator_writer = generate_context.validator_writer
+
+                                    domain_fixes = DomainNameFixes.get_fixed_data(context_domain_name)
+                                    domain_guard = domain_fixes.get_guard()
+                                    if domain_guard:
+                                        domain_guard.generate_open(validator_writer)
+
                                     validator_writer.newline("void %s%s::assertCorrectValue(InspectorValue* value)\n" % (helper.full_name_prefix_for_impl, enum_name))
                                     validator_writer.newline("{\n")
@@ -921 +928 @@
                                             condition_list.append("s == \"%s\"" % enum_item)
                                         validator_writer.newline("    ASSERT(%s);\n" % join(condition_list, " || "))
-                                    validator_writer.newline("}\n\n\n")
-
+                                    validator_writer.newline("}\n")
+
+                                    if domain_guard:
+                                        domain_guard.generate_close(validator_writer)
+
+                                    validator_writer.newline("\n\n")
 
                                 writer.newline("}; // struct ")
@@ -1289 +1300 @@
 
                                     validator_writer = generate_context.validator_writer
+
+                                    domain_fixes = DomainNameFixes.get_fixed_data(context_domain_name)
+                                    domain_guard = domain_fixes.get_guard()
+                                    if domain_guard:
+                                        domain_guard.generate_open(validator_writer)
+
                                     validator_writer.newline("void %s%s::assertCorrectValue(InspectorValue* value)\n" % (helper.full_name_prefix_for_impl, class_name))
                                     validator_writer.newline("{\n")
@@ -1320 +1337 @@
                                     if closed_field_set:
                                         validator_writer.newline("    ASSERT(foundPropertiesCount == object->size());\n")
-                                    validator_writer.newline("}\n\n\n")
+                                    validator_writer.newline("}\n")
+
+                                    if domain_guard:
+                                        domain_guard.generate_close(validator_writer)
+
+                                    validator_writer.newline("\n\n")
 
                                 if is_open_type: