From 238a281b9b69ad9e537dbd285d9ef5463377f510 Mon Sep 17 00:00:00 2001 From: andersca Date: Sun, 8 Oct 2006 01:08:27 +0000 Subject: [PATCH] 2006-10-07 Anders Carlsson Reviewed by Maciej. Remove crossDomain, it was unused and is one of the last functions that use DeprecatedStringList. * loader/loader.cpp: (WebCore::Loader::servePendingRequests): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16886 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebCore/ChangeLog | 8 ++++++++ WebCore/loader/loader.cpp | 27 --------------------------- 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index d51b6bbf2097..58dd7c4a3d42 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,11 @@ +2006-10-07 Anders Carlsson + + Reviewed by Maciej. + + Remove crossDomain, it was unused and is one of the last functions that use DeprecatedStringList. + * loader/loader.cpp: + (WebCore::Loader::servePendingRequests): + 2006-10-07 Anders Carlsson Reviewed by Darin. diff --git a/WebCore/loader/loader.cpp b/WebCore/loader/loader.cpp index 650d444fd1f7..adc30143571c 100644 --- a/WebCore/loader/loader.cpp +++ b/WebCore/loader/loader.cpp @@ -44,31 +44,6 @@ namespace WebCore { -static bool crossDomain(const DeprecatedString& a, const DeprecatedString& b) -{ - if (a == b) - return false; - - DeprecatedStringList l1 = DeprecatedStringList::split('.', a); - DeprecatedStringList l2 = DeprecatedStringList::split('.', b); - - while (l1.count() > l2.count()) - l1.pop_front(); - - while (l2.count() > l1.count()) - l2.pop_front(); - - while (l2.count() >= 2) { - if (l1 == l2) - return false; - - l1.pop_front(); - l2.pop_front(); - } - - return true; -} - Loader::Loader() { m_requestsPending.setAutoDelete(true); @@ -107,8 +82,6 @@ void Loader::servePendingRequests() DeprecatedString domain = r.host(); if (req->docLoader()->doc()->isHTMLDocument()) domain = static_cast(req->docLoader()->doc())->domain().deprecatedString(); - if (crossDomain(u.host(), domain)) - loader->addMetaData("cross-domain", "true"); } if (loader->start(req->docLoader())) -- 2.36.0