diff options
| author | mihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 18:07:32 +0000 |
|---|---|---|
| committer | mihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 18:07:32 +0000 |
| commit | f7b8b9f697e41f44319ac7b757c9442d07f73b0c (patch) | |
| tree | 3379d8aef9fe8b16b224a77e0768ab466930a141 /webkit/support | |
| parent | f94d7fee29a2fc40390bb00cfaca6e2f77165b2f (diff) | |
| download | chromium_src-f7b8b9f697e41f44319ac7b757c9442d07f73b0c.zip chromium_src-f7b8b9f697e41f44319ac7b757c9442d07f73b0c.tar.gz chromium_src-f7b8b9f697e41f44319ac7b757c9442d07f73b0c.tar.bz2 | |
Update GetWebKitRootDirFilePath to handle the move of WebKit/ into Source/.
BUG=none
TEST=layout tests
Review URL: http://codereview.chromium.org/6334024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/webkit_support.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 195257b..2e893f9 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -164,8 +164,8 @@ FilePath GetWebKitRootDirFilePath() { if (file_util::PathExists(basePath.Append(FILE_PATH_LITERAL("chrome")))) { return basePath.Append(FILE_PATH_LITERAL("third_party/WebKit")); } else { - // WebKit/WebKit/chromium/ -> WebKit/ - return basePath.Append(FILE_PATH_LITERAL("../..")); + // WebKit/Source/WebKit/chromium/ -> WebKit/ + return basePath.Append(FILE_PATH_LITERAL("../../..")); } } @@ -409,7 +409,8 @@ WebURL RewriteLayoutTestsURL(const std::string& utf8_url) { FilePath replacePath = GetWebKitRootDirFilePath().Append(FILE_PATH_LITERAL("LayoutTests/")); - CHECK(file_util::PathExists(replacePath)); + CHECK(file_util::PathExists(replacePath)) << replacePath.value() << + " (re-written from " << utf8_url << ") does not exit"; #if defined(OS_WIN) std::string utf8_path = WideToUTF8(replacePath.value()); #else |