Added Dartium changes onto 45.0.2454.104

Source/core/core.gyp

 #
 # Copyright (C) 2009 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 25 matching lines @@
     '../bindings/core/core.gypi',  # core can depend on bindings/core, but not on bindings
     'core.gypi',
   ],
 
   'variables': {
     'enable_wexit_time_destructors': 1,
 
     'webcore_include_dirs': [
       '..',  # WebKit/Source
       '<(SHARED_INTERMEDIATE_DIR)/blink',  # gen/blink
+      # FIXMEDART: We need a better place for this or a way to eliminate it. The
+      # dart_debugger_api.h file assumes this is on the include path to find dart_api.h.
+      '../../../../dart/runtime',
+      # FIXMEDART: We need this to include <dart_api.h>. How is v8 providing <v8.h>?
+      '../../../../dart/runtime/include',
     ],
 
     'conditions': [
       ['OS=="android" and use_openmax_dl_fft!=0', {
         'webcore_include_dirs': [
           '<(DEPTH)/third_party/openmax_dl'
         ]
       }],
     ],
   },  # variables
@@ skipping 109 matching lines @@
       # GN version: //third_party/WebKit/Source/core:core_generated
       'target_name': 'webcore_generated',
       'type': 'static_library',
       'hard_dependency': 1,
       'dependencies': [
         'webcore_prerequisites',
         'core_generated.gyp:make_core_generated',
         'inspector_protocol_sources',
         'inspector_instrumentation_sources',
         '../bindings/core/v8/generated.gyp:bindings_core_v8_generated',
+#        '../bindings/core/dart/generated.gyp:dart_snapshot',
         # FIXME: don't depend on bindings_modules http://crbug.com/358074
         '../bindings/modules/generated.gyp:modules_event_generated',
         '../bindings/modules/v8/generated.gyp:bindings_modules_v8_generated',
         '../platform/platform_generated.gyp:make_platform_generated',
         '../wtf/wtf.gyp:wtf',
         '<(DEPTH)/gin/gin.gyp:gin',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
         '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
         '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
         '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
         '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
         '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
         '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
         '<(DEPTH)/third_party/snappy/snappy.gyp:snappy',
         '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(DEPTH)/url/url.gyp:url_lib',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
       ],
       'include_dirs': [
         '<@(webcore_include_dirs)',
       ],
       'sources': [
         # FIXME: should be bindings_core_v8_files http://crbug.com/358074
+        '<@(bindings_common_files)',
         '<@(bindings_core_v8_files)',
+        '<@(bindings_core_dart_files)',
         # These files include all the .cpp files generated from the .idl files
         # in webcore_files.
+        '<@(additional_derived_sources_aggregate_files)',
         '<@(bindings_core_v8_generated_aggregate_files)',
         '<@(bindings_core_v8_generated_union_type_files)',
 
         '<@(generated_core_additional_files)',
 
         # IDL dictionary impl files generated by IDL compiler
         '<@(generated_core_dictionary_files)',
       ],
       'conditions': [
         ['OS=="win" and component=="shared_library"', {
@@ skipping 21 matching lines @@
       # GN version: //third_party/WebKit/Source/core:prerequisites
       'target_name': 'webcore_prerequisites',
       'type': 'none',
       'dependencies': [
         'inspector_protocol_sources',
         'inspector_instrumentation_sources',
         'core_generated.gyp:make_core_generated',
         '../bindings/core/v8/generated.gyp:bindings_core_v8_generated',
         # FIXME: don't depend on bindings_modules http://crbug.com/358074
         '../bindings/modules/v8/generated.gyp:bindings_modules_v8_generated',
+#        '../bindings/core/dart/generated.gyp:dart_snapshot',
         '../wtf/wtf.gyp:wtf',
         '../config.gyp:config',
         '../platform/blink_platform.gyp:blink_platform',
         '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(angle_path)/src/angle.gyp:translator',
         '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
         '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
         '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
         '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
         '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
         '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
         '<(DEPTH)/third_party/ots/ots.gyp:ots',
         '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
         '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
         '<(DEPTH)/url/url.gyp:url_lib',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+        '<@(additional_target_deps)',
       ],
       'export_dependent_settings': [
         '../wtf/wtf.gyp:wtf',
         '../config.gyp:config',
         '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(angle_path)/src/angle.gyp:translator',
         '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
         '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
         '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
         '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
         '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
         '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
         '<(DEPTH)/third_party/ots/ots.gyp:ots',
         '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
         '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
         '<(DEPTH)/url/url.gyp:url_lib',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+        '<@(additional_target_deps)',
       ],
       'direct_dependent_settings': {
         'defines': [
           'BLINK_IMPLEMENTATION=1',
           'INSIDE_BLINK',
         ],
         'include_dirs': [
           '<@(webcore_include_dirs)',
           '<(DEPTH)/gpu',
           '<(angle_path)/include',
@@ skipping 582 matching lines @@
             'libraries': [
                '<!@(pkg-config --libs ipp|sed s/-L//)/libipps_l.a',
                '<!@(pkg-config --libs ipp|sed s/-L//)/libippcore_l.a',
             ]
           },
         }],
       ],
     },
   ],  # targets
 }