summaryrefslogtreecommitdiffstats
path: root/WebCore/loader/DocLoader.cpp
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2010-03-04 08:20:19 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-03-04 08:20:19 -0800
commit1c0c5112e9c2ef9e4b14b57ff15ed03500cbdb57 (patch)
treeeaaa012413c2246840a9b91c945581c62f624b4d /WebCore/loader/DocLoader.cpp
parent43f840131d60228987ce230a0d54e9341f743558 (diff)
parentf220314560fcdd9c3188bddf409f31ad7188fefb (diff)
downloadexternal_webkit-1c0c5112e9c2ef9e4b14b57ff15ed03500cbdb57.zip
external_webkit-1c0c5112e9c2ef9e4b14b57ff15ed03500cbdb57.tar.gz
external_webkit-1c0c5112e9c2ef9e4b14b57ff15ed03500cbdb57.tar.bz2
Merge "Use the complete url when blocking images."
Diffstat (limited to 'WebCore/loader/DocLoader.cpp')
-rw-r--r--WebCore/loader/DocLoader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/loader/DocLoader.cpp b/WebCore/loader/DocLoader.cpp
index 54dc733..8c0a1b2 100644
--- a/WebCore/loader/DocLoader.cpp
+++ b/WebCore/loader/DocLoader.cpp
@@ -331,7 +331,7 @@ bool DocLoader::shouldBlockNetworkImage(const String& url) const
if (!m_blockNetworkImage)
return false;
- KURL kurl(ParsedURLString, url);
+ KURL kurl = m_doc->completeURL(url);
if (kurl.protocolIs("http") || kurl.protocolIs("https"))
return true;