Diff
Modified: trunk/Source/WebCore/ChangeLog (230897 => 230898)
--- trunk/Source/WebCore/ChangeLog 2018-04-21 21:58:51 UTC (rev 230897)
+++ trunk/Source/WebCore/ChangeLog 2018-04-22 01:16:25 UTC (rev 230898)
@@ -1,3 +1,37 @@
+2018-04-21 Daniel Bates <daba...@apple.com>
+
+ Cleanup CookieRequestHeaderFieldProxy
+ https://bugs.webkit.org/show_bug.cgi?id=184868
+
+ Reviewed by Youenn Fablet.
+
+ Simplify the struct CookieRequestHeaderFieldProxy and make it consistent with other structs.
+ Among other changes, remove constructors for CookieRequestHeaderFieldProxy as they are
+ unnecessary as all supported compilers support non-static data member initializers (NSDMI)
+ for aggregates, remove prefix "m_" from the name of fields as this is struct exists for
+ convenience and offers no encapsulation and simplify decoding logic of this struct.
+
+ No functionality changed. So, no new tests.
+
+ * loader/CookieJar.cpp:
+ (WebCore::cookieRequestHeaderFieldProxy):
+ * platform/network/CookieRequestHeaderFieldProxy.h:
+ (WebCore::CookieRequestHeaderFieldProxy::encode const):
+ (WebCore::CookieRequestHeaderFieldProxy::decode):
+ (WebCore::CookieRequestHeaderFieldProxy::CookieRequestHeaderFieldProxy): Deleted.
+ * platform/network/SocketStreamHandleImpl.cpp:
+ (WebCore::cookieDataForHandshake):
+ * platform/network/cf/CookieJarCFNet.cpp:
+ (WebCore::cookieRequestHeaderFieldValue):
+ * platform/network/curl/CookieJarCurl.cpp:
+ (WebCore::cookieRequestHeaderFieldValue):
+ * platform/network/curl/CookieJarCurlDatabase.cpp:
+ (WebCore::CookieJarCurlDatabase::cookieRequestHeaderFieldValue const):
+ * platform/network/mac/CookieJarMac.mm:
+ (WebCore::cookieRequestHeaderFieldValue):
+ * platform/network/soup/CookieJarSoup.cpp:
+ (WebCore::cookieRequestHeaderFieldValue):
+
2018-04-21 Antoine Quint <grao...@apple.com>
[Modern Media Controls] Show a loading indicator after pressing the play button in compact mode
Modified: trunk/Source/WebCore/loader/CookieJar.cpp (230897 => 230898)
--- trunk/Source/WebCore/loader/CookieJar.cpp 2018-04-21 21:58:51 UTC (rev 230897)
+++ trunk/Source/WebCore/loader/CookieJar.cpp 2018-04-22 01:16:25 UTC (rev 230898)
@@ -84,12 +84,16 @@
{
TraceScope scope(FetchCookiesStart, FetchCookiesEnd);
- auto includeSecureCookies = shouldIncludeSecureCookies(document, url);
-
- if (auto* frame = document.frame())
- return { storageSession(document).sessionID(), document.firstPartyForCookies(), url, frame->loader().client().frameID(), frame->loader().client().pageID(), includeSecureCookies };
-
- return { storageSession(document).sessionID(), document.firstPartyForCookies(), url, std::nullopt, std::nullopt, includeSecureCookies };
+ CookieRequestHeaderFieldProxy proxy;
+ proxy.sessionID = storageSession(document).sessionID();
+ proxy.firstParty = document.firstPartyForCookies();
+ proxy.url = ""
+ proxy.includeSecureCookies = shouldIncludeSecureCookies(document, url);
+ if (auto* frame = document.frame()) {
+ proxy.frameID = frame->loader().client().frameID();
+ proxy.pageID = frame->loader().client().pageID();
+ }
+ return proxy;
}
void setCookies(Document& document, const URL& url, const String& cookieString)
Modified: trunk/Source/WebCore/platform/network/CookieRequestHeaderFieldProxy.h (230897 => 230898)
--- trunk/Source/WebCore/platform/network/CookieRequestHeaderFieldProxy.h 2018-04-21 21:58:51 UTC (rev 230897)
+++ trunk/Source/WebCore/platform/network/CookieRequestHeaderFieldProxy.h 2018-04-22 01:16:25 UTC (rev 230898)
@@ -32,34 +32,13 @@
namespace WebCore {
struct CookieRequestHeaderFieldProxy {
- PAL::SessionID m_sessionID;
- URL m_firstParty;
- URL m_url;
- std::optional<uint64_t> m_frameID;
- std::optional<uint64_t> m_pageID;
- IncludeSecureCookies m_includeSecureCookies { IncludeSecureCookies::No };
+ PAL::SessionID sessionID;
+ URL firstParty;
+ URL url;
+ std::optional<uint64_t> frameID;
+ std::optional<uint64_t> pageID;
+ IncludeSecureCookies includeSecureCookies { IncludeSecureCookies::No };
- CookieRequestHeaderFieldProxy() = default;
- CookieRequestHeaderFieldProxy(PAL::SessionID&& sessionID, URL&& firstParty, URL&& url, std::optional<uint64_t>&& frameID, std::optional<uint64_t>&& pageID, IncludeSecureCookies includeSecureCookies)
- : m_sessionID(WTFMove(sessionID))
- , m_firstParty(WTFMove(firstParty))
- , m_url(WTFMove(url))
- , m_frameID(WTFMove(frameID))
- , m_pageID(WTFMove(pageID))
- , m_includeSecureCookies(includeSecureCookies)
- {
- }
-
- CookieRequestHeaderFieldProxy(PAL::SessionID sessionID, const URL& firstParty, const URL& url, const std::optional<uint64_t>& frameID, const std::optional<uint64_t>& pageID, IncludeSecureCookies includeSecureCookies)
- : m_sessionID(sessionID)
- , m_firstParty(firstParty)
- , m_url(url)
- , m_frameID(frameID)
- , m_pageID(pageID)
- , m_includeSecureCookies(includeSecureCookies)
- {
- }
-
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static std::optional<CookieRequestHeaderFieldProxy> decode(Decoder&);
};
@@ -67,42 +46,31 @@
template<class Encoder>
void CookieRequestHeaderFieldProxy::encode(Encoder& encoder) const
{
- encoder << m_sessionID;
- encoder << m_firstParty;
- encoder << m_url;
- encoder << m_frameID;
- encoder << m_pageID;
- encoder << m_includeSecureCookies;
+ encoder << sessionID;
+ encoder << firstParty;
+ encoder << url;
+ encoder << frameID;
+ encoder << pageID;
+ encoder << includeSecureCookies;
}
template<class Decoder>
std::optional<CookieRequestHeaderFieldProxy> CookieRequestHeaderFieldProxy::decode(Decoder& decoder)
-{
- PAL::SessionID sessionID;
- if (!decoder.decode(sessionID))
+{
+ CookieRequestHeaderFieldProxy result;
+ if (!decoder.decode(result.sessionID))
return std::nullopt;
-
- URL firstParty;
- if (!decoder.decode(firstParty))
+ if (!decoder.decode(result.firstParty))
return std::nullopt;
-
- URL url;
- if (!decoder.decode(url))
+ if (!decoder.decode(result.url))
return std::nullopt;
-
- std::optional<uint64_t> frameID;
- if (!decoder.decode(frameID))
+ if (!decoder.decode(result.frameID))
return std::nullopt;
-
- std::optional<uint64_t> pageID;
- if (!decoder.decode(pageID))
+ if (!decoder.decode(result.pageID))
return std::nullopt;
-
- IncludeSecureCookies includeSecureCookies;
- if (!decoder.decode(includeSecureCookies))
+ if (!decoder.decode(result.includeSecureCookies))
return std::nullopt;
-
- return {{ WTFMove(sessionID), WTFMove(firstParty), WTFMove(url), WTFMove(*frameID), WTFMove(*pageID), includeSecureCookies }};
+ return WTFMove(result);
}
-}
+} // namespace WebCore
Modified: trunk/Source/WebCore/platform/network/SocketStreamHandleImpl.cpp (230897 => 230898)
--- trunk/Source/WebCore/platform/network/SocketStreamHandleImpl.cpp 2018-04-21 21:58:51 UTC (rev 230897)
+++ trunk/Source/WebCore/platform/network/SocketStreamHandleImpl.cpp 2018-04-22 01:16:25 UTC (rev 230898)
@@ -79,7 +79,7 @@
static std::pair<Vector<uint8_t>, bool> cookieDataForHandshake(const CookieRequestHeaderFieldProxy& headerFieldProxy)
{
- auto networkStorageSession = NetworkStorageSession::storageSession(headerFieldProxy.m_sessionID);
+ auto networkStorageSession = NetworkStorageSession::storageSession(headerFieldProxy.sessionID);
RELEASE_ASSERT(networkStorageSession);
String cookieDataString;
Modified: trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (230897 => 230898)
--- trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2018-04-21 21:58:51 UTC (rev 230897)
+++ trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2018-04-22 01:16:25 UTC (rev 230898)
@@ -234,7 +234,7 @@
std::pair<String, bool> cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const CookieRequestHeaderFieldProxy& headerFieldProxy)
{
- return cookieRequestHeaderFieldValue(session, headerFieldProxy.m_firstParty, headerFieldProxy.m_url, headerFieldProxy.m_frameID, headerFieldProxy.m_pageID, headerFieldProxy.m_includeSecureCookies);
+ return cookieRequestHeaderFieldValue(session, headerFieldProxy.firstParty, headerFieldProxy.url, headerFieldProxy.frameID, headerFieldProxy.pageID, headerFieldProxy.includeSecureCookies);
}
bool cookiesEnabled(const NetworkStorageSession& session)
Modified: trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp (230897 => 230898)
--- trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp 2018-04-21 21:58:51 UTC (rev 230897)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp 2018-04-22 01:16:25 UTC (rev 230898)
@@ -47,7 +47,7 @@
std::pair<String, bool> cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const CookieRequestHeaderFieldProxy& headerFieldProxy)
{
- return session.cookieStorage().cookieRequestHeaderFieldValue(session, headerFieldProxy.m_firstParty, headerFieldProxy.m_url, headerFieldProxy.m_frameID, headerFieldProxy.m_pageID, headerFieldProxy.m_includeSecureCookies);
+ return session.cookieStorage().cookieRequestHeaderFieldValue(session, headerFieldProxy.firstParty, headerFieldProxy.url, headerFieldProxy.frameID, headerFieldProxy.pageID, headerFieldProxy.includeSecureCookies);
}
bool cookiesEnabled(const NetworkStorageSession& session)
Modified: trunk/Source/WebCore/platform/network/curl/CookieJarCurlDatabase.cpp (230897 => 230898)
--- trunk/Source/WebCore/platform/network/curl/CookieJarCurlDatabase.cpp 2018-04-21 21:58:51 UTC (rev 230897)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarCurlDatabase.cpp 2018-04-22 01:16:25 UTC (rev 230898)
@@ -96,7 +96,7 @@
std::pair<String, bool> CookieJarCurlDatabase::cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const CookieRequestHeaderFieldProxy& headerFieldProxy) const
{
- return cookieRequestHeaderFieldValue(session, headerFieldProxy.m_firstParty, headerFieldProxy.m_url, headerFieldProxy.m_frameID, headerFieldProxy.m_pageID, headerFieldProxy.m_includeSecureCookies);
+ return cookieRequestHeaderFieldValue(session, headerFieldProxy.firstParty, headerFieldProxy.url, headerFieldProxy.frameID, headerFieldProxy.pageID, headerFieldProxy.includeSecureCookies);
}
bool CookieJarCurlDatabase::cookiesEnabled(const NetworkStorageSession& session) const
Modified: trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm (230897 => 230898)
--- trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2018-04-21 21:58:51 UTC (rev 230897)
+++ trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2018-04-22 01:16:25 UTC (rev 230898)
@@ -254,7 +254,7 @@
std::pair<String, bool> cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const CookieRequestHeaderFieldProxy& headerFieldProxy)
{
- return cookiesForSession(session, headerFieldProxy.m_firstParty, headerFieldProxy.m_url, headerFieldProxy.m_frameID, headerFieldProxy.m_pageID, IncludeHTTPOnly, headerFieldProxy.m_includeSecureCookies);
+ return cookiesForSession(session, headerFieldProxy.firstParty, headerFieldProxy.url, headerFieldProxy.frameID, headerFieldProxy.pageID, IncludeHTTPOnly, headerFieldProxy.includeSecureCookies);
}
void setCookiesFromDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID, const String& cookieStr)
Modified: trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp (230897 => 230898)
--- trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp 2018-04-21 21:58:51 UTC (rev 230897)
+++ trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp 2018-04-22 01:16:25 UTC (rev 230898)
@@ -136,7 +136,7 @@
std::pair<String, bool> cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const CookieRequestHeaderFieldProxy& headerFieldProxy)
{
- return cookieRequestHeaderFieldValue(session, headerFieldProxy.m_firstParty, headerFieldProxy.m_url, headerFieldProxy.m_frameID, headerFieldProxy.m_pageID, headerFieldProxy.m_includeSecureCookies);
+ return cookieRequestHeaderFieldValue(session, headerFieldProxy.firstParty, headerFieldProxy.url, headerFieldProxy.frameID, headerFieldProxy.pageID, headerFieldProxy.includeSecureCookies);
}
bool cookiesEnabled(const NetworkStorageSession& session)
