| Index: third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py
|
| index 14e56778b70fd9a0f88164935bbb8c56f92f0d9c..572b5d2532efb1be67ebc8004cdce27f1a8418b3 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py
|
| @@ -56,7 +56,7 @@ class BaselineOptimizer(object):
|
| for port_name in port_names:
|
| self._ports[port_name] = host.port_factory.get(port_name)
|
|
|
| - self._webkit_base = port.webkit_base()
|
| + self._blink_base = port.blink_base()
|
| self._layout_tests_dir = port.layout_tests_dir()
|
|
|
| # Only used by unittests.
|
| @@ -83,7 +83,7 @@ class BaselineOptimizer(object):
|
| def _relative_baseline_search_paths(self, port, baseline_name):
|
| baseline_search_path = self._baseline_search_path(port, baseline_name)
|
| baseline_root = self._baseline_root(baseline_name)
|
| - relative_paths = [self._filesystem.relpath(path, self._webkit_base) for path in baseline_search_path]
|
| + relative_paths = [self._filesystem.relpath(path, self._blink_base) for path in baseline_search_path]
|
| return relative_paths + [baseline_root]
|
|
|
| def _join_directory(self, directory, baseline_name):
|
| @@ -97,7 +97,7 @@ class BaselineOptimizer(object):
|
| baseline_name_without_virtual = baseline_name[len(virtual_suite.name) + 1:]
|
| else:
|
| baseline_name_without_virtual = baseline_name
|
| - return self._filesystem.join(self._webkit_base, directory, baseline_name_without_virtual)
|
| + return self._filesystem.join(self._blink_base, directory, baseline_name_without_virtual)
|
|
|
| def read_results_by_directory(self, baseline_name):
|
| results_by_directory = {}
|
| @@ -123,7 +123,7 @@ class BaselineOptimizer(object):
|
| def _directories_immediately_preceding_root(self, baseline_name):
|
| directories = set()
|
| for port in self._ports.values():
|
| - directory = self._filesystem.relpath(self._baseline_search_path(port, baseline_name)[-1], self._webkit_base)
|
| + directory = self._filesystem.relpath(self._baseline_search_path(port, baseline_name)[-1], self._blink_base)
|
| directories.add(directory)
|
| return directories
|
|
|
| @@ -210,7 +210,7 @@ class BaselineOptimizer(object):
|
| platform_dir = self.ROOT_LAYOUT_TESTS_DIRECTORY + self._filesystem.sep + 'platform' + self._filesystem.sep
|
| if filename.startswith(platform_dir):
|
| return filename.replace(platform_dir, '').split(self._filesystem.sep)[0]
|
| - platform_dir = self._filesystem.join(self._webkit_base, platform_dir)
|
| + platform_dir = self._filesystem.join(self._blink_base, platform_dir)
|
| if filename.startswith(platform_dir):
|
| return filename.replace(platform_dir, '').split(self._filesystem.sep)[0]
|
| return '(generic)'
|
|
|