Update list of resource files to copy from web-platform-tests.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Fetches a copy of the latest state of a W3C test repository and commits.
 
 If this script is given the argument --auto-update, it will also attempt to
 upload a CL, triggery try jobs, and make any changes that are required for
 new failing tests before committing.
 """
@@ skipping 84 matching lines @@
         if self.fs.exists(self.path_from_webkit_base(WPT_DEST_NAME)):
             self.print_('## WebKit/%s exists; aborting.' % WPT_DEST_NAME)
             return False
 
         if self.fs.exists(self.path_from_webkit_base(CSS_DEST_NAME)):
             self.print_('## WebKit/%s repo exists; aborting.' % CSS_DEST_NAME)
             return False
 
         return True
 
-    def _copy_resources_to_wpt(self):
-        """Copies some files over to a newly-updated wpt directory.
+    def _copy_resources(self):
+        """Copies resources from LayoutTests/resources to wpt and vice versa.
 
-        There are some resources in our repository that we use instead of the
-        upstream versions.
+        There are some common resources that have copies in web-platform-tests,
+        and for some we always want to use the upstream versions, but for others
+        we always want to use our version, so these are copied after import to

[jsbell, 2016/09/01 17:55:55]

nit: run-on sentence; can you split it up?

[qyearsley, 2016/09/01 18:16:24]

Done; also I think the comments below are redundant with this one, so I removed
those.

+        ensure consistency.
+
+        If this method is changed, the lists of files expected to be identical
+        in LayoutTests/PRESUBMIT.py should also be cahnged.

[jsbell, 2016/09/01 17:55:55]

typo: "cahnged" -> "changed"

[qyearsley, 2016/09/01 18:16:24]

Done

         """
-        resources_to_copy = [
+        # There are some resources in our repository that we use instead of the
+        # upstream versions.

[jsbell, 2016/09/01 17:55:55]

Can drop "There are some"

But maybe document why we want "our" versions for each entry? (so that it's
clear to future maintainers)

[qyearsley, 2016/09/01 18:16:24]

I'm actually not sure except for testharnessreport.js :-/ Added a note for
testharnessreport.js.

+        resources_to_copy_to_wpt = [
             ('testharnessreport.js', 'resources'),
             ('WebIDLParser.js', 'resources'),

[jsbell, 2016/09/01 17:55:55]

Why do we want our WebIDLParser.js instead of wpt's? 

If there's a good reason, can we call it out? If there's not, maybe a TODO to
decide/document it?

[qyearsley, 2016/09/01 18:16:25]

Not sure; added a TODO.

             ('vendor-prefix.js', 'common'),
         ]
-        for filename, wpt_subdir in resources_to_copy:
+        for filename, wpt_subdir in resources_to_copy_to_wpt:
             source = self.path_from_webkit_base('LayoutTests', 'resources', filename)
             destination = self.path_from_webkit_base('LayoutTests', 'imported', WPT_DEST_NAME, wpt_subdir, filename)
             self.copyfile(source, destination)
             self.run(['git', 'add', destination])
 
+        # There are also some resources from the upstream repository that

[jsbell, 2016/09/01 17:55:55]

Maybe move this list up near the other one near the start of the method? (just
personal preference; helps me compare them)

[qyearsley, 2016/09/01 18:16:25]

Done

+        # we copy over to LayoutTests/resources which we may want to update.
+        resources_to_copy_from_wpt = [

[jsbell, 2016/09/01 17:55:55]

As above, can we document why we want wpt's versions for each entry?

[qyearsley, 2016/09/01 18:16:24]

Again, not completely sure :-/

+            ('idlharness.js', 'resources'),
+            ('testharness.js', 'resources'),
+        ]
+        for filename, wpt_subdir in resources_to_copy_from_wpt:
+            source = self.path_from_webkit_base('LayoutTests', 'imported', WPT_DEST_NAME, wpt_subdir, filename)
+            destination = self.path_from_webkit_base('LayoutTests', 'resources', filename)
+            self.copyfile(source, destination)
+            self.run(['git', 'add', destination])
+
     def update(self, dest_dir_name, url, keep_w3c_repos_around):
         """Updates an imported repository.
 
         Args:
             dest_dir_name: The destination directory name.
             url: URL of the git repository.
 
         Returns:
             A string for the commit description "<destination>@<commitish>".
         """
@@ skipping 200 matching lines @@
                 email_addresses.add(directory_to_owner[test_dir])
         return sorted(email_addresses)
 
     def write_test_expectations(self):
         self.print_('## Adding test expectations lines to LayoutTests/TestExpectations.')
         script_path = self.path_from_webkit_base('Tools', 'Scripts', 'update-w3c-test-expectations')
         self.run([self.host.executable, script_path])
         message = '\'Modifies TestExpectations and/or downloads new baselines for tests\''
         self.check_run(['git', 'commit', '-a', '-m', message])
         self.git_cl(['upload', '-m', message, '--rietveld'])