Diff
Modified: trunk/Source/WebCore/ChangeLog (195449 => 195450)
--- trunk/Source/WebCore/ChangeLog 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/ChangeLog 2016-01-22 14:51:16 UTC (rev 195450)
@@ -1,3 +1,58 @@
+2016-01-22 Youenn Fablet <[email protected]>
+
+ Remove PassRefPtr from ResourceRequest and FormData
+ https://bugs.webkit.org/show_bug.cgi?id=153229
+
+ Reviewed by Chris Dumez.
+
+ Covered by existing tests.
+
+ Making ResourceRequest::setHTTPBody take a RefPtr<FormData>&&.
+ Moving FormData from PassRefPtr to RefPtr.
+
+ * html/parser/XSSAuditorDelegate.cpp:
+ (WebCore::XSSAuditorDelegate::didBlockScript):
+ * loader/FormSubmission.cpp:
+ (WebCore::FormSubmission::populateFrameLoadRequest):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::loadPostRequest):
+ (WebCore::FrameLoader::loadDifferentDocumentItem):
+ * loader/PingLoader.cpp:
+ (WebCore::PingLoader::sendViolationReport):
+ * loader/PingLoader.h:
+ * page/ContentSecurityPolicy.cpp:
+ (WebCore::ContentSecurityPolicy::reportViolation):
+ * platform/network/FormData.cpp:
+ (WebCore::FormData::create):
+ (WebCore::FormData::createMultiPart):
+ (WebCore::FormData::copy):
+ (WebCore::FormData::deepCopy):
+ (WebCore::FormData::resolveBlobReferences):
+ * platform/network/FormData.h:
+ (WebCore::FormData::decode):
+ * platform/network/ResourceRequestBase.cpp:
+ (WebCore::ResourceRequestBase::adopt):
+ (WebCore::ResourceRequestBase::setHTTPBody):
+ * platform/network/ResourceRequestBase.h:
+ (WebCore::ResourceRequestBase::setHTTPBody):
+ * platform/network/cf/FormDataStreamCFNet.cpp:
+ (WebCore::setHTTPBody):
+ * platform/network/cf/FormDataStreamCFNet.h:
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ (WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
+ (WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties):
+ * platform/network/cocoa/ResourceRequestCocoa.mm:
+ (WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
+ * platform/network/curl/ResourceHandleManager.cpp:
+ (WebCore::getFormElementsCount):
+ * platform/network/mac/FormDataStreamMac.h:
+ * platform/network/mac/FormDataStreamMac.mm:
+ (WebCore::setHTTPBody):
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::doRedirect):
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::createRequest):
+
2016-01-22 Csaba Osztrogonác <[email protected]>
Fix the !ENABLE(INDEXED_DATABASE) build after r195443
Modified: trunk/Source/WebCore/loader/FormSubmission.cpp (195449 => 195450)
--- trunk/Source/WebCore/loader/FormSubmission.cpp 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/loader/FormSubmission.cpp 2016-01-22 14:51:16 UTC (rev 195450)
@@ -258,7 +258,7 @@
if (m_method == FormSubmission::PostMethod) {
frameRequest.resourceRequest().setHTTPMethod("POST");
- frameRequest.resourceRequest().setHTTPBody(m_formData);
+ frameRequest.resourceRequest().setHTTPBody(m_formData.copyRef());
// construct some user headers if necessary
if (m_boundary.isEmpty())
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (195449 => 195450)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2016-01-22 14:51:16 UTC (rev 195450)
@@ -2654,7 +2654,6 @@
const ResourceRequest& inRequest = request.resourceRequest();
const URL& url = ""
- RefPtr<FormData> formData = inRequest.httpBody();
const String& contentType = inRequest.httpContentType();
String origin = inRequest.httpOrigin();
@@ -2664,7 +2663,7 @@
workingResourceRequest.setHTTPReferrer(referrer);
workingResourceRequest.setHTTPOrigin(origin);
workingResourceRequest.setHTTPMethod("POST");
- workingResourceRequest.setHTTPBody(formData);
+ workingResourceRequest.setHTTPBody(inRequest.httpBody());
workingResourceRequest.setHTTPContentType(contentType);
addExtraFieldsToRequest(workingResourceRequest, loadType, true);
@@ -3299,7 +3298,7 @@
formData->generateFiles(m_frame.document());
request.setHTTPMethod("POST");
- request.setHTTPBody(formData);
+ request.setHTTPBody(WTFMove(formData));
request.setHTTPContentType(item.formContentType());
RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::createFromString(item.referrer());
addHTTPOriginIfNeeded(request, securityOrigin->toString());
Modified: trunk/Source/WebCore/loader/PingLoader.cpp (195449 => 195450)
--- trunk/Source/WebCore/loader/PingLoader.cpp 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/loader/PingLoader.cpp 2016-01-22 14:51:16 UTC (rev 195450)
@@ -123,7 +123,7 @@
startPingLoad(frame, request);
}
-void PingLoader::sendViolationReport(Frame& frame, const URL& reportURL, PassRefPtr<FormData> report)
+void PingLoader::sendViolationReport(Frame& frame, const URL& reportURL, RefPtr<FormData>&& report)
{
ResourceRequest request(reportURL);
@@ -134,7 +134,7 @@
request.setHTTPMethod("POST");
request.setHTTPContentType("application/json");
- request.setHTTPBody(report);
+ request.setHTTPBody(WTFMove(report));
bool removeCookies = true;
if (Document* document = frame.document()) {
Modified: trunk/Source/WebCore/loader/PingLoader.h (195449 => 195450)
--- trunk/Source/WebCore/loader/PingLoader.h 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/loader/PingLoader.h 2016-01-22 14:51:16 UTC (rev 195450)
@@ -32,7 +32,7 @@
#ifndef PingLoader_h
#define PingLoader_h
-#include <wtf/PassRefPtr.h>
+#include <wtf/RefPtr.h>
namespace WebCore {
@@ -45,7 +45,7 @@
public:
static void loadImage(Frame&, const URL&);
static void sendPing(Frame&, const URL& pingURL, const URL& destinationURL);
- static void sendViolationReport(Frame&, const URL& reportURL, PassRefPtr<FormData> report);
+ static void sendViolationReport(Frame&, const URL& reportURL, RefPtr<FormData>&& report);
private:
static void startPingLoad(Frame&, ResourceRequest&);
Modified: trunk/Source/WebCore/page/ContentSecurityPolicy.cpp (195449 => 195450)
--- trunk/Source/WebCore/page/ContentSecurityPolicy.cpp 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/page/ContentSecurityPolicy.cpp 2016-01-22 14:51:16 UTC (rev 195450)
@@ -1672,7 +1672,7 @@
RefPtr<FormData> report = FormData::create(reportObject->toJSONString().utf8());
for (const auto& url : reportURIs)
- PingLoader::sendViolationReport(*frame, url, report);
+ PingLoader::sendViolationReport(*frame, url, report.copyRef());
}
void ContentSecurityPolicy::reportUnsupportedDirective(const String& name) const
Modified: trunk/Source/WebCore/platform/network/FormData.cpp (195449 => 195450)
--- trunk/Source/WebCore/platform/network/FormData.cpp 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/platform/network/FormData.cpp 2016-01-22 14:51:16 UTC (rev 195450)
@@ -70,54 +70,54 @@
removeGeneratedFilesIfNeeded();
}
-PassRefPtr<FormData> FormData::create()
+Ref<FormData> FormData::create()
{
- return adoptRef(new FormData);
+ return adoptRef(*new FormData);
}
-PassRefPtr<FormData> FormData::create(const void* data, size_t size)
+Ref<FormData> FormData::create(const void* data, size_t size)
{
- RefPtr<FormData> result = create();
+ Ref<FormData> result = create();
result->appendData(data, size);
- return result.release();
+ return result;
}
-PassRefPtr<FormData> FormData::create(const CString& string)
+Ref<FormData> FormData::create(const CString& string)
{
- RefPtr<FormData> result = create();
+ Ref<FormData> result = create();
result->appendData(string.data(), string.length());
- return result.release();
+ return result;
}
-PassRefPtr<FormData> FormData::create(const Vector<char>& vector)
+Ref<FormData> FormData::create(const Vector<char>& vector)
{
- RefPtr<FormData> result = create();
+ Ref<FormData> result = create();
result->appendData(vector.data(), vector.size());
- return result.release();
+ return result;
}
-PassRefPtr<FormData> FormData::create(const FormDataList& list, const TextEncoding& encoding, EncodingType encodingType)
+Ref<FormData> FormData::create(const FormDataList& list, const TextEncoding& encoding, EncodingType encodingType)
{
- RefPtr<FormData> result = create();
+ Ref<FormData> result = create();
result->appendKeyValuePairItems(list, encoding, false, 0, encodingType);
- return result.release();
+ return result;
}
-PassRefPtr<FormData> FormData::createMultiPart(const FormDataList& list, const TextEncoding& encoding, Document* document)
+Ref<FormData> FormData::createMultiPart(const FormDataList& list, const TextEncoding& encoding, Document* document)
{
- RefPtr<FormData> result = create();
+ Ref<FormData> result = create();
result->appendKeyValuePairItems(list, encoding, true, document);
- return result.release();
+ return result;
}
-PassRefPtr<FormData> FormData::copy() const
+Ref<FormData> FormData::copy() const
{
- return adoptRef(new FormData(*this));
+ return adoptRef(*new FormData(*this));
}
-PassRefPtr<FormData> FormData::deepCopy() const
+Ref<FormData> FormData::deepCopy() const
{
- RefPtr<FormData> formData(create());
+ Ref<FormData> formData(create());
formData->m_alwaysStream = m_alwaysStream;
@@ -135,7 +135,7 @@
break;
}
}
- return formData.release();
+ return formData;
}
void FormData::appendData(const void* data, size_t size)
@@ -302,7 +302,7 @@
}
}
-PassRefPtr<FormData> FormData::resolveBlobReferences()
+Ref<FormData> FormData::resolveBlobReferences()
{
// First check if any blobs needs to be resolved, or we can take the fast path.
bool hasBlob = false;
@@ -316,10 +316,10 @@
}
if (!hasBlob)
- return this;
+ return *this;
// Create a copy to append the result into.
- RefPtr<FormData> newFormData = FormData::create();
+ Ref<FormData> newFormData = FormData::create();
newFormData->setAlwaysStream(alwaysStream());
newFormData->setIdentifier(identifier());
it = elements().begin();
@@ -330,11 +330,11 @@
else if (element.m_type == FormDataElement::Type::EncodedFile)
newFormData->appendFileRange(element.m_filename, element.m_fileStart, element.m_fileLength, element.m_expectedFileModificationTime, element.m_shouldGenerateFile);
else if (element.m_type == FormDataElement::Type::EncodedBlob)
- appendBlobResolved(newFormData.get(), element.m_url);
+ appendBlobResolved(newFormData.ptr(), element.m_url);
else
ASSERT_NOT_REACHED();
}
- return newFormData.release();
+ return newFormData;
}
void FormData::generateFiles(Document* document)
Modified: trunk/Source/WebCore/platform/network/FormData.h (195449 => 195450)
--- trunk/Source/WebCore/platform/network/FormData.h 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/platform/network/FormData.h 2016-01-22 14:51:16 UTC (rev 195450)
@@ -194,23 +194,23 @@
MultipartFormData // for multipart/form-data
};
- WEBCORE_EXPORT static PassRefPtr<FormData> create();
- WEBCORE_EXPORT static PassRefPtr<FormData> create(const void*, size_t);
- static PassRefPtr<FormData> create(const CString&);
- static PassRefPtr<FormData> create(const Vector<char>&);
- static PassRefPtr<FormData> create(const FormDataList&, const TextEncoding&, EncodingType = FormURLEncoded);
- static PassRefPtr<FormData> createMultiPart(const FormDataList&, const TextEncoding&, Document*);
+ WEBCORE_EXPORT static Ref<FormData> create();
+ WEBCORE_EXPORT static Ref<FormData> create(const void*, size_t);
+ static Ref<FormData> create(const CString&);
+ static Ref<FormData> create(const Vector<char>&);
+ static Ref<FormData> create(const FormDataList&, const TextEncoding&, EncodingType = FormURLEncoded);
+ static Ref<FormData> createMultiPart(const FormDataList&, const TextEncoding&, Document*);
WEBCORE_EXPORT ~FormData();
// FIXME: Both these functions perform a deep copy of m_elements, but differ in handling of other data members.
// How much of that is intentional? We need better names that explain the difference.
- PassRefPtr<FormData> copy() const;
- PassRefPtr<FormData> deepCopy() const;
+ Ref<FormData> copy() const;
+ Ref<FormData> deepCopy() const;
template<typename Encoder>
void encode(Encoder&) const;
template<typename Decoder>
- static PassRefPtr<FormData> decode(Decoder&);
+ static RefPtr<FormData> decode(Decoder&);
WEBCORE_EXPORT void appendData(const void* data, size_t);
void appendFile(const String& filePath, bool shouldGenerateFile = false);
@@ -223,7 +223,7 @@
// Resolve all blob references so we only have file and data.
// If the FormData has no blob references to resolve, this is returned.
- PassRefPtr<FormData> resolveBlobReferences();
+ Ref<FormData> resolveBlobReferences();
bool isEmpty() const { return m_elements.isEmpty(); }
const Vector<FormDataElement>& elements() const { return m_elements; }
@@ -289,7 +289,7 @@
}
template<typename Decoder>
-PassRefPtr<FormData> FormData::decode(Decoder& decoder)
+RefPtr<FormData> FormData::decode(Decoder& decoder)
{
RefPtr<FormData> data = ""
@@ -305,7 +305,7 @@
if (!decoder.decode(data->m_identifier))
return nullptr;
- return data.release();
+ return data;
}
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp (195449 => 195450)
--- trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2016-01-22 14:51:16 UTC (rev 195450)
@@ -76,7 +76,7 @@
ASSERT(encodingCount <= 3);
request->setResponseContentDispositionEncodingFallbackArray(encoding1, encoding2, encoding3);
}
- request->setHTTPBody(data->httpBody);
+ request->setHTTPBody(data->httpBody.copyRef());
request->setAllowCookies(data->allowCookies);
request->doPlatformAdopt(WTFMove(data));
return request;
@@ -413,11 +413,11 @@
return m_httpBody.get();
}
-void ResourceRequestBase::setHTTPBody(PassRefPtr<FormData> httpBody)
+void ResourceRequestBase::setHTTPBody(RefPtr<FormData>&& httpBody)
{
updateResourceRequest();
- m_httpBody = httpBody;
+ m_httpBody = WTFMove(httpBody);
m_resourceRequestBodyUpdated = true;
Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (195449 => 195450)
--- trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2016-01-22 14:51:16 UTC (rev 195450)
@@ -121,8 +121,8 @@
WEBCORE_EXPORT void setResponseContentDispositionEncodingFallbackArray(const String& encoding1, const String& encoding2 = String(), const String& encoding3 = String());
WEBCORE_EXPORT FormData* httpBody() const;
- WEBCORE_EXPORT void setHTTPBody(PassRefPtr<FormData> httpBody);
-
+ WEBCORE_EXPORT void setHTTPBody(RefPtr<FormData>&&);
+
bool allowCookies() const;
void setAllowCookies(bool allowCookies);
Modified: trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp (195449 => 195450)
--- trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp 2016-01-22 14:51:16 UTC (rev 195450)
@@ -348,10 +348,8 @@
}
}
-void setHTTPBody(CFMutableURLRequestRef request, PassRefPtr<FormData> prpFormData)
+void setHTTPBody(CFMutableURLRequestRef request, FormData* formData)
{
- RefPtr<FormData> formData = prpFormData;
-
if (!formData)
return;
@@ -367,13 +365,14 @@
}
}
- formData = formData->resolveBlobReferences();
- count = formData->elements().size();
+ Ref<FormData> newFormData = formData->resolveBlobReferences();
+ count = newFormData->elements().size();
+
// Precompute the content length so NSURLConnection doesn't use chunked mode.
unsigned long long length = 0;
for (size_t i = 0; i < count; ++i) {
- const FormDataElement& element = formData->elements()[i];
+ const FormDataElement& element = newFormData->elements()[i];
if (element.m_type == FormDataElement::Type::Data)
length += element.m_data.size();
else {
@@ -391,7 +390,7 @@
// Create and set the stream.
// Pass the length along with the formData so it does not have to be recomputed.
- FormCreationContext formContext = { formData.release(), length };
+ FormCreationContext formContext = {WTFMove(newFormData), length};
CFReadStreamCallBacksV1 callBacks = { 1, formCreate, formFinalize, 0, formOpen, 0, formRead, 0, formCanRead, formClose, formCopyProperty, 0, 0, formSchedule, formUnschedule
};
Modified: trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.h (195449 => 195450)
--- trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.h 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.h 2016-01-22 14:51:16 UTC (rev 195450)
@@ -39,7 +39,7 @@
class FormData;
-void setHTTPBody(CFMutableURLRequestRef, PassRefPtr<FormData>);
+void setHTTPBody(CFMutableURLRequestRef, FormData*);
FormData* httpBodyFromStream(CFReadStreamRef);
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (195449 => 195450)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2016-01-22 14:51:16 UTC (rev 195450)
@@ -204,7 +204,7 @@
} else
cfRequest = CFURLRequestCreateMutable(0, url.get(), (CFURLRequestCachePolicy)cachePolicy(), timeoutInterval(), firstPartyForCookies.get());
- RefPtr<FormData> formData = httpBody();
+ FormData* formData = httpBody();
if (formData && !formData->isEmpty())
WebCore::setHTTPBody(cfRequest, formData);
@@ -335,7 +335,7 @@
*this = delegateProvidedRequest;
setPriority(oldPriority);
- setHTTPBody(oldHTTPBody.release());
+ setHTTPBody(WTFMove(oldHTTPBody));
setHiddenFromInspector(isHiddenFromInspector);
setRequester(oldRequester);
}
Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (195449 => 195450)
--- trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2016-01-22 14:51:16 UTC (rev 195450)
@@ -190,7 +190,7 @@
else
nsRequest = [[NSMutableURLRequest alloc] initWithURL:url()];
- RefPtr<FormData> formData = httpBody();
+ FormData* formData = httpBody();
if (formData && !formData->isEmpty())
WebCore::setHTTPBody(nsRequest, formData);
Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (195449 => 195450)
--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2016-01-22 14:51:16 UTC (rev 195450)
@@ -763,9 +763,10 @@
// Resolve the blob elements so the formData can correctly report it's size.
formData = formData->resolveBlobReferences();
- job->firstRequest().setHTTPBody(formData);
+ size_t size = formData->elements().size();
+ job->firstRequest().setHTTPBody(WTFMove(formData));
- return formData->elements().size();
+ return size;
}
static void setupFormData(ResourceHandle* job, CURLoption sizeOption, struct curl_slist** headers)
Modified: trunk/Source/WebCore/platform/network/mac/FormDataStreamMac.h (195449 => 195450)
--- trunk/Source/WebCore/platform/network/mac/FormDataStreamMac.h 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/platform/network/mac/FormDataStreamMac.h 2016-01-22 14:51:16 UTC (rev 195450)
@@ -42,7 +42,7 @@
class FormData;
- void setHTTPBody(NSMutableURLRequest *, PassRefPtr<FormData>);
+ void setHTTPBody(NSMutableURLRequest *, FormData*);
FormData* httpBodyFromStream(NSInputStream *);
CFStringRef formDataStreamLengthPropertyName();
Modified: trunk/Source/WebCore/platform/network/mac/FormDataStreamMac.mm (195449 => 195450)
--- trunk/Source/WebCore/platform/network/mac/FormDataStreamMac.mm 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/platform/network/mac/FormDataStreamMac.mm 2016-01-22 14:51:16 UTC (rev 195450)
@@ -33,7 +33,6 @@
#import "FormData.h"
#import "FormDataStreamCFNet.h"
-#import <wtf/PassRefPtr.h>
@interface NSURLRequest (WebNSURLRequestDetails)
- (CFURLRequestRef)_CFURLRequest;
@@ -41,9 +40,9 @@
namespace WebCore {
-void setHTTPBody(NSMutableURLRequest *request, PassRefPtr<FormData> prpFormData)
+void setHTTPBody(NSMutableURLRequest *request, FormData* formData)
{
- setHTTPBody(const_cast<CFMutableURLRequestRef>([request _CFURLRequest]), prpFormData);
+ setHTTPBody(const_cast<CFMutableURLRequestRef>([request _CFURLRequest]), formData);
}
FormData* httpBodyFromStream(NSInputStream *stream)
Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (195449 => 195450)
--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2016-01-22 14:51:16 UTC (rev 195450)
@@ -506,7 +506,7 @@
// or if current redirection says so
if (message->method == SOUP_METHOD_GET || shouldRedirectAsGET(message, newURL, crossOrigin)) {
newRequest.setHTTPMethod("GET");
- newRequest.setHTTPBody(0);
+ newRequest.setHTTPBody(nullptr);
newRequest.clearHTTPContentType();
}
}
Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (195449 => 195450)
--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2016-01-22 14:51:16 UTC (rev 195450)
@@ -743,7 +743,7 @@
if (m_requestEntityBody) {
ASSERT(m_method != "GET");
ASSERT(m_method != "HEAD");
- request.setHTTPBody(m_requestEntityBody.release());
+ request.setHTTPBody(WTFMove(m_requestEntityBody));
}
if (!m_requestHeaders.isEmpty())
Modified: trunk/Source/WebKit/win/ChangeLog (195449 => 195450)
--- trunk/Source/WebKit/win/ChangeLog 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebKit/win/ChangeLog 2016-01-22 14:51:16 UTC (rev 195450)
@@ -1,3 +1,13 @@
+2016-01-22 Youenn Fablet <[email protected]>
+
+ Remove PassRefPtr from ResourceRequest and FormData
+ https://bugs.webkit.org/show_bug.cgi?id=153229
+
+ Reviewed by Chris Dumez.
+
+ * WebMutableURLRequest.cpp:
+ (WebMutableURLRequest::setHTTPBody):
+
2016-01-15 Simon Fraser <[email protected]>
Remove GraphicsContext::drawConvexPolygon() and GraphicsContext::clipConvexPolygon()
Modified: trunk/Source/WebKit/win/WebMutableURLRequest.cpp (195449 => 195450)
--- trunk/Source/WebKit/win/WebMutableURLRequest.cpp 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebKit/win/WebMutableURLRequest.cpp 2016-01-22 14:51:16 UTC (rev 195450)
@@ -307,7 +307,7 @@
if (FAILED(data->Read(formData, stat.cbSize.LowPart, &bytesRead)))
return E_FAIL;
- m_request.setHTTPBody(httpBody);
+ m_request.setHTTPBody(WTFMove(httpBody));
return S_OK;
}
Modified: trunk/Source/WebKit2/ChangeLog (195449 => 195450)
--- trunk/Source/WebKit2/ChangeLog 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-22 14:51:16 UTC (rev 195450)
@@ -1,3 +1,15 @@
+2016-01-22 Youenn Fablet <[email protected]>
+
+ Remove PassRefPtr from ResourceRequest and FormData
+ https://bugs.webkit.org/show_bug.cgi?id=153229
+
+ Reviewed by Chris Dumez.
+
+ * NetworkProcess/NetworkResourceLoadParameters.cpp:
+ (WebKit::NetworkResourceLoadParameters::decode):
+ * NetworkProcess/cache/NetworkCacheEntry.cpp:
+ (WebKit::NetworkCache::Entry::Entry):
+
2016-01-21 Simon Fraser <[email protected]>
REGRESSION (r168244): Content in horizontal-bt page is offset such that only the end is viewable and there is a white gap at the top
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.cpp (195449 => 195450)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.cpp 2016-01-22 11:06:05 UTC (rev 195449)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.cpp 2016-01-22 14:51:16 UTC (rev 195450)
@@ -121,7 +121,7 @@
RefPtr<FormData> formData = FormData::decode(decoder);
if (!formData)
return false;
- result.request.setHTTPBody(formData.release());
+ result.request.setHTTPBody(WTFMove(formData));
SandboxExtension::HandleArray requestBodySandboxExtensionHandles;
if (!decoder.decode(requestBodySandboxExtensionHandles))
