Diff
Modified: trunk/LayoutTests/ChangeLog (262833 => 262834)
--- trunk/LayoutTests/ChangeLog 2020-06-10 03:44:18 UTC (rev 262833)
+++ trunk/LayoutTests/ChangeLog 2020-06-10 04:10:06 UTC (rev 262834)
@@ -1,3 +1,15 @@
+2020-06-09 Fujii Hironori <[email protected]>
+
+ Unreviewed, reverting r262791.
+
+ WinCairo WebKit1 is crashing.
+
+ Reverted changeset:
+
+ "[Curl] Implement functions to use ResourceLoadStatistics."
+ https://bugs.webkit.org/show_bug.cgi?id=207692
+ https://trac.webkit.org/changeset/262791
+
2020-06-09 Simon Fraser <[email protected]>
Minor overflow layers cleanup
Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (262833 => 262834)
--- trunk/LayoutTests/platform/wincairo/TestExpectations 2020-06-10 03:44:18 UTC (rev 262833)
+++ trunk/LayoutTests/platform/wincairo/TestExpectations 2020-06-10 04:10:06 UTC (rev 262834)
@@ -1175,37 +1175,9 @@
http/tests/referrer-policy/unsafe-url/cross-origin-http-http.html [ Skip ]
http/tests/referrer-policy/unsafe-url/cross-origin-http.https.html [ Skip ]
-# ResourceLoadStatistics
-http/tests/resourceLoadStatistics [ Pass ]
-http/tests/resourceLoadStatistics/exemptDomains [ Skip ]
-http/tests/resourceLoadStatistics/add-blocking-to-redirect-database.html [ Skip ]
-http/tests/resourceLoadStatistics/add-blocking-to-redirect.html [ Skip ]
-http/tests/resourceLoadStatistics/cookie-deletion-database.html [ Skip ]
-http/tests/resourceLoadStatistics/cookie-deletion.html [ Skip ]
-http/tests/resourceLoadStatistics/cookies-with-and-without-user-interaction-database.html [ Skip ]
-http/tests/resourceLoadStatistics/cookies-with-and-without-user-interaction.html [ Skip ]
-http/tests/resourceLoadStatistics/do-not-remove-blocking-in-redirect-database.html [ Skip ]
-http/tests/resourceLoadStatistics/do-not-remove-blocking-in-redirect.html [ Skip ]
-http/tests/resourceLoadStatistics/enforce-samesite-strict-based-on-top-frame-unique-redirects-to-database.html [ Skip ]
-http/tests/resourceLoadStatistics/enforce-samesite-strict-based-on-top-frame-unique-redirects-to.html [ Skip ]
-http/tests/resourceLoadStatistics/ping-to-prevalent-resource-database.html [ Skip ]
-http/tests/resourceLoadStatistics/ping-to-prevalent-resource.html [ Skip ]
-http/tests/resourceLoadStatistics/set-all-cookies-to-same-site-strict.html [ Skip ]
-http/tests/resourceLoadStatistics/standalone-web-application-exempt-from-website-data-deletion-database.html [ Skip ]
-http/tests/resourceLoadStatistics/standalone-web-application-exempt-from-website-data-deletion.html [ Skip ]
-http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction-database.php [ Skip ]
-http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction.php [ Skip ]
-http/tests/resourceLoadStatistics/telemetry-generation.html [ Skip ]
-http/tests/resourceLoadStatistics/third-party-cookie-blocking-ephemeral-database.html [ Skip ]
-http/tests/resourceLoadStatistics/third-party-cookie-blocking-ephemeral.html [ Skip ]
-http/tests/resourceLoadStatistics/third-party-cookie-blocking-on-sites-without-user-interaction-database.html [ Skip ]
-http/tests/resourceLoadStatistics/third-party-cookie-blocking-on-sites-without-user-interaction.html [ Skip ]
-http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-database.html [ Skip ]
-http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time.html [ Skip ]
-http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-database.html [ Skip ]
-http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal.html [ Skip ]
+# All timing out
+http/tests/resourceLoadStatistics [ Skip ]
-# All timing out
http/tests/security [ Skip ]
http/tests/security/401-logout/401-logout.php [ Pass ]
http/tests/security/cookies/third-party-cookie-blocking.html [ Pass ]
Modified: trunk/Source/WebCore/CMakeLists.txt (262833 => 262834)
--- trunk/Source/WebCore/CMakeLists.txt 2020-06-10 03:44:18 UTC (rev 262833)
+++ trunk/Source/WebCore/CMakeLists.txt 2020-06-10 04:10:06 UTC (rev 262834)
@@ -696,7 +696,6 @@
dom/DocumentFragment.idl
dom/DocumentFullscreen.idl
dom/DocumentOrShadowRoot.idl
- dom/DocumentStorageAccess.idl
dom/DocumentTouch.idl
dom/DocumentType.idl
dom/DragEvent.idl
Modified: trunk/Source/WebCore/ChangeLog (262833 => 262834)
--- trunk/Source/WebCore/ChangeLog 2020-06-10 03:44:18 UTC (rev 262833)
+++ trunk/Source/WebCore/ChangeLog 2020-06-10 04:10:06 UTC (rev 262834)
@@ -1,3 +1,15 @@
+2020-06-09 Fujii Hironori <[email protected]>
+
+ Unreviewed, reverting r262791.
+
+ WinCairo WebKit1 is crashing.
+
+ Reverted changeset:
+
+ "[Curl] Implement functions to use ResourceLoadStatistics."
+ https://bugs.webkit.org/show_bug.cgi?id=207692
+ https://trac.webkit.org/changeset/262791
+
2020-06-09 Simon Fraser <[email protected]>
Minor overflow layers cleanup
Modified: trunk/Source/WebCore/platform/network/curl/CookieJarDB.cpp (262833 => 262834)
--- trunk/Source/WebCore/platform/network/curl/CookieJarDB.cpp 2020-06-10 03:44:18 UTC (rev 262833)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarDB.cpp 2020-06-10 04:10:06 UTC (rev 262834)
@@ -24,7 +24,6 @@
#include "config.h"
#include "CookieJarDB.h"
-#include "cookieJar.h"
#include "CookieUtil.h"
#include "Logging.h"
@@ -64,8 +63,6 @@
"CREATE INDEX IF NOT EXISTS domain_index ON Cookie(domain);"
#define CREATE_PATH_INDEX_SQL \
"CREATE INDEX IF NOT EXISTS path_index ON Cookie(path);"
-#define SELECT_ALL_DOMAINS_SQL \
- "SELECT DISTINCT domain FROM Cookie;"
#define CHECK_EXISTS_COOKIE_SQL \
"SELECT domain FROM Cookie WHERE ((domain = ?) OR (domain GLOB ?));"
#define CHECK_EXISTS_HTTPONLY_COOKIE_SQL \
@@ -79,10 +76,6 @@
"DELETE FROM Cookie WHERE name = ? AND domain = ?;"
#define DELETE_ALL_SESSION_COOKIE_SQL \
"DELETE FROM Cookie WHERE session = 1;"
-#define DELETE_COOKIES_BY_DOMAIN_SQL \
- "DELETE FROM Cookie WHERE domain = ? ;"
-#define DELETE_COOKIES_BY_DOMAIN_EXCEPT_HTTP_ONLY_SQL \
- "DELETE FROM Cookie WHERE (domain = ?) AND (httponly = 0);"
#define DELETE_ALL_COOKIE_SQL \
"DELETE FROM Cookie;"
@@ -172,8 +165,6 @@
createPrepareStatement(CHECK_EXISTS_HTTPONLY_COOKIE_SQL);
createPrepareStatement(DELETE_COOKIE_BY_NAME_DOMAIN_PATH_SQL);
createPrepareStatement(DELETE_COOKIE_BY_NAME_DOMAIN_SQL);
- createPrepareStatement(DELETE_COOKIES_BY_DOMAIN_SQL);
- createPrepareStatement(DELETE_COOKIES_BY_DOMAIN_EXCEPT_HTTP_ONLY_SQL);
return true;
}
@@ -538,7 +529,7 @@
return checkSQLiteReturnCode(statement.step());
}
-bool CookieJarDB::setCookie(const URL& firstParty, const URL& url, const String& body, CookieJarDB::Source source, Optional<Seconds> cappedLifetime)
+bool CookieJarDB::setCookie(const URL& firstParty, const URL& url, const String& body, CookieJarDB::Source source)
{
if (!isEnabled() || !m_database.isOpen())
return false;
@@ -559,31 +550,9 @@
if (!canAcceptCookie(*cookie, firstParty, url, source))
return false;
- if (cappedLifetime && cookie->expires) {
- ASSERT(*cappedLifetime >= 0_s);
- auto cappedExpires = WallTime::now() + *cappedLifetime;
- if (cappedExpires < WallTime::fromRawSeconds(*cookie->expires / WTF::msPerSecond))
- cookie->expires = cappedExpires.secondsSinceEpoch().milliseconds();
- }
-
return setCookie(*cookie);
}
-HashSet<String> CookieJarDB::allDomains()
-{
- SQLiteStatement statement(m_database, SELECT_ALL_DOMAINS_SQL);
- statement.prepare();
-
- HashSet<String> domains;
- while (statement.step() == SQLITE_ROW) {
- auto domain = statement.getColumnText(0);
- domains.add(domain);
- }
-
- statement.finalize();
- return domains;
-}
-
bool CookieJarDB::deleteCookie(const String& url, const String& name)
{
if (!isEnabled() || !m_database.isOpen())
@@ -620,13 +589,6 @@
return false;
}
-bool CookieJarDB::deleteCookiesForHostname(const String& hostname, IncludeHttpOnlyCookies includeHttpOnlyCookies)
-{
- auto& statement = preparedStatement(includeHttpOnlyCookies == IncludeHttpOnlyCookies::Yes ? DELETE_COOKIES_BY_DOMAIN_SQL : DELETE_COOKIES_BY_DOMAIN_EXCEPT_HTTP_ONLY_SQL);
- statement.bindText(1, hostname);
- return checkSQLiteReturnCode(statement.step());
-}
-
bool CookieJarDB::deleteAllCookies()
{
if (!isEnabled() || !m_database.isOpen())
Modified: trunk/Source/WebCore/platform/network/curl/CookieJarDB.h (262833 => 262834)
--- trunk/Source/WebCore/platform/network/curl/CookieJarDB.h 2020-06-10 03:44:18 UTC (rev 262833)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarDB.h 2020-06-10 04:10:06 UTC (rev 262834)
@@ -25,7 +25,6 @@
#pragma once
#include "Cookie.h"
-#include "CookieJar.h"
#include "SQLiteDatabase.h"
#include "SQLiteStatement.h"
#include <wtf/HashMap.h>
@@ -57,15 +56,13 @@
void setAcceptPolicy(CookieAcceptPolicy policy) { m_acceptPolicy = policy; }
CookieAcceptPolicy acceptPolicy() const { return m_acceptPolicy; }
- HashSet<String> allDomains();
Optional<Vector<Cookie>> searchCookies(const URL& firstParty, const URL& requestUrl, const Optional<bool>& httpOnly, const Optional<bool>& secure, const Optional<bool>& session);
Vector<Cookie> getAllCookies();
- bool setCookie(const URL& firstParty, const URL&, const String& cookie, Source, Optional<Seconds> cappedLifetime = WTF::nullopt);
+ bool setCookie(const URL& firstParty, const URL&, const String& cookie, Source);
bool setCookie(const Cookie&);
bool deleteCookie(const String& url, const String& name);
bool deleteCookies(const String& url);
- bool deleteCookiesForHostname(const String& hostname, IncludeHttpOnlyCookies);
bool deleteAllCookies();
WEBCORE_EXPORT CookieJarDB(const String& databasePath);
Modified: trunk/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp (262833 => 262834)
--- trunk/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp 2020-06-10 03:44:18 UTC (rev 262833)
+++ trunk/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp 2020-06-10 04:10:06 UTC (rev 262834)
@@ -95,14 +95,9 @@
return m_cookieDatabase;
}
-void NetworkStorageSession::setCookiesFromDOM(const URL& firstParty, const SameSiteInfo&, const URL& url, Optional<FrameIdentifier> frameID, Optional<PageIdentifier> pageID, ShouldAskITP, const String& value, ShouldRelaxThirdPartyCookieBlocking shouldRelaxThirdPartyCookieBlocking) const
+void NetworkStorageSession::setCookiesFromDOM(const URL& firstParty, const SameSiteInfo&, const URL& url, Optional<FrameIdentifier>, Optional<PageIdentifier>, ShouldAskITP, const String& value, ShouldRelaxThirdPartyCookieBlocking) const
{
-#if ENABLE(RESOURCE_LOAD_STATISTICS)
- Optional<Seconds> cappedLifetime = clientSideCookieCap(RegistrableDomain { firstParty }, *pageID);
-#else
- Optional<Seconds> cappedLifetime = WTF::nullopt;
-#endif
- cookieDatabase().setCookie(firstParty, url, value, CookieJarDB::Source::Script, cappedLifetime);
+ cookieDatabase().setCookie(firstParty, url, value, CookieJarDB::Source::Script);
}
void NetworkStorageSession::setCookiesFromHTTPResponse(const URL& firstParty, const URL& url, const String& value) const
@@ -138,10 +133,9 @@
return { cookiesForSession(*this, firstParty, url, false), false };
}
-void NetworkStorageSession::setCookies(const Vector<Cookie>& cookies, const URL&, const URL& /* mainDocumentURL */)
+void NetworkStorageSession::setCookies(const Vector<Cookie>&, const URL&, const URL& /* mainDocumentURL */)
{
- for (const auto& cookie : cookies)
- cookieDatabase().setCookie(cookie);
+ // FIXME: Implement for WebKit to use.
}
void NetworkStorageSession::setCookie(const Cookie& cookie)
@@ -170,10 +164,9 @@
// FIXME: Not yet implemented
}
-void NetworkStorageSession::deleteCookiesForHostnames(const Vector<String>& cookieHostNames, IncludeHttpOnlyCookies includeHttpOnlyCookies)
+void NetworkStorageSession::deleteCookiesForHostnames(const Vector<String>& /* cookieHostNames */, IncludeHttpOnlyCookies)
{
- for (auto hostname : cookieHostNames)
- cookieDatabase().deleteCookiesForHostname(hostname, includeHttpOnlyCookies);
+ // FIXME: Not yet implemented.
}
void NetworkStorageSession::deleteCookiesForHostnames(const Vector<String>& cookieHostNames)
@@ -186,9 +179,9 @@
return cookieDatabase().getAllCookies();
}
-void NetworkStorageSession::getHostnamesWithCookies(HashSet<String>& hostnames)
+void NetworkStorageSession::getHostnamesWithCookies(HashSet<String>& /* hostnames */)
{
- hostnames = cookieDatabase().allDomains();
+ // FIXME: Not yet implemented
}
Vector<Cookie> NetworkStorageSession::getCookies(const URL&)
Modified: trunk/Source/WebKit/ChangeLog (262833 => 262834)
--- trunk/Source/WebKit/ChangeLog 2020-06-10 03:44:18 UTC (rev 262833)
+++ trunk/Source/WebKit/ChangeLog 2020-06-10 04:10:06 UTC (rev 262834)
@@ -1,3 +1,15 @@
+2020-06-09 Fujii Hironori <[email protected]>
+
+ Unreviewed, reverting r262791.
+
+ WinCairo WebKit1 is crashing.
+
+ Reverted changeset:
+
+ "[Curl] Implement functions to use ResourceLoadStatistics."
+ https://bugs.webkit.org/show_bug.cgi?id=207692
+ https://trac.webkit.org/changeset/262791
+
2020-06-09 Tim Horton <[email protected]>
Stop using the wrong LaunchServices SPI for getting an app's localized name
Modified: trunk/Source/WebKit/NetworkProcess/NetworkDataTask.cpp (262833 => 262834)
--- trunk/Source/WebKit/NetworkProcess/NetworkDataTask.cpp 2020-06-10 03:44:18 UTC (rev 262833)
+++ trunk/Source/WebKit/NetworkProcess/NetworkDataTask.cpp 2020-06-10 04:10:06 UTC (rev 262834)
@@ -60,7 +60,7 @@
return NetworkDataTaskSoup::create(session, client, parameters.request, parameters.webFrameID, parameters.webPageID, parameters.storedCredentialsPolicy, parameters.contentSniffingPolicy, parameters.contentEncodingSniffingPolicy, parameters.shouldClearReferrerOnHTTPSToHTTPRedirect, parameters.isMainFrameNavigation);
#endif
#if USE(CURL)
- return NetworkDataTaskCurl::create(session, client, parameters.request, parameters.webFrameID, parameters.webPageID, parameters.storedCredentialsPolicy, parameters.contentSniffingPolicy, parameters.contentEncodingSniffingPolicy, parameters.shouldClearReferrerOnHTTPSToHTTPRedirect, parameters.isMainFrameNavigation, parameters.shouldRelaxThirdPartyCookieBlocking);
+ return NetworkDataTaskCurl::create(session, client, parameters.request, parameters.storedCredentialsPolicy, parameters.contentSniffingPolicy, parameters.contentEncodingSniffingPolicy, parameters.shouldClearReferrerOnHTTPSToHTTPRedirect, parameters.isMainFrameNavigation);
#endif
}
Modified: trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp (262833 => 262834)
--- trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp 2020-06-10 03:44:18 UTC (rev 262833)
+++ trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp 2020-06-10 04:10:06 UTC (rev 262834)
@@ -44,11 +44,8 @@
using namespace WebCore;
-NetworkDataTaskCurl::NetworkDataTaskCurl(NetworkSession& session, NetworkDataTaskClient& client, const ResourceRequest& requestWithCredentials, FrameIdentifier frameID, PageIdentifier& pageID, StoredCredentialsPolicy storedCredentialsPolicy, ContentSniffingPolicy shouldContentSniff, ContentEncodingSniffingPolicy, bool shouldClearReferrerOnHTTPSToHTTPRedirect, bool dataTaskIsForMainFrameNavigation, WebCore::ShouldRelaxThirdPartyCookieBlocking shouldRelaxThirdPartyCookieBlocking)
+NetworkDataTaskCurl::NetworkDataTaskCurl(NetworkSession& session, NetworkDataTaskClient& client, const ResourceRequest& requestWithCredentials, StoredCredentialsPolicy storedCredentialsPolicy, ContentSniffingPolicy shouldContentSniff, ContentEncodingSniffingPolicy, bool shouldClearReferrerOnHTTPSToHTTPRedirect, bool dataTaskIsForMainFrameNavigation)
: NetworkDataTask(session, client, requestWithCredentials, storedCredentialsPolicy, shouldClearReferrerOnHTTPSToHTTPRedirect, dataTaskIsForMainFrameNavigation)
- , m_frameID(frameID)
- , m_pageID(pageID)
- , m_shouldRelaxThirdPartyCookieBlocking(shouldRelaxThirdPartyCookieBlocking)
{
if (m_scheduledFailureType != NoFailure)
return;
@@ -70,12 +67,6 @@
}
}
-#if ENABLE(RESOURCE_LOAD_STATISTICS)
- if (shouldBlockCookies(request))
- blockCookies();
-#endif
- restrictRequestReferrerToOriginIfNeeded(request);
-
m_curlRequest = createCurlRequest(WTFMove(request));
if (!m_initialCredential.isEmpty()) {
m_curlRequest->setUserPass(m_initialCredential.user(), m_initialCredential.password());
@@ -133,7 +124,7 @@
Ref<CurlRequest> NetworkDataTaskCurl::createCurlRequest(ResourceRequest&& request, RequestStatus status)
{
- if (status == RequestStatus::NewRequest && !m_blockingCookies)
+ if (status == RequestStatus::NewRequest)
appendCookieHeader(request);
// Creates a CurlRequest in suspended state.
@@ -305,10 +296,6 @@
}
}
-#if ENABLE(RESOURCE_LOAD_STATISTCS)
- if (!m_blockingCookies && shouldBlockCookies(request))
- blockCookies();
-#endif
auto response = ResourceResponse(m_response);
m_client->willPerformHTTPRedirection(WTFMove(response), WTFMove(request), [this, protectedThis = makeRef(*this), didChangeCredential, isCrossOrigin](const ResourceRequest& newRequest) {
if (newRequest.isNull() || m_state == State::Canceling)
@@ -321,7 +308,6 @@
m_startTime = MonotonicTime::now();
auto requestCopy = newRequest;
- restrictRequestReferrerToOriginIfNeeded(requestCopy);
m_curlRequest = createCurlRequest(WTFMove(requestCopy));
if (didChangeCredential && !m_initialCredential.isEmpty()) {
m_curlRequest->setUserPass(m_initialCredential.user(), m_initialCredential.password());
@@ -477,33 +463,4 @@
}
}
-void NetworkDataTaskCurl::blockCookies()
-{
- m_blockingCookies = true;
-}
-
-void NetworkDataTaskCurl::unblockCookies()
-{
- m_blockingCookies = false;
-}
-
-bool NetworkDataTaskCurl::shouldBlockCookies(const WebCore::ResourceRequest& request)
-{
-#if ENABLE(RESOURCE_LOAD_STATISTICS)
- bool shouldBlockCookies = m_storedCredentialsPolicy == WebCore::StoredCredentialsPolicy::EphemeralStateless;
-
- if (!shouldBlockCookies && m_session->networkStorageSession())
- shouldBlockCookies = m_session->networkStorageSession()->shouldBlockCookies(request, m_frameID, m_pageID, m_shouldRelaxThirdPartyCookieBlocking);
-
- if (shouldBlockCookies)
- return true;
-#endif
- return false;
-}
-
-bool NetworkDataTaskCurl::isThirdPartyRequest(const WebCore::ResourceRequest& request)
-{
- return !WebCore::areRegistrableDomainsEqual(request.url(), request.firstPartyForCookies());
-}
-
} // namespace WebKit
Modified: trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h (262833 => 262834)
--- trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h 2020-06-10 03:44:18 UTC (rev 262833)
+++ trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h 2020-06-10 04:10:06 UTC (rev 262834)
@@ -27,11 +27,8 @@
#include "NetworkDataTask.h"
#include <WebCore/CurlRequestClient.h>
-#include <WebCore/FrameIdentifier.h>
-#include <WebCore/PageIdentifier.h>
#include <WebCore/ProtectionSpace.h>
#include <WebCore/ResourceResponse.h>
-#include <WebCore/ShouldRelaxThirdPartyCookieBlocking.h>
namespace WebCore {
class CurlRequest;
@@ -41,9 +38,9 @@
class NetworkDataTaskCurl final : public NetworkDataTask, public WebCore::CurlRequestClient {
public:
- static Ref<NetworkDataTask> create(NetworkSession& session, NetworkDataTaskClient& client, const WebCore::ResourceRequest& request, WebCore::FrameIdentifier frameID, WebCore::PageIdentifier pageID, WebCore::StoredCredentialsPolicy storedCredentialsPolicy, WebCore::ContentSniffingPolicy shouldContentSniff, WebCore::ContentEncodingSniffingPolicy shouldContentEncodingSniff, bool shouldClearReferrerOnHTTPSToHTTPRedirect, bool dataTaskIsForMainFrameNavigation, WebCore::ShouldRelaxThirdPartyCookieBlocking shouldRelaxThirdPartyCookieBlocking)
+ static Ref<NetworkDataTask> create(NetworkSession& session, NetworkDataTaskClient& client, const WebCore::ResourceRequest& request, WebCore::StoredCredentialsPolicy storedCredentialsPolicy, WebCore::ContentSniffingPolicy shouldContentSniff, WebCore::ContentEncodingSniffingPolicy shouldContentEncodingSniff, bool shouldClearReferrerOnHTTPSToHTTPRedirect, bool dataTaskIsForMainFrameNavigation)
{
- return adoptRef(*new NetworkDataTaskCurl(session, client, request, frameID, pageID, storedCredentialsPolicy, shouldContentSniff, shouldContentEncodingSniff, shouldClearReferrerOnHTTPSToHTTPRedirect, dataTaskIsForMainFrameNavigation, shouldRelaxThirdPartyCookieBlocking));
+ return adoptRef(*new NetworkDataTaskCurl(session, client, request, storedCredentialsPolicy, shouldContentSniff, shouldContentEncodingSniff, shouldClearReferrerOnHTTPSToHTTPRedirect, dataTaskIsForMainFrameNavigation));
}
~NetworkDataTaskCurl();
@@ -57,7 +54,7 @@
ReusedRequest
};
- NetworkDataTaskCurl(NetworkSession&, NetworkDataTaskClient&, const WebCore::ResourceRequest&, WebCore::FrameIdentifier, WebCore::PageIdentifier&, WebCore::StoredCredentialsPolicy, WebCore::ContentSniffingPolicy, WebCore::ContentEncodingSniffingPolicy, bool shouldClearReferrerOnHTTPSToHTTPRedirect, bool dataTaskIsForMainFrameNavigation, WebCore::ShouldRelaxThirdPartyCookieBlocking);
+ NetworkDataTaskCurl(NetworkSession&, NetworkDataTaskClient&, const WebCore::ResourceRequest&, WebCore::StoredCredentialsPolicy, WebCore::ContentSniffingPolicy, WebCore::ContentEncodingSniffingPolicy, bool shouldClearReferrerOnHTTPSToHTTPRedirect, bool dataTaskIsForMainFrameNavigation);
void cancel() override;
void resume() override;
@@ -85,11 +82,6 @@
void appendCookieHeader(WebCore::ResourceRequest&);
void handleCookieHeaders(const WebCore::ResourceRequest&, const WebCore::CurlResponse&);
- bool isThirdPartyRequest(const WebCore::ResourceRequest&);
- bool shouldBlockCookies(const WebCore::ResourceRequest&);
- void blockCookies();
- void unblockCookies();
-
State m_state { State::Suspended };
RefPtr<WebCore::CurlRequest> m_curlRequest;
@@ -97,14 +89,6 @@
unsigned m_redirectCount { 0 };
unsigned m_authFailureCount { 0 };
MonotonicTime m_startTime;
-
- WebCore::FrameIdentifier m_frameID;
- WebCore::PageIdentifier m_pageID;
-
-#if ENABLE(RESOURCE_LOAD_STATISTICS)
- bool m_blockingCookies { false };
-#endif
- WebCore::ShouldRelaxThirdPartyCookieBlocking m_shouldRelaxThirdPartyCookieBlocking { WebCore::ShouldRelaxThirdPartyCookieBlocking::No };
};
} // namespace WebKit
Modified: trunk/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp (262833 => 262834)
--- trunk/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp 2020-06-10 03:44:18 UTC (rev 262833)
+++ trunk/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp 2020-06-10 04:10:06 UTC (rev 262834)
@@ -43,14 +43,6 @@
if (!parameters.cookiePersistentStorageFile.isEmpty())
networkStorageSession()->setCookieDatabase(makeUniqueRef<CookieJarDB>(parameters.cookiePersistentStorageFile));
networkStorageSession()->setProxySettings(WTFMove(parameters.proxySettings));
-
-#if ENABLE(RESOURCE_LOAD_STATISTICS)
- m_resourceLoadStatisticsDirectory = parameters.resourceLoadStatisticsParameters.directory;
- m_shouldIncludeLocalhostInResourceLoadStatistics = parameters.resourceLoadStatisticsParameters.shouldIncludeLocalhost ? ShouldIncludeLocalhost::Yes : ShouldIncludeLocalhost::No;
- m_enableResourceLoadStatisticsDebugMode = parameters.resourceLoadStatisticsParameters.enableDebugMode ? EnableResourceLoadStatisticsDebugMode::Yes : EnableResourceLoadStatisticsDebugMode::No;
- m_resourceLoadStatisticsManualPrevalentResource = parameters.resourceLoadStatisticsParameters.manualPrevalentResource;
- setResourceLoadStatisticsEnabled(parameters.resourceLoadStatisticsParameters.enabled);
-#endif
}
NetworkSessionCurl::~NetworkSessionCurl()
Modified: trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp (262833 => 262834)
--- trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp 2020-06-10 03:44:18 UTC (rev 262833)
+++ trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp 2020-06-10 04:10:06 UTC (rev 262834)
@@ -36,7 +36,6 @@
#include "WKSecurityOriginRef.h"
#include "WKString.h"
#include "WebDeviceOrientationAndMotionAccessController.h"
-#include "WebPageProxy.h"
#include "WebResourceLoadStatisticsStore.h"
#include "WebsiteData.h"
#include "WebsiteDataFetchOption.h"
@@ -820,18 +819,3 @@
completionHandler(context);
});
}
-
-void WKWebsiteDataStoreGetAllStorageAccessEntries(WKWebsiteDataStoreRef dataStoreRef, WKPageRef pageRef, void* context, WKWebsiteDataStoreGetAllStorageAccessEntriesFunction callback)
-{
-#if ENABLE(RESOURCE_LOAD_STATISTICS)
- WebKit::toImpl(dataStoreRef)->getAllStorageAccessEntries(toImpl(pageRef)->identifier(), [context, callback] (Vector<String>&& domains) {
- auto domainArrayRef = WKMutableArrayCreate();
- for (auto domain : domains)
- WKArrayAppendItem(domainArrayRef, adoptWK(WKStringCreateWithUTF8CString(domain.utf8().data())).get());
-
- callback(context, domainArrayRef);
- });
-#else
- callback(context, WKMutableArrayCreate());
-#endif
-}
Modified: trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h (262833 => 262834)
--- trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h 2020-06-10 03:44:18 UTC (rev 262833)
+++ trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h 2020-06-10 04:10:06 UTC (rev 262834)
@@ -162,9 +162,6 @@
WK_EXPORT void WKWebsiteDataStoreSetPerOriginStorageQuota(WKWebsiteDataStoreRef dataStoreRef, uint64_t quota) WK_C_API_DEPRECATED_WITH_REPLACEMENT(WKWebsiteDataStoreConfigurationSetPerOriginStorageQuota);
-typedef void(*WKWebsiteDataStoreGetAllStorageAccessEntriesFunction)(void* context, WKArrayRef domains);
-WK_EXPORT void WKWebsiteDataStoreGetAllStorageAccessEntries(WKWebsiteDataStoreRef dataStoreRef, WKPageRef pageRef, void* context, WKWebsiteDataStoreGetAllStorageAccessEntriesFunction callback);
-
WK_EXPORT void WKWebsiteDataStoreClearAllDeviceOrientationPermissions(WKWebsiteDataStoreRef dataStoreRef);
typedef void (*WKWebsiteDataStoreClearAdClickAttributionsThroughWebsiteDataRemovalFunction)(void* functionContext);
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (262833 => 262834)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2020-06-10 03:44:18 UTC (rev 262833)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2020-06-10 04:10:06 UTC (rev 262834)
@@ -2324,9 +2324,6 @@
parameters.perOriginStorageQuota = perOriginStorageQuota();
parameters.perThirdPartyOriginStorageQuota = perThirdPartyOriginStorageQuota();
-#if ENABLE(RESOURCE_LOAD_STATISTICS)
- parameters.networkSessionParameters.resourceLoadStatisticsParameters.enabled = m_resourceLoadStatisticsEnabled;
-#endif
platformSetNetworkParameters(parameters);
return parameters;
Modified: trunk/Tools/ChangeLog (262833 => 262834)
--- trunk/Tools/ChangeLog 2020-06-10 03:44:18 UTC (rev 262833)
+++ trunk/Tools/ChangeLog 2020-06-10 04:10:06 UTC (rev 262834)
@@ -1,3 +1,15 @@
+2020-06-09 Fujii Hironori <[email protected]>
+
+ Unreviewed, reverting r262791.
+
+ WinCairo WebKit1 is crashing.
+
+ Reverted changeset:
+
+ "[Curl] Implement functions to use ResourceLoadStatistics."
+ https://bugs.webkit.org/show_bug.cgi?id=207692
+ https://trac.webkit.org/changeset/262791
+
2020-06-09 Zhifei Fang <[email protected]>
Add a timeout monitor for JSC stress test
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (262833 => 262834)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2020-06-10 03:44:18 UTC (rev 262833)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2020-06-10 04:10:06 UTC (rev 262834)
@@ -3168,47 +3168,8 @@
{
}
-struct GetAllStorageAccessEntriesCallbackContext {
- GetAllStorageAccessEntriesCallbackContext(TestController& controller, CompletionHandler<void(Vector<String>&&)>&& handler)
- : testController(controller)
- , completionHandler(WTFMove(handler))
- {
- }
-
- TestController& testController;
- CompletionHandler<void(Vector<String>&&)> completionHandler;
- bool done { false };
-};
-
-void getAllStorageAccessEntriesCallback(void* userData, WKArrayRef domainList)
-{
- auto* context = static_cast<GetAllStorageAccessEntriesCallbackContext*>(userData);
-
- Vector<String> resultDomains;
- for (int i = 0; i < WKArrayGetSize(domainList); i++) {
- auto domain = reinterpret_cast<WKStringRef>(WKArrayGetItemAtIndex(domainList, i));
- auto buffer = std::vector<char>(WKStringGetMaximumUTF8CStringSize(domain));
- auto stringLength = WKStringGetUTF8CString(domain, buffer.data(), buffer.size());
-
- resultDomains.append(String::fromUTF8(buffer.data(), stringLength - 1));
- }
-
- if (context->completionHandler)
- context->completionHandler(WTFMove(resultDomains));
-
- context->done = true;
- context->testController.notifyDone();
-}
-
void TestController::getAllStorageAccessEntries()
{
- auto dataStore = WKContextGetWebsiteDataStore(platformContext());
- GetAllStorageAccessEntriesCallbackContext context(*this, [this] (Vector<String>&& domains) {
- m_currentInvocation->didReceiveAllStorageAccessEntries(WTFMove(domains));
- });
-
- WKWebsiteDataStoreGetAllStorageAccessEntries(dataStore, m_mainWebView->page(), &context, getAllStorageAccessEntriesCallback);
- runUntil(context.done, noTimeout);
}
struct LoadedThirdPartyDomainsCallbackContext {
