Changeset 169889 in webkit

Timestamp:

Jun 12, 2014, 3:10:51 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Allow enum guards to be generated from the replay json files
​https://bugs.webkit.org/show_bug.cgi?id=133399

Patch by Zsolt Borbely <​zsborbely.u-szeged@partner.samsung.com> on 2014-06-12
Reviewed by Csaba Osztrogonác.

• replay/scripts/CodeGeneratorReplayInputs.py:

(Type.init):
(InputsModel.parse_type_with_framework_name):
(Generator.generate_header):
(Generator.generate_implementation):

• replay/scripts/tests/expected/generate-enum-with-guard.json-TestReplayInputs.cpp: Added.

(Test::HandleWheelEvent::HandleWheelEvent):
(Test::HandleWheelEvent::~HandleWheelEvent):
(JSC::InputTraits<Test::HandleWheelEvent>::type):
(JSC::InputTraits<Test::HandleWheelEvent>::encode):
(JSC::InputTraits<Test::HandleWheelEvent>::decode):
(JSC::EncodingTraits<WebCore::PlatformWheelEventPhase>::encodeValue):
(JSC::EncodingTraits<WebCore::PlatformWheelEventPhase>::decodeValue):

• replay/scripts/tests/expected/generate-enum-with-guard.json-TestReplayInputs.h: Added.

(JSC::InputTraits<Test::HandleWheelEvent>::queue):
(Test::HandleWheelEvent::platformEvent):

• replay/scripts/tests/generate-enum-with-guard.json: Added.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• replay/scripts/CodeGeneratorReplayInputs.py (modified) (5 diffs)
• replay/scripts/tests/expected/generate-enum-with-guard.json-TestReplayInputs.cpp (added)
• replay/scripts/tests/expected/generate-enum-with-guard.json-TestReplayInputs.h (added)
• replay/scripts/tests/generate-enum-with-guard.json (added)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-06-12  Zsolt Borbely  <zsborbely.u-szeged@partner.samsung.com>
+
+        Allow enum guards to be generated from the replay json files
+        https://bugs.webkit.org/show_bug.cgi?id=133399
+
+        Reviewed by Csaba Osztrogonác.
+
+        * replay/scripts/CodeGeneratorReplayInputs.py:
+        (Type.__init__):
+        (InputsModel.parse_type_with_framework_name):
+        (Generator.generate_header):
+        (Generator.generate_implementation):
+        * replay/scripts/tests/expected/generate-enum-with-guard.json-TestReplayInputs.cpp: Added.
+        (Test::HandleWheelEvent::HandleWheelEvent):
+        (Test::HandleWheelEvent::~HandleWheelEvent):
+        (JSC::InputTraits<Test::HandleWheelEvent>::type):
+        (JSC::InputTraits<Test::HandleWheelEvent>::encode):
+        (JSC::InputTraits<Test::HandleWheelEvent>::decode):
+        (JSC::EncodingTraits<WebCore::PlatformWheelEventPhase>::encodeValue):
+        (JSC::EncodingTraits<WebCore::PlatformWheelEventPhase>::decodeValue):
+        * replay/scripts/tests/expected/generate-enum-with-guard.json-TestReplayInputs.h: Added.
+        (JSC::InputTraits<Test::HandleWheelEvent>::queue):
+        (Test::HandleWheelEvent::platformEvent):
+        * replay/scripts/tests/generate-enum-with-guard.json: Added.
+
 2014-06-12  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputs.py

@@ -282 +282 @@
 
 class Type:
-    def __init__(self, name, mode, framework, header, enclosing_class, values, guard_values_map, underlying_storage, flags):
+    def __init__(self, name, mode, framework, header, enclosing_class, values, guard_values_map, underlying_storage, flags, guard=None):
         self._name = name
         self.mode = mode
@@ -292 +292 @@
         self.underlying_storage = underlying_storage
         self._flags = flags
+        self.guard = guard
 
     def __eq__(self, other):
@@ -450 +451 @@
         type_storage = json.get('storage')
         type_flags = json.get('flags', [])
-        _type = Type(type_name, type_mode, framework, header, enclosing_class, enum_values, guarded_enum_values, type_storage, type_flags)
+        guard = json.get('guard', None)
+        _type = Type(type_name, type_mode, framework, header, enclosing_class, enum_values, guarded_enum_values, type_storage, type_flags, guard)
         if _type.is_enum() or _type.is_enum_class():
             check_for_required_properties(['values'], json, 'enum')
@@ -598 +600 @@
             'inputClassDeclarations': "\n\n".join([self.generate_class_declaration(_input) for _input in self._model.inputs]),
             'inputTraitDeclarations': "\n\n".join([self.generate_input_trait_declaration(_input) for _input in self._model.inputs]),
-            'enumTraitDeclarations': "\n\n".join([self.generate_enum_trait_declaration(_type) for _type in self._model.enum_types()]),
+            'enumTraitDeclarations': "\n\n".join([wrap_with_guard(self.generate_enum_trait_declaration(_type), _type.guard) for _type in self._model.enum_types()]),
             'forEachMacro': self.generate_for_each_macro(),
         }
@@ -614 +616 @@
             'inputClassImplementations': "\n\n".join([self.generate_class_implementation(_input) for _input in self._model.inputs]),
             'inputTraitImplementations': "\n\n".join([self.generate_input_trait_implementation(_input) for _input in self._model.inputs]),
-            'enumTraitImplementations': "\n\n".join([self.generate_enum_trait_implementation(_type) for _type in self._model.enum_types()]),
+            'enumTraitImplementations': "\n\n".join([wrap_with_guard(self.generate_enum_trait_implementation(_type), _type.guard) for _type in self._model.enum_types()]),
         }