summaryrefslogtreecommitdiffstats
path: root/webkit/api
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-30 22:08:47 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-30 22:08:47 +0000
commit9487e849e3692811cc0f4a96373234176b78a943 (patch)
treefb941ac248f22ea4b74104ea29c58d016b1050cb /webkit/api
parent35cb9e1d4ad928a981a305a8f1d1d805c65e0cd5 (diff)
downloadchromium_src-9487e849e3692811cc0f4a96373234176b78a943.zip
chromium_src-9487e849e3692811cc0f4a96373234176b78a943.tar.gz
chromium_src-9487e849e3692811cc0f4a96373234176b78a943.tar.bz2
Fix layout test failures.
1- We need to be careful when converting from a null WebURL to a GURL since std::string(NULL, 0) crashes. 2- It turns out that in some layout tests, willSendRequest sets the request to null to indicate that we should not follow the redirect. In the few cases I debugged, this was happening because we were redirecting from "localhost" to "127.0.0.1". It seems like we probably need to change the hostname used to load HTTP based layout tests to match what the tests expect. For now, I just commented out the assertion since it was something that I had just newly added. BUG=none TEST=covered by layout tests TBR=dglazkov Review URL: http://codereview.chromium.org/115970 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17291 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/api')
-rw-r--r--webkit/api/public/WebURL.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/api/public/WebURL.h b/webkit/api/public/WebURL.h
index aad9281..f23f71b 100644
--- a/webkit/api/public/WebURL.h
+++ b/webkit/api/public/WebURL.h
@@ -128,7 +128,7 @@ namespace WebKit {
operator GURL() const
{
- return GURL(m_spec.data(), m_spec.length(), m_parsed, m_isValid);
+ return isNull() ? GURL() : GURL(m_spec.data(), m_spec.length(), m_parsed, m_isValid);
}
#endif