Fixes for Blink roll to r151189

tools/dom/scripts/fremontcutbuilder.py

 #!/usr/bin/python
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 import database
 import databasebuilder
 import idlparser
 import logging.config
 import os.path
 import sys
 
 _logger = logging.getLogger('fremontcutbuilder')
 
 # See:
 #  http://src.chromium.org/viewvc/multivm/trunk/webkit/Source/core/features.gypi
 # for ENABLE_* flags defined in Chromium / Blink.
 # We list all ENABLE flags used in IDL in one of these two lists.
 FEATURE_DISABLED = [
     'ENABLE_BATTERY_STATUS',
     'ENABLE_CSS_DEVICE_ADAPTATION',
     'ENABLE_CUSTOM_SCHEME_HANDLER',
-    'ENABLE_ENCRYPTED_MEDIA_V2',
     'ENABLE_MEDIA_CAPTURE', # Only enabled on Android.
     'ENABLE_ORIENTATION_EVENTS', # Only enabled on Android.
     'ENABLE_WEBVTT_REGIONS',
     'ENABLE_XHR_TIMEOUT',
 ]
 
 FEATURE_DEFINES = [
     'ENABLE_CALENDAR_PICKER', # Not on Android
-    'ENABLE_DATALIST_ELEMENT', # Not on Android
-    'ENABLE_ENCRYPTED_MEDIA',
+    'ENABLE_ENCRYPTED_MEDIA_V2',

[Anton Muhin, 2013/06/03 09:02:19]

why it moved here?  Do we have those defines somewhere?

[vsm, 2013/06/03 14:59:50]

Yes, this one is still in the IDL.

On 2013/06/03 09:02:19, Anton Muhin wrote:

     'ENABLE_INPUT_SPEECH', # Not on Android
     'ENABLE_LEGACY_NOTIFICATIONS', # Not on Android
     'ENABLE_NAVIGATOR_CONTENT_UTILS', # Not on Android
     'ENABLE_NOTIFICATIONS', # Not on Android
-    'ENABLE_PAGE_POPUP', # Not on Android
     'ENABLE_SVG',
     'ENABLE_SVG_FONTS',
     'ENABLE_WEB_AUDIO', # Not on Android
     'ENABLE_WEBGL',
 ]
 
 def build_database(idl_files, database_dir, feature_defines=None, parallel=False):
   """This code reconstructs the FremontCut IDL database from W3C,
   WebKit and Dart IDL files."""
   current_dir = os.path.dirname(__file__)
@@ skipping 49 matching lines @@
 
   conditionals_met = set(
       'ENABLE_' + conditional for conditional in builder.conditionals_met)
   known_conditionals = set(FEATURE_DEFINES + FEATURE_DISABLED)
 
   unused_conditionals = known_conditionals - conditionals_met
   if unused_conditionals:
     _logger.warning('There are some unused conditionals %s' %
         sorted(unused_conditionals))
     _logger.warning('Please update fremontcutbuilder.py')
+    raise 'Halt'
 
   unknown_conditionals = conditionals_met - known_conditionals
   if unknown_conditionals:
     _logger.warning('There are some unknown conditionals %s' %
         sorted(unknown_conditionals))
     _logger.warning('Please update fremontcutbuilder.py')
+    raise 'Halt'

[Anton Muhin, 2013/06/03 09:02:19]

oversight or by intent?

[vsm, 2013/06/03 14:59:50]

Sorry, temporary add to verify that there where no extraneous symbols.  Will
remove.

 
   db.Save()
   return db
 
 def main(parallel=False):
   current_dir = os.path.dirname(__file__)
 
   idl_files = []
 
   webcore_dir = os.path.join(current_dir, '..', '..', '..', 'third_party',
@@ skipping 17 matching lines @@
       if ext == '.idl':
         idl_files.append(file_name)
 
   os.path.walk(webcore_dir, visitor, webcore_dir)
 
   database_dir = os.path.join(current_dir, '..', 'database')
   return build_database(idl_files, database_dir, parallel=parallel)
 
 if __name__ == '__main__':
   sys.exit(main())