| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/python |
| 2 # Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 2 # Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file |
| 3 # for details. All rights reserved. Use of this source code is governed by a | 3 # for details. All rights reserved. Use of this source code is governed by a |
| 4 # BSD-style license that can be found in the LICENSE file. | 4 # BSD-style license that can be found in the LICENSE file. |
| 5 | 5 |
| 6 import copy | 6 import copy |
| 7 import database | 7 import database |
| 8 import idlparser | 8 import idlparser |
| 9 import logging | 9 import logging |
| 10 import multiprocessing | 10 import multiprocessing |
| (...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 399 if target_name: | 399 if target_name: |
| 400 # [Supplemental=DOMWindow] - merge into DOMWindow. | 400 # [Supplemental=DOMWindow] - merge into DOMWindow. |
| 401 target = target_name | 401 target = target_name |
| 402 else: | 402 else: |
| 403 # [Supplemental] - merge into existing inteface with same name. | 403 # [Supplemental] - merge into existing inteface with same name. |
| 404 target = interface.id | 404 target = interface.id |
| 405 if self._database.HasInterface(target): | 405 if self._database.HasInterface(target): |
| 406 old_interface = self._database.GetInterface(target) | 406 old_interface = self._database.GetInterface(target) |
| 407 self._merge_interfaces(old_interface, interface, import_options) | 407 self._merge_interfaces(old_interface, interface, import_options) |
| 408 else: | 408 else: |
| 409 raise Exception("Supplemental target '%s' not found", target) | 409 _logger.warning("Supplemental target '%s' not found", target) |
| 410 | 410 |
| 411 # Step 4: Resolve 'implements' statements | 411 # Step 4: Resolve 'implements' statements |
| 412 for impl_stmt, import_options in self._impl_stmts: | 412 for impl_stmt, import_options in self._impl_stmts: |
| 413 self._merge_impl_stmt(impl_stmt, import_options) | 413 self._merge_impl_stmt(impl_stmt, import_options) |
| 414 | 414 |
| 415 self._impl_stmts = [] | 415 self._impl_stmts = [] |
| 416 self._imported_interfaces = [] | 416 self._imported_interfaces = [] |
| 417 | 417 |
| 418 def import_idl_files(self, file_paths, import_options, parallel): | 418 def import_idl_files(self, file_paths, import_options, parallel): |
| 419 if parallel: | 419 if parallel: |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 567 # TODO(antonm): Ideally we'd like to have pristine copy of WebKit IDLs and
fetch | 567 # TODO(antonm): Ideally we'd like to have pristine copy of WebKit IDLs and
fetch |
| 568 # this information directly from it. Unfortunately right now database is
massaged | 568 # this information directly from it. Unfortunately right now database is
massaged |
| 569 # a lot so it's difficult to maintain necessary information on DOMWindow i
tself. | 569 # a lot so it's difficult to maintain necessary information on DOMWindow i
tself. |
| 570 interface = self._database.GetInterface(type) | 570 interface = self._database.GetInterface(type) |
| 571 if 'V8EnabledPerContext' in attr.ext_attrs: | 571 if 'V8EnabledPerContext' in attr.ext_attrs: |
| 572 interface.ext_attrs['synthesizedV8EnabledPerContext'] = \ | 572 interface.ext_attrs['synthesizedV8EnabledPerContext'] = \ |
| 573 attr.ext_attrs['V8EnabledPerContext'] | 573 attr.ext_attrs['V8EnabledPerContext'] |
| 574 if 'V8EnabledAtRuntime' in attr.ext_attrs: | 574 if 'V8EnabledAtRuntime' in attr.ext_attrs: |
| 575 interface.ext_attrs['synthesizedV8EnabledAtRuntime'] = \ | 575 interface.ext_attrs['synthesizedV8EnabledAtRuntime'] = \ |
| 576 attr.ext_attrs['V8EnabledAtRuntime'] or attr.id | 576 attr.ext_attrs['V8EnabledAtRuntime'] or attr.id |
| OLD | NEW |