diff options
| author | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 02:40:34 +0000 |
|---|---|---|
| committer | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 02:40:34 +0000 |
| commit | b889a07d9a942b78971e46ccd5337d92216c822a (patch) | |
| tree | 8fbd634e37ab1ba4ad73b3c1764cd1b7de28d4d6 /webkit | |
| parent | bc4c67e9e7f2377b797f18a749388835778ef89e (diff) | |
| download | chromium_src-b889a07d9a942b78971e46ccd5337d92216c822a.zip chromium_src-b889a07d9a942b78971e46ccd5337d92216c822a.tar.gz chromium_src-b889a07d9a942b78971e46ccd5337d92216c822a.tar.bz2 | |
DRT should handle relative path arguments.
Apply file_util::AbsolutePath before net::FilePathToFileURL.
BUG=webkit.org/b/97808
Review URL: https://chromiumcodereview.appspot.com/11366024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165593 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/support/webkit_support.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index b1603e8..eb1e394 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -637,10 +637,12 @@ WebURL CreateURLForPathOrURL(const std::string& path_or_url_in_nativemb) { if (url.is_valid() && url.has_scheme()) return WebURL(url); #if defined(OS_WIN) - return net::FilePathToFileURL(FilePath(wide_path_or_url)); + FilePath path(wide_path_or_url); #else - return net::FilePathToFileURL(FilePath(path_or_url_in_nativemb)); + FilePath path(path_or_url_in_nativemb); #endif + file_util::AbsolutePath(&path); + return net::FilePathToFileURL(path); } WebURL RewriteLayoutTestsURL(const std::string& utf8_url) { |