summaryrefslogtreecommitdiffstats
path: root/webkit/api/src/WebURLError.cpp
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 00:13:41 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 00:13:41 +0000
commit561b90ed703cd49da7e5c9ed4b19060ed4342e61 (patch)
treee4ae93d24150d9c1c447775e5f182b184d39fd7e /webkit/api/src/WebURLError.cpp
parent54fd1d3ac91d117719f157fad3ead41518865f52 (diff)
downloadchromium_src-561b90ed703cd49da7e5c9ed4b19060ed4342e61.zip
chromium_src-561b90ed703cd49da7e5c9ed4b19060ed4342e61.tar.gz
chromium_src-561b90ed703cd49da7e5c9ed4b19060ed4342e61.tar.bz2
Pull in webkit revision 47912. This involves a build fix matching
http://trac.webkit.org/changeset/47907 where KURL no longer has a single argument constructor. TBR=brettw@chromium.org,michaeln@chromium.org TEST=try server BUG=none Review URL: http://codereview.chromium.org/180049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24980 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/api/src/WebURLError.cpp')
-rw-r--r--webkit/api/src/WebURLError.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/api/src/WebURLError.cpp b/webkit/api/src/WebURLError.cpp
index cd7d72d..08c0be2 100644
--- a/webkit/api/src/WebURLError.cpp
+++ b/webkit/api/src/WebURLError.cpp
@@ -51,7 +51,7 @@ WebURLError& WebURLError::operator=(const ResourceError& error)
else {
domain = error.domain();
reason = error.errorCode();
- unreachableURL = KURL(error.failingURL());
+ unreachableURL = KURL(ParsedURLString, error.failingURL());
}
return *this;
}