Index: Source/bindings/scripts/v8_utilities.py |
diff --git a/Source/bindings/scripts/v8_utilities.py b/Source/bindings/scripts/v8_utilities.py |
index 67b03209fbab876c98118ed9ae23974e75fc88f5..35ecc7d4032d77accd0cfc19cd6d548e8cb8cdec 100644 |
--- a/Source/bindings/scripts/v8_utilities.py |
+++ b/Source/bindings/scripts/v8_utilities.py |
@@ -133,20 +133,18 @@ def activity_logging_world_list(member, access_type=None): |
access_type can be 'Getter' or 'Setter' if only checking getting or setting. |
""" |
- if 'ActivityLogging' not in member.extended_attributes: |
+ if 'LogActivity' not in member.extended_attributes: |
Nils Barth (inactive)
2014/04/23 03:04:42
BTW, could you add
extended_attributes = member.ex
Devlin
2014/04/23 18:28:02
Done (in other cl).
|
return set() |
- activity_logging = member.extended_attributes['ActivityLogging'] |
- # [ActivityLogging=For*] (no prefix, starts with the worlds suffix) means |
- # "log for all use (method)/access (attribute)", otherwise check that value |
- # agrees with specified access_type (Getter/Setter). |
- has_logging = (activity_logging.startswith('For') or |
- (access_type and activity_logging.startswith(access_type))) |
- if not has_logging: |
+ log_activity = member.extended_attributes['LogActivity'] |
+ if (log_activity == 'GetterOnly' and access_type != 'Getter') or (log_activity == 'SetterOnly' and access_type != 'Setter'): |
Nils Barth (inactive)
2014/04/23 03:04:42
This could be:
if log_activity and not log_activit
Devlin
2014/04/23 18:28:02
Done (in other cl). My inclination is to keep Get
Nils Barth (inactive)
2014/04/24 01:00:41
That's fine, and agreed that explicit is better he
|
return set() |
+ |
includes.add('bindings/v8/V8DOMActivityLogger.h') |
- if activity_logging.endswith('ForIsolatedWorlds'): |
- return set(['']) |
- return set(['', 'ForMainWorld']) # endswith('ForAllWorlds') |
+ # At minimum, include isolated worlds. |
+ world_list = [''] |
+ if 'LogAllWorlds' in member.extended_attributes: |
+ world_list.append('ForMainWorld') |
+ return world_list |
Nils Barth (inactive)
2014/04/23 03:04:42
return set(world_list)
I'd tend to prefer avoiding
Devlin
2014/04/23 18:28:02
Done (in other cl).
|
# [CallWith] |