| OLD | NEW |
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from webkitpy.common.memoized import memoized | 5 from webkitpy.common.memoized import memoized |
| 6 from webkitpy.common.webkit_finder import WebKitFinder | 6 from webkitpy.common.webkit_finder import WebKitFinder |
| 7 from webkitpy.w3c.deps_updater import DepsUpdater | 7 from webkitpy.w3c.deps_updater import DepsUpdater |
| 8 | 8 |
| 9 CHROMIUM_WPT_DIR = 'third_party/WebKit/LayoutTests/imported/wpt/' | 9 CHROMIUM_WPT_DIR = 'third_party/WebKit/LayoutTests/external/wpt/' |
| 10 | 10 |
| 11 | 11 |
| 12 class ChromiumCommit(object): | 12 class ChromiumCommit(object): |
| 13 | 13 |
| 14 def __init__(self, host, sha=None, position=None): | 14 def __init__(self, host, sha=None, position=None): |
| 15 """ | 15 """ |
| 16 Args: | 16 Args: |
| 17 host: A Host object | 17 host: A Host object |
| 18 sha: A Chromium commit SHA | 18 sha: A Chromium commit SHA |
| 19 position: A string of the form: | 19 position: A string of the form: |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 if not filtered_files: | 90 if not filtered_files: |
| 91 return '' | 91 return '' |
| 92 | 92 |
| 93 return self.host.executive.run_command([ | 93 return self.host.executive.run_command([ |
| 94 'git', 'format-patch', '-1', '--stdout', self.sha, '--' | 94 'git', 'format-patch', '-1', '--stdout', self.sha, '--' |
| 95 ] + filtered_files, cwd=self.absolute_chromium_dir()) | 95 ] + filtered_files, cwd=self.absolute_chromium_dir()) |
| 96 | 96 |
| 97 @memoized | 97 @memoized |
| 98 def absolute_chromium_wpt_dir(self): | 98 def absolute_chromium_wpt_dir(self): |
| 99 finder = WebKitFinder(self.host.filesystem) | 99 finder = WebKitFinder(self.host.filesystem) |
| 100 return finder.path_from_webkit_base('LayoutTests', 'imported', 'wpt') | 100 return finder.path_from_webkit_base('LayoutTests', 'external', 'wpt') |
| 101 | 101 |
| 102 @memoized | 102 @memoized |
| 103 def absolute_chromium_dir(self): | 103 def absolute_chromium_dir(self): |
| 104 finder = WebKitFinder(self.host.filesystem) | 104 finder = WebKitFinder(self.host.filesystem) |
| 105 return finder.chromium_base() | 105 return finder.chromium_base() |
| OLD | NEW |