diff options
| author | Steve Block <steveblock@google.com> | 2012-03-27 18:40:26 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-03-28 16:54:59 +0100 |
| commit | e48d279609693b4d164199748c93ad791547c649 (patch) | |
| tree | 25780dbbd84520d51c0fd174a299121e0d46f5e2 /Source/WebCore/loader | |
| parent | c57e584da242d96ba18578a71f4634adc9d1fff6 (diff) | |
| download | external_webkit-e48d279609693b4d164199748c93ad791547c649.zip external_webkit-e48d279609693b4d164199748c93ad791547c649.tar.gz external_webkit-e48d279609693b4d164199748c93ad791547c649.tar.bz2 | |
Cherry-pick WebKit change r96779 to fix window.location
See http://trac.webkit.org/changeset/96779
Note that a conflict occurred in Source/WebCore/platform/qt/KURLQt.cpp but the
change is not required.
Bug: 2159848
Change-Id: I56e645b2f187302c6f1858c8c6c291209f130cad
Diffstat (limited to 'Source/WebCore/loader')
| -rw-r--r-- | Source/WebCore/loader/FrameLoader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp index f999fdb..670cf1f 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp @@ -993,7 +993,8 @@ void FrameLoader::loadArchive(PassRefPtr<Archive> prpArchive) ObjectContentType FrameLoader::defaultObjectContentType(const KURL& url, const String& mimeTypeIn, bool shouldPreferPlugInsForImages) { String mimeType = mimeTypeIn; - String extension = url.path().substring(url.path().reverseFind('.') + 1); + String decodedPath = decodeURLEscapeSequences(url.path()); + String extension = decodedPath.substring(decodedPath.reverseFind('.') + 1); // We don't use MIMETypeRegistry::getMIMETypeForPath() because it returns "application/octet-stream" upon failure if (mimeType.isEmpty()) |