Attachment 219642 Details for Bug 121430 – Another patch

[patch] Another patch

wk2-network-process-buildifx.diff (text/plain), 3.00 KB, created by Carlos Garcia Campos on 2013-12-19 05:55:03 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2013-12-19 05:55:03 PST

Size: 3.00 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e6d4bf8..6de9bf0 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2013-12-19  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        Buildfix for NetworkResourceLoader::continueWillSendRequest() on !PLATFORM(MAC) platforms
>+        https://bugs.webkit.org/show_bug.cgi?id=121430
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/network/mac/ResourceRequestMac.mm:
>+        (WebCore::ResourceRequest::updateFromDelegatePreservingOldHTTPBody):
>+        Update the ResourceRequest from a new one created with
>+        NSURLRequest using DoNotUpdateHTTPBody flag.
>+
> 2013-12-18  Jer Noble  <jer.noble@apple.com>
> 
>         [MSE][Mac] Add AVSampleBufferRendererSynchronizer support.
>diff --git a/Source/WebCore/platform/network/mac/ResourceRequestMac.mm b/Source/WebCore/platform/network/mac/ResourceRequestMac.mm
>index 8691405..015bea9 100644
>--- a/Source/WebCore/platform/network/mac/ResourceRequestMac.mm
>+++ b/Source/WebCore/platform/network/mac/ResourceRequestMac.mm
>@@ -226,7 +226,7 @@ void ResourceRequest::updateFromDelegatePreservingOldHTTPBody(const ResourceRequ
> {
>     RefPtr<FormData> oldHTTPBody = httpBody();
> 
>-    *this = delegateProvidedRequest;
>+    *this = delegateProvidedRequest.nsURLRequest(DoNotUpdateHTTPBody);
>     setHTTPBody(oldHTTPBody.release());
> }
> 
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 57dd353..67594ab 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,14 @@
>+2013-12-19  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        Buildfix for NetworkResourceLoader::continueWillSendRequest() on !PLATFORM(MAC) platforms
>+        https://bugs.webkit.org/show_bug.cgi?id=121430
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/NetworkResourceLoader.cpp:
>+        (WebKit::NetworkResourceLoader::continueWillSendRequest): Pass the
>+        given ResourceRequest to updateFromDelegatePreservingOldHTTPBody().
>+
> 2013-12-18  Tim Horton  <timothy_horton@apple.com>
> 
>         WebKit2 View Gestures: Move WebProcess-side geometry collection into its own class
>diff --git a/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
>index 2f8a49f..14aec43 100644
>--- a/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
>+++ b/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
>@@ -243,7 +243,7 @@ void NetworkResourceLoader::willSendRequestAsync(ResourceHandle* handle, const R
> 
> void NetworkResourceLoader::continueWillSendRequest(const ResourceRequest& newRequest)
> {
>-    m_suggestedRequestForWillSendRequest.updateFromDelegatePreservingOldHTTPBody(newRequest.nsURLRequest(DoNotUpdateHTTPBody));
>+    m_suggestedRequestForWillSendRequest.updateFromDelegatePreservingOldHTTPBody(newRequest);
> 
>     RunLoop::main()->dispatch(bind(&NetworkResourceLoadScheduler::receivedRedirect, &NetworkProcess::shared().networkResourceLoadScheduler(), this, m_suggestedRequestForWillSendRequest.url()));
>

Flags:

darin: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 121430: 211780 | 219642