Merge pull request #61 from Hixie/vestiges

Remove the vestiges of ActiveDOMObject and EventTargetNames, which I missed in my recent patch
flutter · Jul 16, 2015 · 824c7c7 · 824c7c7
2 parents 07a9241 + 2fbea23
commit 824c7c7
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 11 deletions.
diff --git a/sky/engine/bindings/IDLExtendedAttributes.txt b/sky/engine/bindings/IDLExtendedAttributes.txt
@@ -33,7 +33,6 @@
 #       arbitrary, but that "X" is standard, e.g. [Attr=X], [Attr=Foo].
 #
 
-ActiveDOMObject
 CachedAttribute=*
 CallWith=ScriptState|ScriptArguments|ActiveWindow|FirstWindow|ThisValue
 Constructor

diff --git a/sky/engine/bindings/scripts/code_generator_dart.py b/sky/engine/bindings/scripts/code_generator_dart.py
@@ -168,7 +168,6 @@ def generate_code(self, definitions, interface_name,
             interface_global = {'component_dir': interface_info['component_dir'],
                                 'name': template_contents['interface_name'],
                                 'parent_interface': template_contents['parent_interface'],
-                                'is_active_dom_object': template_contents['is_active_dom_object'],
                                 'has_resolver': template_contents['interface_name'],
                                 'native_entries': sorted(template_contents['native_entries'], key=lambda(x): x['blink_entry']),
                                }

diff --git a/sky/engine/bindings/scripts/compute_interfaces_info_overall.py b/sky/engine/bindings/scripts/compute_interfaces_info_overall.py
@@ -84,7 +84,6 @@
 from utilities import read_pickle_files, write_pickle_file
 
 INHERITED_EXTENDED_ATTRIBUTES = set([
-    'ActiveDOMObject',
     'DependentLifetime',
     'NotScriptWrappable',
 ])

diff --git a/sky/engine/bindings/scripts/v8_interface.py b/sky/engine/bindings/scripts/v8_interface.py
@@ -74,9 +74,6 @@ def interface_context(interface):
         header_includes.update(v8_types.includes_for_interface(parent_interface))
     extended_attributes = interface.extended_attributes
 
-    # [ActiveDOMObject]
-    is_active_dom_object = 'ActiveDOMObject' in extended_attributes
-
     # [DependentLifetime]
     is_dependent_lifetime = 'DependentLifetime' in extended_attributes
 
@@ -134,14 +131,12 @@ def interface_context(interface):
         'has_visit_dom_wrapper': has_visit_dom_wrapper,
         'header_includes': header_includes,
         'interface_name': interface.name,
-        'is_active_dom_object': is_active_dom_object,
         'is_dependent_lifetime': is_dependent_lifetime,
         'is_exception': interface.is_exception,
         'is_script_wrappable': is_script_wrappable,
         'iterator_method': iterator_method,
         'lifetime': 'Dependent'
             if (has_visit_dom_wrapper or
-                is_active_dom_object or
                 is_dependent_lifetime)
             else 'Independent',
         'parent_interface': parent_interface,

diff --git a/sky/engine/core/css/MediaQueryList.cpp b/sky/engine/core/css/MediaQueryList.cpp
@@ -18,7 +18,6 @@
  */
 
 #include "sky/engine/core/css/MediaQueryList.h"
-#include "gen/sky/core/EventTargetNames.h"
 #include "sky/engine/core/css/MediaList.h"
 #include "sky/engine/core/css/MediaQueryEvaluator.h"
 #include "sky/engine/core/css/MediaQueryListListener.h"

diff --git a/sky/engine/platform/AsyncMethodRunner.h b/sky/engine/platform/AsyncMethodRunner.h
@@ -70,8 +70,7 @@ class AsyncMethodRunner final {
     }
 
     // If it's scheduled to run the method, cancel it and remember to schedule
-    // it again when resume() is called. Mainly for implementing
-    // ActiveDOMObject::suspend().
+    // it again when resume() is called.
     void suspend()
     {
         if (m_suspended)