[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
kov at webkit.org
kov at webkit.org
Fri Feb 26 22:27:10 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit c5be611a8ceacf3f209902d37b516259792fd097
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Feb 22 17:01:06 2010 +0000
WebCore
2010-02-22 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Reviewed by Xan Lopez.
[Soup] loses information related to message flags when converting from/to Resource{Request,Response}
https://bugs.webkit.org/show_bug.cgi?id=35093
Store message flags in WebCore objects, and set them on the
SoupMessage, when creating one from them.
No behaviour change.
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::fillResponseFromMessage):
* platform/network/soup/ResourceRequest.h:
(WebCore::ResourceRequest::soupMessageFlags):
(WebCore::ResourceRequest::setSoupMessageFlags):
* platform/network/soup/ResourceRequestSoup.cpp:
(WebCore::ResourceRequest::toSoupMessage):
(WebCore::ResourceRequest::updateFromSoupMessage):
* platform/network/soup/ResourceResponse.h:
(WebCore::ResourceResponse::soupMessageFlags):
(WebCore::ResourceResponse::setSoupMessageFlags):
* platform/network/soup/ResourceResponseSoup.cpp:
(WebCore::ResourceResponse::toSoupMessage):
(WebCore::ResourceResponse::updateFromSoupMessage):
WebKit/gtk
2010-02-22 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Reviewed by Xan Lopez.
[Soup] loses information related to message flags when converting from/to Resource{Request,Response}
https://bugs.webkit.org/show_bug.cgi?id=35093
Update the flags that are stored in the request, when the response
is received.
* WebCoreSupport/FrameLoaderClientGtk.cpp:
(WebKit::FrameLoaderClient::dispatchDidReceiveResponse):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55086 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a3a06eb..36c28a0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,30 @@
+2010-02-22 Gustavo Noronha Silva <gns at gnome.org>
+
+ Reviewed by Xan Lopez.
+
+ [Soup] loses information related to message flags when converting from/to Resource{Request,Response}
+ https://bugs.webkit.org/show_bug.cgi?id=35093
+
+ Store message flags in WebCore objects, and set them on the
+ SoupMessage, when creating one from them.
+
+ No behaviour change.
+
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::fillResponseFromMessage):
+ * platform/network/soup/ResourceRequest.h:
+ (WebCore::ResourceRequest::soupMessageFlags):
+ (WebCore::ResourceRequest::setSoupMessageFlags):
+ * platform/network/soup/ResourceRequestSoup.cpp:
+ (WebCore::ResourceRequest::toSoupMessage):
+ (WebCore::ResourceRequest::updateFromSoupMessage):
+ * platform/network/soup/ResourceResponse.h:
+ (WebCore::ResourceResponse::soupMessageFlags):
+ (WebCore::ResourceResponse::setSoupMessageFlags):
+ * platform/network/soup/ResourceResponseSoup.cpp:
+ (WebCore::ResourceResponse::toSoupMessage):
+ (WebCore::ResourceResponse::updateFromSoupMessage):
+
2010-02-22 Steve Block <steveblock at google.com>
Reviewed by Nate Chapin.
diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
index 899d4fe..965826d 100644
--- a/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2008 Alp Toker <alp at atoker.com>
* Copyright (C) 2008 Xan Lopez <xan at gnome.org>
- * Copyright (C) 2008 Collabora Ltd.
+ * Copyright (C) 2008, 2010 Collabora Ltd.
* Copyright (C) 2009 Holger Hans Peter Freyther
* Copyright (C) 2009 Gustavo Noronha Silva <gns at gnome.org>
* Copyright (C) 2009 Christian Dywan <christian at imendio.com>
diff --git a/WebCore/platform/network/soup/ResourceRequest.h b/WebCore/platform/network/soup/ResourceRequest.h
index 8270863..a1d916f 100644
--- a/WebCore/platform/network/soup/ResourceRequest.h
+++ b/WebCore/platform/network/soup/ResourceRequest.h
@@ -37,27 +37,32 @@ namespace WebCore {
public:
ResourceRequest(const String& url)
: ResourceRequestBase(KURL(ParsedURLString, url), UseProtocolCachePolicy)
+ , m_soupFlags(static_cast<SoupMessageFlags>(0))
{
}
ResourceRequest(const KURL& url)
: ResourceRequestBase(url, UseProtocolCachePolicy)
+ , m_soupFlags(static_cast<SoupMessageFlags>(0))
{
}
ResourceRequest(const KURL& url, const String& referrer, ResourceRequestCachePolicy policy = UseProtocolCachePolicy)
: ResourceRequestBase(url, policy)
+ , m_soupFlags(static_cast<SoupMessageFlags>(0))
{
setHTTPReferrer(referrer);
}
ResourceRequest()
: ResourceRequestBase(KURL(), UseProtocolCachePolicy)
+ , m_soupFlags(static_cast<SoupMessageFlags>(0))
{
}
ResourceRequest(SoupMessage* soupMessage)
: ResourceRequestBase(KURL(), UseProtocolCachePolicy)
+ , m_soupFlags(static_cast<SoupMessageFlags>(0))
{
updateFromSoupMessage(soupMessage);
}
@@ -65,9 +70,14 @@ namespace WebCore {
SoupMessage* toSoupMessage() const;
void updateFromSoupMessage(SoupMessage* soupMessage);
+ SoupMessageFlags soupMessageFlags() const { return m_soupFlags; }
+ void setSoupMessageFlags(SoupMessageFlags soupFlags) { m_soupFlags = soupFlags; }
+
private:
friend class ResourceRequestBase;
+ SoupMessageFlags m_soupFlags;
+
void doUpdatePlatformRequest() {};
void doUpdateResourceRequest() {};
};
diff --git a/WebCore/platform/network/soup/ResourceRequestSoup.cpp b/WebCore/platform/network/soup/ResourceRequestSoup.cpp
index d2c46a6..885e2f3 100644
--- a/WebCore/platform/network/soup/ResourceRequestSoup.cpp
+++ b/WebCore/platform/network/soup/ResourceRequestSoup.cpp
@@ -23,6 +23,8 @@
#include "CString.h"
#include "GOwnPtr.h"
#include "GOwnPtrGtk.h"
+#include "HTTPParsers.h"
+#include "MIMETypeRegistry.h"
#include "PlatformString.h"
#include <libsoup/soup.h>
@@ -53,6 +55,8 @@ SoupMessage* ResourceRequest::toSoupMessage() const
}
#endif
+ soup_message_set_flags(soupMessage, m_soupFlags);
+
// Body data is only handled at ResourceHandleSoup::startHttp for
// now; this is because this may not be a good place to go
// openning and mmapping files. We should maybe revisit this.
@@ -86,6 +90,8 @@ void ResourceRequest::updateFromSoupMessage(SoupMessage* soupMessage)
}
#endif
+ m_soupFlags = soup_message_get_flags(soupMessage);
+
// FIXME: m_allowCookies should probably be handled here and on
// doUpdatePlatformRequest somehow.
}
diff --git a/WebCore/platform/network/soup/ResourceResponse.h b/WebCore/platform/network/soup/ResourceResponse.h
index ecd9f21..e6d872c 100644
--- a/WebCore/platform/network/soup/ResourceResponse.h
+++ b/WebCore/platform/network/soup/ResourceResponse.h
@@ -36,6 +36,7 @@ class ResourceResponse : public ResourceResponseBase {
public:
ResourceResponse()
: ResourceResponseBase()
+ , m_soupFlags(static_cast<SoupMessageFlags>(0))
{
}
@@ -46,6 +47,7 @@ public:
ResourceResponse(SoupMessage* soupMessage)
: ResourceResponseBase()
+ , m_soupFlags(static_cast<SoupMessageFlags>(0))
{
updateFromSoupMessage(soupMessage);
}
@@ -53,9 +55,14 @@ public:
SoupMessage* toSoupMessage() const;
void updateFromSoupMessage(SoupMessage* soupMessage);
+ SoupMessageFlags soupMessageFlags() const { return m_soupFlags; }
+ void setSoupMessageFlags(SoupMessageFlags soupFlags) { m_soupFlags = soupFlags; }
+
private:
friend class ResourceResponseBase;
+ SoupMessageFlags m_soupFlags;
+
void doUpdateResourceResponse()
{
}
diff --git a/WebCore/platform/network/soup/ResourceResponseSoup.cpp b/WebCore/platform/network/soup/ResourceResponseSoup.cpp
index dcdf236..1bff3dc 100644
--- a/WebCore/platform/network/soup/ResourceResponseSoup.cpp
+++ b/WebCore/platform/network/soup/ResourceResponseSoup.cpp
@@ -48,6 +48,8 @@ SoupMessage* ResourceResponse::toSoupMessage() const
soup_message_headers_append(soupHeaders, it->first.string().utf8().data(), it->second.utf8().data());
}
+ soup_message_set_flags(soupMessage, m_soupFlags);
+
// Body data is not in the message.
return soupMessage;
}
@@ -68,6 +70,8 @@ void ResourceResponse::updateFromSoupMessage(SoupMessage* soupMessage)
while (soup_message_headers_iter_next(&headersIter, &headerName, &headerValue))
m_httpHeaderFields.set(String::fromUTF8(headerName), String::fromUTF8(headerValue));
+ m_soupFlags = soup_message_get_flags(soupMessage);
+
String contentType = soup_message_headers_get_one(soupMessage->response_headers, "Content-Type");
setMimeType(extractMIMETypeFromMediaType(contentType));
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 43d2d20..d2a6d7b 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,24 @@
+2010-02-22 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
+ Reviewed by Xan Lopez.
+
+ [Soup] loses information related to message flags when converting from/to Resource{Request,Response}
+ https://bugs.webkit.org/show_bug.cgi?id=35093
+
+ Update the flags that are stored in the request, when the response
+ is received.
+
+ * WebCoreSupport/FrameLoaderClientGtk.cpp:
+ (WebKit::FrameLoaderClient::dispatchDidReceiveResponse):
+
+2010-02-20 Gustavo Noronha Silva <gns at gnome.org>
+
+ Unreviewed. Trivial fix - unnecessary variable got added by
+ mistake.
+
+ * WebCoreSupport/FrameLoaderClientGtk.cpp:
+ (WebKit::FrameLoaderClient::dispatchDidReceiveResponse):
+
2010-02-18 Diego Escalante Urrelo <descalante at igalia.com>
Reviewed by Gustavo Noronha Silva.
diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index f900f05..638327f 100644
--- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -276,8 +276,12 @@ void FrameLoaderClient::frameLoaderDestroyed()
delete this;
}
-void FrameLoaderClient::dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long, const ResourceResponse& response)
+void FrameLoaderClient::dispatchDidReceiveResponse(WebCore::DocumentLoader* loader, unsigned long, const ResourceResponse& response)
{
+ // Update our knowledge of request soup flags - some are only set
+ // after the request is done.
+ loader->request().setSoupMessageFlags(response.soupMessageFlags());
+
m_response = response;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list