| Index: Source/core/platform/chromium/support/WebURLRequest.cpp
|
| diff --git a/Source/core/platform/chromium/support/WebURLRequest.cpp b/Source/core/platform/chromium/support/WebURLRequest.cpp
|
| deleted file mode 100644
|
| index f996a709e545f3abf964cd9b701e8dad600dd637..0000000000000000000000000000000000000000
|
| --- a/Source/core/platform/chromium/support/WebURLRequest.cpp
|
| +++ /dev/null
|
| @@ -1,350 +0,0 @@
|
| -/*
|
| - * Copyright (C) 2009 Google Inc. All rights reserved.
|
| - *
|
| - * Redistribution and use in source and binary forms, with or without
|
| - * modification, are permitted provided that the following conditions are
|
| - * met:
|
| - *
|
| - * * Redistributions of source code must retain the above copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| - * * Redistributions in binary form must reproduce the above
|
| - * copyright notice, this list of conditions and the following disclaimer
|
| - * in the documentation and/or other materials provided with the
|
| - * distribution.
|
| - * * Neither the name of Google Inc. nor the names of its
|
| - * contributors may be used to endorse or promote products derived from
|
| - * this software without specific prior written permission.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
| - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
| - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
| - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
| - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
| - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
| - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| - */
|
| -
|
| -#include "config.h"
|
| -#include "public/platform/WebURLRequest.h"
|
| -
|
| -#include "core/platform/chromium/support/WebURLRequestPrivate.h"
|
| -#include "core/platform/network/ResourceRequest.h"
|
| -#include "public/platform/WebHTTPBody.h"
|
| -#include "public/platform/WebHTTPHeaderVisitor.h"
|
| -#include "public/platform/WebURL.h"
|
| -
|
| -using namespace WebCore;
|
| -
|
| -namespace WebKit {
|
| -
|
| -namespace {
|
| -
|
| -class ExtraDataContainer : public ResourceRequest::ExtraData {
|
| -public:
|
| - static PassRefPtr<ExtraDataContainer> create(WebURLRequest::ExtraData* extraData) { return adoptRef(new ExtraDataContainer(extraData)); }
|
| -
|
| - virtual ~ExtraDataContainer() { }
|
| -
|
| - WebURLRequest::ExtraData* extraData() const { return m_extraData.get(); }
|
| -
|
| -private:
|
| - explicit ExtraDataContainer(WebURLRequest::ExtraData* extraData)
|
| - : m_extraData(adoptPtr(extraData))
|
| - {
|
| - }
|
| -
|
| - OwnPtr<WebURLRequest::ExtraData> m_extraData;
|
| -};
|
| -
|
| -} // namespace
|
| -
|
| -// The standard implementation of WebURLRequestPrivate, which maintains
|
| -// ownership of a ResourceRequest instance.
|
| -class WebURLRequestPrivateImpl : public WebURLRequestPrivate {
|
| -public:
|
| - WebURLRequestPrivateImpl()
|
| - {
|
| - m_resourceRequest = &m_resourceRequestAllocation;
|
| - }
|
| -
|
| - WebURLRequestPrivateImpl(const WebURLRequestPrivate* p)
|
| - : m_resourceRequestAllocation(*p->m_resourceRequest)
|
| - {
|
| - m_resourceRequest = &m_resourceRequestAllocation;
|
| - m_allowStoredCredentials = p->m_allowStoredCredentials;
|
| - }
|
| -
|
| - virtual void dispose() { delete this; }
|
| -
|
| -private:
|
| - virtual ~WebURLRequestPrivateImpl() { }
|
| -
|
| - ResourceRequest m_resourceRequestAllocation;
|
| -};
|
| -
|
| -void WebURLRequest::initialize()
|
| -{
|
| - assign(new WebURLRequestPrivateImpl());
|
| -}
|
| -
|
| -void WebURLRequest::reset()
|
| -{
|
| - assign(0);
|
| -}
|
| -
|
| -void WebURLRequest::assign(const WebURLRequest& r)
|
| -{
|
| - if (&r != this)
|
| - assign(r.m_private ? new WebURLRequestPrivateImpl(r.m_private) : 0);
|
| -}
|
| -
|
| -bool WebURLRequest::isNull() const
|
| -{
|
| - return !m_private || m_private->m_resourceRequest->isNull();
|
| -}
|
| -
|
| -WebURL WebURLRequest::url() const
|
| -{
|
| - return m_private->m_resourceRequest->url();
|
| -}
|
| -
|
| -void WebURLRequest::setURL(const WebURL& url)
|
| -{
|
| - m_private->m_resourceRequest->setURL(url);
|
| -}
|
| -
|
| -WebURL WebURLRequest::firstPartyForCookies() const
|
| -{
|
| - return m_private->m_resourceRequest->firstPartyForCookies();
|
| -}
|
| -
|
| -void WebURLRequest::setFirstPartyForCookies(const WebURL& firstPartyForCookies)
|
| -{
|
| - m_private->m_resourceRequest->setFirstPartyForCookies(firstPartyForCookies);
|
| -}
|
| -
|
| -bool WebURLRequest::allowCookies() const
|
| -{
|
| - return m_private->m_resourceRequest->allowCookies();
|
| -}
|
| -
|
| -void WebURLRequest::setAllowCookies(bool allowCookies)
|
| -{
|
| - m_private->m_resourceRequest->setAllowCookies(allowCookies);
|
| -}
|
| -
|
| -bool WebURLRequest::allowStoredCredentials() const
|
| -{
|
| - return m_private->m_allowStoredCredentials;
|
| -}
|
| -
|
| -void WebURLRequest::setAllowStoredCredentials(bool allowStoredCredentials)
|
| -{
|
| - m_private->m_allowStoredCredentials = allowStoredCredentials;
|
| -}
|
| -
|
| -WebURLRequest::CachePolicy WebURLRequest::cachePolicy() const
|
| -{
|
| - return static_cast<WebURLRequest::CachePolicy>(
|
| - m_private->m_resourceRequest->cachePolicy());
|
| -}
|
| -
|
| -void WebURLRequest::setCachePolicy(CachePolicy cachePolicy)
|
| -{
|
| - m_private->m_resourceRequest->setCachePolicy(
|
| - static_cast<ResourceRequestCachePolicy>(cachePolicy));
|
| -}
|
| -
|
| -WebString WebURLRequest::httpMethod() const
|
| -{
|
| - return m_private->m_resourceRequest->httpMethod();
|
| -}
|
| -
|
| -void WebURLRequest::setHTTPMethod(const WebString& httpMethod)
|
| -{
|
| - m_private->m_resourceRequest->setHTTPMethod(httpMethod);
|
| -}
|
| -
|
| -WebString WebURLRequest::httpHeaderField(const WebString& name) const
|
| -{
|
| - return m_private->m_resourceRequest->httpHeaderField(name);
|
| -}
|
| -
|
| -void WebURLRequest::setHTTPHeaderField(const WebString& name, const WebString& value)
|
| -{
|
| - m_private->m_resourceRequest->setHTTPHeaderField(name, value);
|
| -}
|
| -
|
| -void WebURLRequest::addHTTPHeaderField(const WebString& name, const WebString& value)
|
| -{
|
| - m_private->m_resourceRequest->addHTTPHeaderField(name, value);
|
| -}
|
| -
|
| -void WebURLRequest::clearHTTPHeaderField(const WebString& name)
|
| -{
|
| - m_private->m_resourceRequest->clearHTTPHeaderField(name);
|
| -}
|
| -
|
| -void WebURLRequest::visitHTTPHeaderFields(WebHTTPHeaderVisitor* visitor) const
|
| -{
|
| - const HTTPHeaderMap& map = m_private->m_resourceRequest->httpHeaderFields();
|
| - for (HTTPHeaderMap::const_iterator it = map.begin(); it != map.end(); ++it)
|
| - visitor->visitHeader(it->key, it->value);
|
| -}
|
| -
|
| -WebHTTPBody WebURLRequest::httpBody() const
|
| -{
|
| - return WebHTTPBody(m_private->m_resourceRequest->httpBody());
|
| -}
|
| -
|
| -void WebURLRequest::setHTTPBody(const WebHTTPBody& httpBody)
|
| -{
|
| - m_private->m_resourceRequest->setHTTPBody(httpBody);
|
| -}
|
| -
|
| -bool WebURLRequest::reportUploadProgress() const
|
| -{
|
| - return m_private->m_resourceRequest->reportUploadProgress();
|
| -}
|
| -
|
| -void WebURLRequest::setReportUploadProgress(bool reportUploadProgress)
|
| -{
|
| - m_private->m_resourceRequest->setReportUploadProgress(reportUploadProgress);
|
| -}
|
| -
|
| -bool WebURLRequest::reportLoadTiming() const
|
| -{
|
| - return m_private->m_resourceRequest->reportLoadTiming();
|
| -}
|
| -
|
| -void WebURLRequest::setReportRawHeaders(bool reportRawHeaders)
|
| -{
|
| - m_private->m_resourceRequest->setReportRawHeaders(reportRawHeaders);
|
| -}
|
| -
|
| -bool WebURLRequest::reportRawHeaders() const
|
| -{
|
| - return m_private->m_resourceRequest->reportRawHeaders();
|
| -}
|
| -
|
| -void WebURLRequest::setReportLoadTiming(bool reportLoadTiming)
|
| -{
|
| - m_private->m_resourceRequest->setReportLoadTiming(reportLoadTiming);
|
| -}
|
| -
|
| -WebURLRequest::TargetType WebURLRequest::targetType() const
|
| -{
|
| - // FIXME: Temporary special case until downstream chromium.org knows of the new TargetTypes.
|
| - TargetType targetType = static_cast<TargetType>(m_private->m_resourceRequest->targetType());
|
| - if (targetType == TargetIsTextTrack || targetType == TargetIsUnspecified)
|
| - return TargetIsSubresource;
|
| - return targetType;
|
| -}
|
| -
|
| -bool WebURLRequest::hasUserGesture() const
|
| -{
|
| - return m_private->m_resourceRequest->hasUserGesture();
|
| -}
|
| -
|
| -void WebURLRequest::setHasUserGesture(bool hasUserGesture)
|
| -{
|
| - m_private->m_resourceRequest->setHasUserGesture(hasUserGesture);
|
| -}
|
| -
|
| -void WebURLRequest::setTargetType(TargetType targetType)
|
| -{
|
| - m_private->m_resourceRequest->setTargetType(
|
| - static_cast<ResourceRequest::TargetType>(targetType));
|
| -}
|
| -
|
| -int WebURLRequest::requestorID() const
|
| -{
|
| - return m_private->m_resourceRequest->requestorID();
|
| -}
|
| -
|
| -void WebURLRequest::setRequestorID(int requestorID)
|
| -{
|
| - m_private->m_resourceRequest->setRequestorID(requestorID);
|
| -}
|
| -
|
| -int WebURLRequest::requestorProcessID() const
|
| -{
|
| - return m_private->m_resourceRequest->requestorProcessID();
|
| -}
|
| -
|
| -void WebURLRequest::setRequestorProcessID(int requestorProcessID)
|
| -{
|
| - m_private->m_resourceRequest->setRequestorProcessID(requestorProcessID);
|
| -}
|
| -
|
| -int WebURLRequest::appCacheHostID() const
|
| -{
|
| - return m_private->m_resourceRequest->appCacheHostID();
|
| -}
|
| -
|
| -void WebURLRequest::setAppCacheHostID(int appCacheHostID)
|
| -{
|
| - m_private->m_resourceRequest->setAppCacheHostID(appCacheHostID);
|
| -}
|
| -
|
| -bool WebURLRequest::downloadToFile() const
|
| -{
|
| - return m_private->m_resourceRequest->downloadToFile();
|
| -}
|
| -
|
| -void WebURLRequest::setDownloadToFile(bool downloadToFile)
|
| -{
|
| - m_private->m_resourceRequest->setDownloadToFile(downloadToFile);
|
| -}
|
| -
|
| -WebURLRequest::ExtraData* WebURLRequest::extraData() const
|
| -{
|
| - RefPtr<ResourceRequest::ExtraData> data = m_private->m_resourceRequest->extraData();
|
| - if (!data)
|
| - return 0;
|
| - return static_cast<ExtraDataContainer*>(data.get())->extraData();
|
| -}
|
| -
|
| -void WebURLRequest::setExtraData(WebURLRequest::ExtraData* extraData)
|
| -{
|
| - m_private->m_resourceRequest->setExtraData(ExtraDataContainer::create(extraData));
|
| -}
|
| -
|
| -ResourceRequest& WebURLRequest::toMutableResourceRequest()
|
| -{
|
| - ASSERT(m_private);
|
| - ASSERT(m_private->m_resourceRequest);
|
| -
|
| - return *m_private->m_resourceRequest;
|
| -}
|
| -
|
| -WebURLRequest::Priority WebURLRequest::priority() const
|
| -{
|
| - return static_cast<WebURLRequest::Priority>(
|
| - m_private->m_resourceRequest->priority());
|
| -}
|
| -
|
| -const ResourceRequest& WebURLRequest::toResourceRequest() const
|
| -{
|
| - ASSERT(m_private);
|
| - ASSERT(m_private->m_resourceRequest);
|
| -
|
| - return *m_private->m_resourceRequest;
|
| -}
|
| -
|
| -void WebURLRequest::assign(WebURLRequestPrivate* p)
|
| -{
|
| - // Subclasses may call this directly so a self-assignment check is needed
|
| - // here as well as in the public assign method.
|
| - if (m_private == p)
|
| - return;
|
| - if (m_private)
|
| - m_private->dispose();
|
| - m_private = p;
|
| -}
|
| -
|
| -} // namespace WebKit
|
|
|