webkitpy: Reduce usage of path_from_webkit_base().

third_party/WebKit/Tools/Scripts/webkitpy/common/webkit_finder.py

 # Copyright (c) 2012 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
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 64 matching lines @@
 
     def __init__(self, filesystem):
         self._filesystem = filesystem
         self._dirsep = filesystem.sep
         self._sys_path = sys.path
         self._env_path = os.environ['PATH'].split(os.pathsep)
         self._webkit_base = None
         self._chromium_base = None
         self._depot_tools = None
 
+    # TODO(tkent): Make this private. We should use functions for
+    # sub-directories in order to make the code robust against directory
+    # structure changes.
     def webkit_base(self):
         """Returns the absolute path to the top of the WebKit tree.
 
         Raises an AssertionError if the top dir can't be determined.
         """
         # TODO(qyearsley): This code somewhat duplicates the code in
         # git.find_checkout_root().
         if not self._webkit_base:
             self._webkit_base = self._webkit_base
             module_path = self._filesystem.abspath(self._filesystem.path_to_module(self.__module__))
             tools_index = module_path.rfind('Tools')
             assert tools_index != -1, 'could not find location of this checkout from %s' % module_path
             self._webkit_base = self._filesystem.normpath(module_path[0:tools_index - 1])
         return self._webkit_base
 
     def chromium_base(self):
         if not self._chromium_base:
             self._chromium_base = self._filesystem.dirname(self._filesystem.dirname(self.webkit_base()))
         return self._chromium_base
 
+    # TODO(tkent): Make this private. We should use functions for
+    # sub-directories in order to make the code robust against directory
+    # structure changes.
     def path_from_webkit_base(self, *comps):
         return self._filesystem.join(self.webkit_base(), *comps)
 
     def path_from_chromium_base(self, *comps):
         return self._filesystem.join(self.chromium_base(), *comps)
 
+    def path_from_blink_source(self, *comps):

[qyearsley, 2017/04/20 23:25:22]

Later on, after the move, this will just be //web, since Source/ subdirectories
will be moved directly there, right?

+        return self._filesystem.join(self._filesystem.join(self.webkit_base(), 'Source'), *comps)
+
     def path_to_script(self, script_name):
         """Returns the relative path to the script from the top of the WebKit tree."""
         # This is intentionally relative in order to force callers to consider what
         # their current working directory is (and change to the top of the tree if necessary).
         return self._filesystem.join('Tools', 'Scripts', script_name)
 
+    def path_from_tools_scripts(self, *comps):
+        return self._filesystem.join(self._filesystem.join(self.webkit_base(), 'Tools', 'Scripts'), *comps)

[qyearsley, 2017/04/20 23:25:22]

I suppose later this will be be called path_from_tools or path_from_tools_dir,
right?

+
     def layout_tests_dir(self):
         return self.path_from_webkit_base('LayoutTests')
 
+    def path_from_layout_tests(self, *comps):
+        return self._filesystem.join(self.layout_tests_dir(), *comps)
+
     def perf_tests_dir(self):
         return self.path_from_webkit_base('PerformanceTests')
 
     def layout_test_name(self, file_path):
         """Returns a layout test name, given the path from the repo root.
 
         Note: this appears to not work on Windows; see crbug.com/658795.
         Also, this function duplicates functionality that's in
         Port.relative_test_filename.
         TODO(qyearsley): De-duplicate this and Port.relative_test_filename,
@@ skipping 33 matching lines @@
         prev_dir = ''
         current_dir = fs.dirname(self._webkit_base)
         while current_dir != prev_dir:
             if fs.exists(fs.join(current_dir, 'depot_tools', 'pylint.py')):
                 return fs.join(current_dir, 'depot_tools')
             prev_dir = current_dir
             current_dir = fs.dirname(current_dir)
 
     def path_from_depot_tools_base(self, *comps):
         return self._filesystem.join(self.depot_tools_base(), *comps)