diff options
| author | Steve Block <steveblock@google.com> | 2012-04-12 08:11:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-12 08:11:56 -0700 |
| commit | 84b96dda1738f816b0ff021d76a16caa9847ee26 (patch) | |
| tree | e79dba6a969753c85e0e87dfada8683d32dab3dc /Source/WebCore/loader | |
| parent | ba8b643c79877a23cd76135cfc0e72918db70892 (diff) | |
| parent | e48d279609693b4d164199748c93ad791547c649 (diff) | |
| download | external_webkit-84b96dda1738f816b0ff021d76a16caa9847ee26.zip external_webkit-84b96dda1738f816b0ff021d76a16caa9847ee26.tar.gz external_webkit-84b96dda1738f816b0ff021d76a16caa9847ee26.tar.bz2 | |
Merge "Cherry-pick WebKit change r96779 to fix window.location"
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()) |