diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-21 23:13:33 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-21 23:13:33 +0000 |
| commit | d2ee2b1804bc3db9b654bd2d2f19f1c5a5c218a3 (patch) | |
| tree | 80ba17d7e8d986ce79ba6a667a78da2f0594c85e /webkit/support | |
| parent | 357bc11feb0ad18483ab1c64a8f0d15de8bf0545 (diff) | |
| download | chromium_src-d2ee2b1804bc3db9b654bd2d2f19f1c5a5c218a3.zip chromium_src-d2ee2b1804bc3db9b654bd2d2f19f1c5a5c218a3.tar.gz chromium_src-d2ee2b1804bc3db9b654bd2d2f19f1c5a5c218a3.tar.bz2 | |
Fix hyphenate tests with xcodebuild and msvc webkit standalone builds.
https://codereview.chromium.org/12035002/ made the hyphen dictionary lookup
code more robust, but it introduced a relative path in the process, which
no longer work since https://codereview.chromium.org/11782005/ .
https://codereview.chromium.org/12038003 fixed this in a special case. This
change makes that fix more general.
BUG=none
TEST=hyphenate-*.html tests on build.webkit.org turn green.
TBR=tkent
Review URL: https://codereview.chromium.org/12039014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177956 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/webkit_support.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 757ab62..9e376272 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -267,16 +267,17 @@ FilePath GetWebKitRootDirFilePath() { if (file_util::PathExists( basePath.Append(FILE_PATH_LITERAL("third_party/WebKit")))) { // We're in a WebKit-in-chrome checkout. - return basePath.Append(FILE_PATH_LITERAL("third_party/WebKit")); + basePath = basePath.Append(FILE_PATH_LITERAL("third_party/WebKit")); } else if (file_util::PathExists( basePath.Append(FILE_PATH_LITERAL("chromium")))) { // We're in a WebKit-only checkout on Windows. - return basePath.Append(FILE_PATH_LITERAL("../..")); + basePath = basePath.Append(FILE_PATH_LITERAL("../..")); } else if (file_util::PathExists( basePath.Append(FILE_PATH_LITERAL("webkit/support")))) { // We're in a WebKit-only/xcodebuild checkout on Mac - return basePath.Append(FILE_PATH_LITERAL("../../..")); + basePath = basePath.Append(FILE_PATH_LITERAL("../../..")); } + CHECK(file_util::AbsolutePath(&basePath)); // We're in a WebKit-only, make-build, so the DIR_SOURCE_ROOT is already the // WebKit root. That, or we have no idea where we are. return basePath; @@ -480,7 +481,6 @@ WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota) { WebKit::WebString GetWebKitRootDir() { FilePath path = GetWebKitRootDirFilePath(); - CHECK(file_util::AbsolutePath(&path)); std::string path_ascii = path.MaybeAsASCII(); CHECK(!path_ascii.empty()); return WebKit::WebString::fromUTF8(path_ascii.c_str()); |