diff options
author | Guang Zhu <guangzhu@google.com> | 2011-01-12 14:39:32 -0800 |
---|---|---|
committer | Guang Zhu <guangzhu@google.com> | 2011-01-12 14:39:32 -0800 |
commit | da1469977bc2fe84d4aed8e0053b9e46200664de (patch) | |
tree | f0da45ec2c95e4588f2aa0ef895426b64dd5d4be /WebKit | |
parent | 237fb639791a0d2ae7d18ca897a86e1ca22de757 (diff) | |
download | external_webkit-da1469977bc2fe84d4aed8e0053b9e46200664de.zip external_webkit-da1469977bc2fe84d4aed8e0053b9e46200664de.tar.gz external_webkit-da1469977bc2fe84d4aed8e0053b9e46200664de.tar.bz2 |
Revert "Only use the name part when opening files that start with file://"
This reverts commit 5bc439a352fa4a52aa5be1eab0dc72420f40d49f.
Diffstat (limited to 'WebKit')
-rw-r--r-- | WebKit/android/WebCoreSupport/WebResourceRequest.cpp | 7 | ||||
-rw-r--r-- | WebKit/android/WebCoreSupport/WebResourceRequest.h | 3 | ||||
-rw-r--r-- | WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp | 2 |
3 files changed, 0 insertions, 12 deletions
diff --git a/WebKit/android/WebCoreSupport/WebResourceRequest.cpp b/WebKit/android/WebCoreSupport/WebResourceRequest.cpp index c6e428c..9b70fce 100644 --- a/WebKit/android/WebCoreSupport/WebResourceRequest.cpp +++ b/WebKit/android/WebCoreSupport/WebResourceRequest.cpp @@ -91,13 +91,6 @@ WebResourceRequest::WebResourceRequest(const WebCore::ResourceRequest& resourceR m_userAgent = resourceRequest.httpUserAgent().utf8().data(); m_url = resourceRequest.url().string().utf8().data(); - normalizeUrl(m_url); -} - -void WebResourceRequest::normalizeUrl(std::string& url) { - // Chrome does not understand file url's - if (url.find("file://") == 0) - url.erase(0, 7); } } // namespace android diff --git a/WebKit/android/WebCoreSupport/WebResourceRequest.h b/WebKit/android/WebCoreSupport/WebResourceRequest.h index b1eaeed..38f37b5 100644 --- a/WebKit/android/WebCoreSupport/WebResourceRequest.h +++ b/WebKit/android/WebCoreSupport/WebResourceRequest.h @@ -71,9 +71,6 @@ public: return m_loadFlags; } - // Changes file url's to files paths - static void normalizeUrl(std::string& url); - private: std::string m_method; std::string m_referrer; diff --git a/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp b/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp index 537863f..29a97cc 100644 --- a/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp +++ b/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp @@ -134,8 +134,6 @@ WebUrlLoaderClient::WebUrlLoaderClient(WebFrame* webFrame, WebCore::ResourceHand // Chromium check if it is a directory by checking // element.m_fileLength, that doesn't work in Android std::string filename = element.m_filename.utf8().data(); - // If the filename start with file:// strip that part out, chromium doesn't understand it - WebResourceRequest::normalizeUrl(filename); if (filename.size() > 0) { base::Thread* thread = ioThread(); if (thread) |