Commit 813e39b5 authored by weinig@apple.com's avatar weinig@apple.com

2008-06-23 Sam Weinig <sam@webkit.org>

        Rubber-stamped by Tim Hatcher.

        Rename XMLHttpRequest::sameOriginRequest to XMLHttpRequest::makeSameOriginRequest
        and XMLHttpRequest::crossSiteAccessRequest to XMLHttpRequest::makeCrossSiteAccessRequest.

        * xml/XMLHttpRequest.cpp:
        (WebCore::XMLHttpRequest::createRequest):
        (WebCore::XMLHttpRequest::makeSameOriginRequest):
        (WebCore::XMLHttpRequest::makeCrossSiteAccessRequest):
        * xml/XMLHttpRequest.h:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@34742 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 93b29209
2008-06-23 Sam Weinig <sam@webkit.org>
Rubber-stamped by Tim Hatcher.
Rename XMLHttpRequest::sameOriginRequest to XMLHttpRequest::makeSameOriginRequest
and XMLHttpRequest::crossSiteAccessRequest to XMLHttpRequest::makeCrossSiteAccessRequest.
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::createRequest):
(WebCore::XMLHttpRequest::makeSameOriginRequest):
(WebCore::XMLHttpRequest::makeCrossSiteAccessRequest):
* xml/XMLHttpRequest.h:
2008-06-23 Sam Weinig <sam@webkit.org>
Reviewed by Alexey Proskuryakov.
......@@ -433,9 +433,9 @@ void XMLHttpRequest::createRequest(ExceptionCode& ec)
ResourceRequest request;
if (m_sameOriginRequest)
sameOriginRequest(request);
makeSameOriginRequest(request);
else {
crossSiteAccessRequest(request, ec);
makeCrossSiteAccessRequest(request, ec);
if (ec)
return;
if (m_inMethodCheck)
......@@ -450,7 +450,7 @@ void XMLHttpRequest::createRequest(ExceptionCode& ec)
loadRequestSynchronously(request, ec);
}
void XMLHttpRequest::sameOriginRequest(ResourceRequest& request)
void XMLHttpRequest::makeSameOriginRequest(ResourceRequest& request)
{
request.setURL(m_url);
request.setHTTPMethod(m_method);
......@@ -470,7 +470,7 @@ String XMLHttpRequest::accessControlOrigin() const
return accessControlOrigin;
}
void XMLHttpRequest::crossSiteAccessRequest(ResourceRequest& request, ExceptionCode& ec)
void XMLHttpRequest::makeCrossSiteAccessRequest(ResourceRequest& request, ExceptionCode& ec)
{
KURL url = m_url;
url.setUser(String());
......
......@@ -132,8 +132,8 @@ private:
void createRequest(ExceptionCode&);
void sameOriginRequest(ResourceRequest&);
void crossSiteAccessRequest(ResourceRequest&, ExceptionCode&);
void makeSameOriginRequest(ResourceRequest&);
void makeCrossSiteAccessRequest(ResourceRequest&, ExceptionCode&);
void loadRequestSynchronously(ResourceRequest&, ExceptionCode&);
void loadRequestAsynchronously(ResourceRequest&);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment