| Index: Source/core/core_derived_sources.gyp | 
| diff --git a/Source/core/core_derived_sources.gyp b/Source/core/core_derived_sources.gyp | 
| index 87a494ac90a38d1ebe17d9be050f4439c8bf501a..fb4d3f5589d62ff76eb1aa600b9a42e90a5dbed3 100644 | 
| --- a/Source/core/core_derived_sources.gyp | 
| +++ b/Source/core/core_derived_sources.gyp | 
| @@ -54,7 +54,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/action_makenames.py', | 
| +            '../build/scripts/action_makenames.py', | 
| '<@(_outputs)', | 
| '--', | 
| '<@(_inputs)', | 
| @@ -65,10 +65,10 @@ | 
| 'action_name': 'InternalRuntimeFlags', | 
| 'inputs': [ | 
| '<@(scripts_for_in_files)', | 
| -            'scripts/make_internal_runtime_flags.py', | 
| +            '../build/scripts/make_internal_runtime_flags.py', | 
| 'page/RuntimeEnabledFeatures.in', | 
| -            'scripts/templates/InternalRuntimeFlags.h.tmpl', | 
| -            'scripts/templates/InternalRuntimeFlags.idl.tmpl', | 
| +            '../build/scripts/templates/InternalRuntimeFlags.h.tmpl', | 
| +            '../build/scripts/templates/InternalRuntimeFlags.idl.tmpl', | 
| ], | 
| 'outputs': [ | 
| '<(SHARED_INTERMEDIATE_DIR)/blink/InternalRuntimeFlags.idl', | 
| @@ -76,7 +76,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/make_internal_runtime_flags.py', | 
| +            '../build/scripts/make_internal_runtime_flags.py', | 
| 'page/RuntimeEnabledFeatures.in', | 
| '--output_dir', | 
| '<(SHARED_INTERMEDIATE_DIR)/blink', | 
| @@ -111,7 +111,7 @@ | 
| 'msvs_cygwin_shell': 0, | 
| 'action': [ | 
| '<(perl_exe)', | 
| -            'scripts/xxd.pl', | 
| +            '../build/scripts/xxd.pl', | 
| 'V8ArrayBufferViewCustomScript_js', | 
| '<@(_inputs)', | 
| '<@(_outputs)' | 
| @@ -129,7 +129,7 @@ | 
| 'msvs_cygwin_shell': 0, | 
| 'action': [ | 
| '<(perl_exe)', | 
| -            'scripts/xxd.pl', | 
| +            '../build/scripts/xxd.pl', | 
| 'XMLViewer_css', | 
| '<@(_inputs)', | 
| '<@(_outputs)' | 
| @@ -146,7 +146,7 @@ | 
| 'msvs_cygwin_shell': 0, | 
| 'action': [ | 
| '<(perl_exe)', | 
| -            'scripts/xxd.pl', | 
| +            '../build/scripts/xxd.pl', | 
| 'XMLViewer_js', | 
| '<@(_inputs)', | 
| '<@(_outputs)' | 
| @@ -173,11 +173,11 @@ | 
| 'action_name': 'RuntimeEnabledFeatures', | 
| 'inputs': [ | 
| '<@(scripts_for_in_files)', | 
| -            'scripts/make_runtime_features.py', | 
| -            'scripts/name_utilities.py', | 
| +            '../build/scripts/make_runtime_features.py', | 
| +            '../build/scripts/name_utilities.py', | 
| 'page/RuntimeEnabledFeatures.in', | 
| -            'scripts/templates/RuntimeEnabledFeatures.cpp.tmpl', | 
| -            'scripts/templates/RuntimeEnabledFeatures.h.tmpl', | 
| +            '../build/scripts/templates/RuntimeEnabledFeatures.cpp.tmpl', | 
| +            '../build/scripts/templates/RuntimeEnabledFeatures.h.tmpl', | 
| ], | 
| 'outputs': [ | 
| '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.cpp', | 
| @@ -185,7 +185,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/make_runtime_features.py', | 
| +            '../build/scripts/make_runtime_features.py', | 
| 'page/RuntimeEnabledFeatures.in', | 
| '--output_dir', | 
| '<(SHARED_INTERMEDIATE_DIR)/blink', | 
| @@ -201,7 +201,7 @@ | 
| }, | 
| 'inputs': [ | 
| '<@(scripts_for_in_files)', | 
| -            'scripts/make_css_property_names.py', | 
| +            '../build/scripts/make_css_property_names.py', | 
| '<@(in_files)' | 
| ], | 
| 'outputs': [ | 
| @@ -210,7 +210,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/make_css_property_names.py', | 
| +            '../build/scripts/make_css_property_names.py', | 
| '<@(in_files)', | 
| '--output_dir', | 
| '<(SHARED_INTERMEDIATE_DIR)/blink', | 
| @@ -222,10 +222,10 @@ | 
| 'action_name': 'StylePropertyShorthand', | 
| 'inputs': [ | 
| '<@(scripts_for_in_files)', | 
| -            'scripts/make_style_shorthands.py', | 
| +            '../build/scripts/make_style_shorthands.py', | 
| 'css/CSSShorthands.in', | 
| -            'scripts/templates/StylePropertyShorthand.h.tmpl', | 
| -            'scripts/templates/StylePropertyShorthand.cpp.tmpl', | 
| +            '../build/scripts/templates/StylePropertyShorthand.h.tmpl', | 
| +            '../build/scripts/templates/StylePropertyShorthand.cpp.tmpl', | 
| ], | 
| 'outputs': [ | 
| '<(SHARED_INTERMEDIATE_DIR)/blink/StylePropertyShorthand.cpp', | 
| @@ -233,7 +233,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/make_style_shorthands.py', | 
| +            '../build/scripts/make_style_shorthands.py', | 
| 'css/CSSShorthands.in', | 
| '--output_dir', | 
| '<(SHARED_INTERMEDIATE_DIR)/blink', | 
| @@ -243,11 +243,11 @@ | 
| 'action_name': 'StyleBuilder', | 
| 'inputs': [ | 
| '<@(scripts_for_in_files)', | 
| -            'scripts/make_style_builder.py', | 
| +            '../build/scripts/make_style_builder.py', | 
| 'css/CSSProperties.in', | 
| -            'scripts/templates/StyleBuilder.cpp.tmpl', | 
| -            'scripts/templates/StyleBuilderFunctions.h.tmpl', | 
| -            'scripts/templates/StyleBuilderFunctions.cpp.tmpl', | 
| +            '../build/scripts/templates/StyleBuilder.cpp.tmpl', | 
| +            '../build/scripts/templates/StyleBuilderFunctions.h.tmpl', | 
| +            '../build/scripts/templates/StyleBuilderFunctions.cpp.tmpl', | 
| ], | 
| 'outputs': [ | 
| '<(SHARED_INTERMEDIATE_DIR)/blink/StyleBuilder.cpp', | 
| @@ -256,7 +256,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/make_style_builder.py', | 
| +            '../build/scripts/make_style_builder.py', | 
| 'css/CSSProperties.in', | 
| '--output_dir', | 
| '<(SHARED_INTERMEDIATE_DIR)/blink', | 
| @@ -272,7 +272,7 @@ | 
| }, | 
| 'inputs': [ | 
| '<@(scripts_for_in_files)', | 
| -            'scripts/make_css_value_keywords.py', | 
| +            '../build/scripts/make_css_value_keywords.py', | 
| '<@(in_files)' | 
| ], | 
| 'outputs': [ | 
| @@ -280,7 +280,7 @@ | 
| '<(SHARED_INTERMEDIATE_DIR)/blink/CSSValueKeywords.h', | 
| ], | 
| 'action': [ | 
| -             'scripts/make_css_value_keywords.py', | 
| +             '../build/scripts/make_css_value_keywords.py', | 
| '<@(in_files)', | 
| '--output_dir', | 
| '<(SHARED_INTERMEDIATE_DIR)/blink', | 
| @@ -291,9 +291,9 @@ | 
| { | 
| 'action_name': 'HTMLNames', | 
| 'inputs': [ | 
| -            'scripts/Hasher.pm', | 
| -            'scripts/StaticString.pm', | 
| -            'scripts/make_names.pl', | 
| +            '../build/scripts/Hasher.pm', | 
| +            '../build/scripts/StaticString.pm', | 
| +            '../build/scripts/make_names.pl', | 
| 'html/HTMLTagNames.in', | 
| 'html/HTMLAttributeNames.in', | 
| ], | 
| @@ -306,7 +306,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/action_makenames.py', | 
| +            '../build/scripts/action_makenames.py', | 
| '<@(_outputs)', | 
| '--', | 
| '<@(_inputs)', | 
| @@ -319,9 +319,9 @@ | 
| { | 
| 'action_name': 'FontFamilyNames', | 
| 'inputs': [ | 
| -            'scripts/Hasher.pm', | 
| -            'scripts/StaticString.pm', | 
| -            'scripts/make_names.pl', | 
| +            '../build/scripts/Hasher.pm', | 
| +            '../build/scripts/StaticString.pm', | 
| +            '../build/scripts/make_names.pl', | 
| 'css/FontFamilyNames.in', | 
| ], | 
| 'outputs': [ | 
| @@ -330,7 +330,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/action_makenames.py', | 
| +            '../build/scripts/action_makenames.py', | 
| '<@(_outputs)', | 
| '--', | 
| '<@(_inputs)', | 
| @@ -342,9 +342,9 @@ | 
| { | 
| 'action_name': 'SVGNames', | 
| 'inputs': [ | 
| -            'scripts/Hasher.pm', | 
| -            'scripts/StaticString.pm', | 
| -            'scripts/make_names.pl', | 
| +            '../build/scripts/Hasher.pm', | 
| +            '../build/scripts/StaticString.pm', | 
| +            '../build/scripts/make_names.pl', | 
| 'svg/SVGTagNames.in', | 
| 'svg/SVGAttributeNames.in', | 
| ], | 
| @@ -358,7 +358,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/action_makenames.py', | 
| +            '../build/scripts/action_makenames.py', | 
| '<@(_outputs)', | 
| '--', | 
| '<@(_inputs)', | 
| @@ -372,8 +372,8 @@ | 
| 'action_name': 'EventFactory', | 
| 'inputs': [ | 
| '<@(scripts_for_in_files)', | 
| -            'scripts/make_event_factory.py', | 
| -            'scripts/name_utilities.py', | 
| +            '../build/scripts/make_event_factory.py', | 
| +            '../build/scripts/name_utilities.py', | 
| '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in', | 
| 'events/EventAliases.in', | 
| ], | 
| @@ -384,7 +384,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/make_event_factory.py', | 
| +            '../build/scripts/make_event_factory.py', | 
| '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in', | 
| 'events/EventAliases.in', | 
| '--output_dir', | 
| @@ -395,8 +395,8 @@ | 
| 'action_name': 'EventTargetFactory', | 
| 'inputs': [ | 
| '<@(scripts_for_in_files)', | 
| -            'scripts/make_event_factory.py', | 
| -            'scripts/name_utilities.py', | 
| +            '../build/scripts/make_event_factory.py', | 
| +            '../build/scripts/name_utilities.py', | 
| 'events/EventTargetFactory.in', | 
| ], | 
| 'outputs': [ | 
| @@ -405,7 +405,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/make_event_factory.py', | 
| +            '../build/scripts/make_event_factory.py', | 
| 'events/EventTargetFactory.in', | 
| '--output_dir', | 
| '<(SHARED_INTERMEDIATE_DIR)/blink', | 
| @@ -414,9 +414,9 @@ | 
| { | 
| 'action_name': 'MathMLNames', | 
| 'inputs': [ | 
| -            'scripts/Hasher.pm', | 
| -            'scripts/StaticString.pm', | 
| -            'scripts/make_names.pl', | 
| +            '../build/scripts/Hasher.pm', | 
| +            '../build/scripts/StaticString.pm', | 
| +            '../build/scripts/make_names.pl', | 
| 'html/parser/MathMLTagNames.in', | 
| 'html/parser/MathMLAttributeNames.in', | 
| ], | 
| @@ -426,7 +426,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/action_makenames.py', | 
| +            '../build/scripts/action_makenames.py', | 
| '<@(_outputs)', | 
| '--', | 
| '<@(_inputs)', | 
| @@ -440,7 +440,7 @@ | 
| 'variables': { | 
| 'scripts': [ | 
| 'css/make-css-file-arrays.pl', | 
| -              'scripts/preprocessor.pm', | 
| +              '../build/scripts/preprocessor.pm', | 
| ], | 
| 'stylesheets': [ | 
| 'css/html.css', | 
| @@ -469,7 +469,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/action_useragentstylesheets.py', | 
| +            '../build/scripts/action_useragentstylesheets.py', | 
| '<@(_outputs)', | 
| '<@(stylesheets)', | 
| '--', | 
| @@ -491,7 +491,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/make_names.py', | 
| +            '../build/scripts/make_names.py', | 
| 'fetch/FetchInitiatorTypeNames.in', | 
| '--output_dir', | 
| '<(SHARED_INTERMEDIATE_DIR)/blink', | 
| @@ -509,7 +509,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/make_names.py', | 
| +            '../build/scripts/make_names.py', | 
| 'events/EventNames.in', | 
| '--output_dir', | 
| '<(SHARED_INTERMEDIATE_DIR)/blink', | 
| @@ -518,9 +518,9 @@ | 
| { | 
| 'action_name': 'XLinkNames', | 
| 'inputs': [ | 
| -            'scripts/Hasher.pm', | 
| -            'scripts/StaticString.pm', | 
| -            'scripts/make_names.pl', | 
| +            '../build/scripts/Hasher.pm', | 
| +            '../build/scripts/StaticString.pm', | 
| +            '../build/scripts/make_names.pl', | 
| 'svg/xlinkattrs.in', | 
| ], | 
| 'outputs': [ | 
| @@ -529,7 +529,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/action_makenames.py', | 
| +            '../build/scripts/action_makenames.py', | 
| '<@(_outputs)', | 
| '--', | 
| '<@(_inputs)', | 
| @@ -541,9 +541,9 @@ | 
| { | 
| 'action_name': 'XMLNSNames', | 
| 'inputs': [ | 
| -            'scripts/Hasher.pm', | 
| -            'scripts/StaticString.pm', | 
| -            'scripts/make_names.pl', | 
| +            '../build/scripts/Hasher.pm', | 
| +            '../build/scripts/StaticString.pm', | 
| +            '../build/scripts/make_names.pl', | 
| 'xml/xmlnsattrs.in', | 
| ], | 
| 'outputs': [ | 
| @@ -552,7 +552,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/action_makenames.py', | 
| +            '../build/scripts/action_makenames.py', | 
| '<@(_outputs)', | 
| '--', | 
| '<@(_inputs)', | 
| @@ -564,9 +564,9 @@ | 
| { | 
| 'action_name': 'XMLNames', | 
| 'inputs': [ | 
| -            'scripts/Hasher.pm', | 
| -            'scripts/StaticString.pm', | 
| -            'scripts/make_names.pl', | 
| +            '../build/scripts/Hasher.pm', | 
| +            '../build/scripts/StaticString.pm', | 
| +            '../build/scripts/make_names.pl', | 
| 'xml/xmlattrs.in', | 
| ], | 
| 'outputs': [ | 
| @@ -575,7 +575,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/action_makenames.py', | 
| +            '../build/scripts/action_makenames.py', | 
| '<@(_outputs)', | 
| '--', | 
| '<@(_inputs)', | 
| @@ -595,7 +595,7 @@ | 
| ], | 
| 'action': [ | 
| '<(perl_exe)', | 
| -            '-Iscripts', | 
| +            '-I../build/scripts', | 
| 'css/makegrammar.pl', | 
| '--outputDir', | 
| '<(SHARED_INTERMEDIATE_DIR)/blink', | 
| @@ -606,7 +606,7 @@ | 
| 'action_name': 'MakeTokenMatcher', | 
| 'inputs': [ | 
| '<@(scripts_for_in_files)', | 
| -            '../core/scripts/make_token_matcher.py', | 
| +            '../build/scripts/make_token_matcher.py', | 
| '../core/css/CSSParser-in.cpp', | 
| ], | 
| 'outputs': [ | 
| @@ -614,7 +614,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            '../core/scripts/make_token_matcher.py', | 
| +            '../build/scripts/make_token_matcher.py', | 
| '../core/css/CSSParser-in.cpp', | 
| '<(SHARED_INTERMEDIATE_DIR)/blink/CSSParser.cpp', | 
| ], | 
| @@ -623,7 +623,7 @@ | 
| 'action_name': 'MakeTokenMatcherForViewport', | 
| 'inputs': [ | 
| '<@(scripts_for_in_files)', | 
| -            '../core/scripts/make_token_matcher.py', | 
| +            '../build/scripts/make_token_matcher.py', | 
| '../core/html/HTMLMetaElement-in.cpp', | 
| ], | 
| 'outputs': [ | 
| @@ -631,7 +631,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            '../core/scripts/make_token_matcher.py', | 
| +            '../build/scripts/make_token_matcher.py', | 
| '../core/html/HTMLMetaElement-in.cpp', | 
| '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLMetaElement.cpp', | 
| ], | 
| @@ -647,7 +647,7 @@ | 
| ], | 
| 'action': [ | 
| 'python', | 
| -            'scripts/rule_bison.py', | 
| +            '../build/scripts/rule_bison.py', | 
| '<(RULE_INPUT_PATH)', | 
| '<(SHARED_INTERMEDIATE_DIR)/blink', | 
| '<(bison_exe)', | 
| @@ -661,12 +661,12 @@ | 
| '<(SHARED_INTERMEDIATE_DIR)/blink/<(RULE_INPUT_ROOT).cpp', | 
| ], | 
| 'inputs': [ | 
| -            'scripts/make-hash-tools.pl', | 
| +            '../build/scripts/make-hash-tools.pl', | 
| ], | 
| 'msvs_cygwin_shell': 0, | 
| 'action': [ | 
| '<(perl_exe)', | 
| -            'scripts/make-hash-tools.pl', | 
| +            '../build/scripts/make-hash-tools.pl', | 
| '<(SHARED_INTERMEDIATE_DIR)/blink', | 
| '<(RULE_INPUT_PATH)', | 
| '<(gperf_exe)', | 
|  |