Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1448)

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

Issue 2496063002: Rename WebKitFinder -> BlinkFinder. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
index 03c420aa3968993c2de8d411166f9493de6339ee..a5d66d1cc01c15e42c83b14d0400b80f1c5c397f 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
@@ -48,7 +48,7 @@ from webkitpy.common import read_checksum_from_png
from webkitpy.common.memoized import memoized
from webkitpy.common.system.executive import ScriptError
from webkitpy.common.system.path import cygpath, abspath_to_uri
-from webkitpy.common.webkit_finder import WebKitFinder
+from webkitpy.common.blink_finder import BlinkFinder
from webkitpy.layout_tests.layout_package.bot_test_expectations import BotTestExpectationsFactory
from webkitpy.layout_tests.models import test_run_results
from webkitpy.layout_tests.models.test_configuration import TestConfiguration
@@ -172,7 +172,7 @@ class Port(object):
self.host = host
self._executive = host.executive
self._filesystem = host.filesystem
- self._webkit_finder = WebKitFinder(host.filesystem)
+ self._blink_finder = BlinkFinder(host.filesystem)
self._http_server = None
self._websocket_server = None
@@ -199,7 +199,7 @@ class Port(object):
self._wdiff_available = None
# FIXME: prettypatch.py knows this path, why is it copied here?
- self._pretty_patch_path = self.path_from_webkit_base("Tools", "Scripts", "webkitruby", "PrettyPatch", "prettify.rb")
+ self._pretty_patch_path = self.path_from_blink_base("Tools", "Scripts", "webkitruby", "PrettyPatch", "prettify.rb")
self._pretty_patch_available = None
if not hasattr(options, 'configuration') or not options.configuration:
@@ -947,26 +947,26 @@ class Port(object):
self._filesystem.write_binary_file(baseline_path, data)
# FIXME: update callers to create a finder and call it instead of these next five routines (which should be protected).
- def webkit_base(self):
- return self._webkit_finder.webkit_base()
+ def blink_base(self):
+ return self._blink_finder.blink_base()
- def path_from_webkit_base(self, *comps):
- return self._webkit_finder.path_from_webkit_base(*comps)
+ def path_from_blink_base(self, *comps):
+ return self._blink_finder.path_from_blink_base(*comps)
def path_from_chromium_base(self, *comps):
- return self._webkit_finder.path_from_chromium_base(*comps)
+ return self._blink_finder.path_from_chromium_base(*comps)
def path_to_script(self, script_name):
- return self._webkit_finder.path_to_script(script_name)
+ return self._blink_finder.path_to_script(script_name)
def layout_tests_dir(self):
custom_layout_tests_dir = self.get_option('layout_tests_directory')
if custom_layout_tests_dir:
return custom_layout_tests_dir
- return self._webkit_finder.layout_tests_dir()
+ return self._blink_finder.layout_tests_dir()
def perf_tests_dir(self):
- return self._webkit_finder.perf_tests_dir()
+ return self._blink_finder.perf_tests_dir()
def skipped_layout_tests(self, test_list):
"""Returns tests skipped outside of the TestExpectations files."""
@@ -1100,10 +1100,10 @@ class Port(object):
return self._build_path('resources', 'inspector')
def inspector_debug_directory(self):
- return self.path_from_webkit_base('Source', 'devtools', 'front_end')
+ return self.path_from_blink_base('Source', 'devtools', 'front_end')
def apache_config_directory(self):
- return self.path_from_webkit_base('Tools', 'Scripts', 'apache_config')
+ return self.path_from_blink_base('Tools', 'Scripts', 'apache_config')
def default_results_directory(self):
"""Absolute path to the default place to store the test results."""
@@ -1817,7 +1817,7 @@ class Port(object):
def _chromium_baseline_path(self, platform):
if platform is None:
platform = self.name()
- return self.path_from_webkit_base('LayoutTests', 'platform', platform)
+ return self.path_from_blink_base('LayoutTests', 'platform', platform)
class VirtualTestSuite(object):

Powered by Google App Engine
This is Rietveld 408576698