summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/win
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2012-03-27 18:40:26 +0100
committerSteve Block <steveblock@google.com>2012-03-28 16:54:59 +0100
commite48d279609693b4d164199748c93ad791547c649 (patch)
tree25780dbbd84520d51c0fd174a299121e0d46f5e2 /Source/WebCore/platform/win
parentc57e584da242d96ba18578a71f4634adc9d1fff6 (diff)
downloadexternal_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/platform/win')
-rw-r--r--Source/WebCore/platform/win/ClipboardWin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/win/ClipboardWin.cpp b/Source/WebCore/platform/win/ClipboardWin.cpp
index 0b5a3d3..2e56cbc 100644
--- a/Source/WebCore/platform/win/ClipboardWin.cpp
+++ b/Source/WebCore/platform/win/ClipboardWin.cpp
@@ -191,7 +191,7 @@ static HGLOBAL createGlobalHDropContent(const KURL& url, String& fileName, Share
WCHAR filePath[MAX_PATH];
if (url.isLocalFile()) {
- String localPath = url.path();
+ String localPath = decodeURLEscapeSequences(url.path());
// windows does not enjoy a leading slash on paths
if (localPath[0] == '/')
localPath = localPath.substring(1);