Diff
Modified: trunk/Source/WebKit2/ChangeLog (218762 => 218763)
--- trunk/Source/WebKit2/ChangeLog 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-23 21:18:28 UTC (rev 218763)
@@ -1,3 +1,82 @@
+2017-06-23 Chris Dumez <[email protected]>
+
+ Consistently use RunLoop::isMain() in WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=173745
+ <rdar://problem/32936527>
+
+ Reviewed by Brent Fulgham.
+
+ Consistently use RunLoop:isMain() on WebKit2 instead of WTF::isMainThread().
+ WTF::isMainThread() returns true for the WebThread instead of the UIThread
+ in WebKit1. Therefore WTF::isMainThread() is unsafe to use in the UIProcess
+ as the application may be using WebKit1 as well and have a WebThread.
+
+ Technically, we only *need* to move from WTF::isMainThread() to
+ RunLoop::isMain() in the UIProcess code but I ported all of WebKit2 for
+ consistency. RunLoop::isMain() is always safe in WebKit2.
+
+ * NetworkProcess/NetworkDataTask.cpp:
+ (WebKit::NetworkDataTask::NetworkDataTask):
+ (WebKit::NetworkDataTask::~NetworkDataTask):
+ * NetworkProcess/NetworkDataTaskBlob.cpp:
+ (WebKit::NetworkDataTaskBlob::getSizeForNext):
+ (WebKit::NetworkDataTaskBlob::didGetSize):
+ (WebKit::NetworkDataTaskBlob::seek):
+ (WebKit::NetworkDataTaskBlob::read):
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::didReceiveResponseNetworkSession):
+ (WebKit::NetworkLoad::notifyDidReceiveResponse):
+ * NetworkProcess/NetworkSession.cpp:
+ (WebKit::NetworkSession::defaultSession):
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::resourceType):
+ (WebKit::NetworkCache::Cache::initialize):
+ * NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
+ (WebKit::NetworkCache::IOChannel::read):
+ (WebKit::NetworkCache::IOChannel::readSyncInThread):
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:dataTask:didReceiveResponse:completionHandler:]):
+ (WebKit::NetworkSessionCocoa::defaultSession):
+ (WebKit::NetworkSessionCocoa::dataTaskForIdentifier):
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
+ (WebKit::CoordinatedGraphicsScene::dispatchOnMainThread):
+ (WebKit::CoordinatedGraphicsScene::syncRemoteContent):
+ (WebKit::CoordinatedGraphicsScene::detach):
+ (WebKit::CoordinatedGraphicsScene::appendUpdate):
+ * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:
+ (WebKit::WorkQueuePool::singleton):
+ (WebKit::WorkQueuePool::dispatch):
+ (WebKit::CompositingRunLoop::~CompositingRunLoop):
+ (WebKit::CompositingRunLoop::performTask):
+ (WebKit::CompositingRunLoop::performTaskSync):
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
+ (WebKit::ThreadedCompositor::createGLContext):
+ (WebKit::ThreadedCompositor::renderNextFrame):
+ (WebKit::ThreadedCompositor::commitScrollOffset):
+ (WebKit::ThreadedCompositor::updateSceneState):
+ (WebKit::ThreadedCompositor::releaseUpdateAtlases):
+ (WebKit::ThreadedCompositor::frameComplete):
+ * Shared/Plugins/NPObjectProxy.cpp:
+ (WebKit::NPObjectProxy::NP_Deallocate):
+ * UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
+ (WebKit::LocalStorageDatabaseTracker::deleteDatabasesModifiedSince):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores):
+ (WebKit::WebProcessProxy::topPrivatelyControlledDomainsWithWebiteData):
+ * UIProcess/WebResourceLoadStatisticsStore.cpp:
+ (WebKit::WebResourceLoadStatisticsStore::removeDataRecords):
+ (WebKit::WebResourceLoadStatisticsStore::registerSharedResourceLoadObserver):
+ (WebKit::WebResourceLoadStatisticsStore::writeStoreToDisk):
+ (WebKit::WebResourceLoadStatisticsStore::writeEncoderToDisk):
+ * UIProcess/ios/WKPDFView.mm:
+ (-[WKPDFView _highlightLinkAnnotation:forDuration:completionHandler:]):
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ (-[WKFileUploadPanel _uploadItemForImageData:imageName:successBlock:failureBlock:]):
+ * WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp:
+ (WebKit::WebFrameNetworkingContext::ensurePrivateBrowsingSession):
+ * WebProcess/soup/WebKitSoupRequestInputStream.cpp:
+ (webkitSoupRequestInputStreamReadAsync):
+
2017-06-23 David Kilzer <[email protected]>
v3: REGRESSION (r218419): 3 NSMutableDictionary leaks calling -[WKProcessPool _pluginLoadClientPolicies]
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp (218762 => 218763)
--- trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp 2017-06-23 21:18:28 UTC (rev 218763)
@@ -69,7 +69,7 @@
, m_firstRequest(requestWithCredentials)
, m_shouldClearReferrerOnHTTPSToHTTPRedirect(shouldClearReferrerOnHTTPSToHTTPRedirect)
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
if (!requestWithCredentials.url().isValid()) {
scheduleFailure(InvalidURLFailure);
@@ -84,7 +84,7 @@
NetworkDataTask::~NetworkDataTask()
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
ASSERT(!m_client);
}
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkDataTaskBlob.cpp (218762 => 218763)
--- trunk/Source/WebKit2/NetworkProcess/NetworkDataTaskBlob.cpp 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkDataTaskBlob.cpp 2017-06-23 21:18:28 UTC (rev 218763)
@@ -180,7 +180,7 @@
void NetworkDataTaskBlob::getSizeForNext()
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
// Do we finish validating and counting size for all items?
if (m_sizeItemCount >= m_blobData->items().size()) {
@@ -205,7 +205,7 @@
void NetworkDataTaskBlob::didGetSize(long long size)
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
if (m_state == State::Canceling || m_state == State::Completed || (!m_client && !isDownload())) {
clearStream();
@@ -236,7 +236,7 @@
void NetworkDataTaskBlob::seek()
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
// Convert from the suffix length to the range.
if (m_rangeSuffixLength != kPositionNotSpecified) {
@@ -330,7 +330,7 @@
void NetworkDataTaskBlob::read()
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
// If there is no more remaining data to read, we are done.
if (!m_totalRemainingSize || m_readItemCount >= m_blobData->items().size()) {
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (218762 => 218763)
--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2017-06-23 21:18:28 UTC (rev 218763)
@@ -370,7 +370,7 @@
void NetworkLoad::didReceiveResponseNetworkSession(ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
ASSERT(!m_throttle);
if (m_task && m_task->isDownload()) {
@@ -389,7 +389,7 @@
void NetworkLoad::notifyDidReceiveResponse(ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
#if ENABLE(NETWORK_CAPTURE)
if (m_recorder)
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkSession.cpp (218762 => 218763)
--- trunk/Source/WebKit2/NetworkProcess/NetworkSession.cpp 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkSession.cpp 2017-06-23 21:18:28 UTC (rev 218763)
@@ -60,7 +60,7 @@
#if PLATFORM(COCOA)
return NetworkSessionCocoa::defaultSession();
#else
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
static NetworkSession* session = &NetworkSession::create(SessionID::defaultSessionID()).leakRef();
return *session;
#endif
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (218762 => 218763)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2017-06-23 21:18:28 UTC (rev 218763)
@@ -57,7 +57,7 @@
static const AtomicString& resourceType()
{
- ASSERT(WTF::isMainThread());
+ ASSERT(WTF::RunLoop::isMain());
static NeverDestroyed<const AtomicString> resource("Resource", AtomicString::ConstructFromLiteral);
return resource;
}
@@ -82,7 +82,7 @@
#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
if (options.contains(Option::SpeculativeRevalidation)) {
m_lowPowerModeNotifier = std::make_unique<WebCore::LowPowerModeNotifier>([this](bool isLowPowerModeEnabled) {
- ASSERT(WTF::isMainThread());
+ ASSERT(WTF::RunLoop::isMain());
if (isLowPowerModeEnabled)
m_speculativeLoadManager = nullptr;
else {
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp (218762 => 218763)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp 2017-06-23 21:18:28 UTC (rev 218763)
@@ -164,7 +164,7 @@
return;
}
- if (!isMainThread()) {
+ if (!RunLoop::isMain()) {
readSyncInThread(offset, size, queue, WTFMove(completionHandler));
return;
}
@@ -181,7 +181,7 @@
void IOChannel::readSyncInThread(size_t offset, size_t size, WorkQueue* queue, Function<void (Data&, int error)>&& completionHandler)
{
- ASSERT(!isMainThread());
+ ASSERT(!RunLoop::isMain());
RefPtr<IOChannel> channel(this);
Thread::create("IOChannel::readSync", [channel, size, queue, completionHandler = WTFMove(completionHandler)] () mutable {
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (218762 => 218763)
--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2017-06-23 21:18:28 UTC (rev 218763)
@@ -358,7 +358,7 @@
auto taskIdentifier = dataTask.taskIdentifier;
LOG(NetworkSession, "%llu didReceiveResponse", taskIdentifier);
if (auto* networkDataTask = [self existingTask:dataTask]) {
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
// Avoid MIME type sniffing if the response comes back as 304 Not Modified.
int statusCode = [response respondsToSelector:@selector(statusCode)] ? [(id)response statusCode] : 0;
@@ -535,7 +535,7 @@
NetworkSession& NetworkSessionCocoa::defaultSession()
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
static NetworkSession* session = &NetworkSessionCocoa::create(WebCore::SessionID::defaultSessionID(), legacyCustomProtocolManager).leakRef();
return *session;
}
@@ -628,7 +628,7 @@
NetworkDataTaskCocoa* NetworkSessionCocoa::dataTaskForIdentifier(NetworkDataTaskCocoa::TaskIdentifier taskIdentifier, WebCore::StoredCredentials storedCredentials)
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
if (storedCredentials == WebCore::StoredCredentials::AllowStoredCredentials)
return m_dataTaskMapWithCredentials.get(taskIdentifier);
return m_dataTaskMapWithoutCredentials.get(taskIdentifier);
Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (218762 => 218763)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2017-06-23 21:18:28 UTC (rev 218763)
@@ -37,7 +37,7 @@
void CoordinatedGraphicsScene::dispatchOnMainThread(Function<void()>&& function)
{
- if (isMainThread()) {
+ if (RunLoop::isMain()) {
function();
return;
}
@@ -589,7 +589,7 @@
ensureRootLayer();
Vector<Function<void()>> renderQueue;
- bool calledOnMainThread = WTF::isMainThread();
+ bool calledOnMainThread = RunLoop::isMain();
if (!calledOnMainThread)
m_renderQueueMutex.lock();
renderQueue = WTFMove(m_renderQueue);
@@ -642,7 +642,7 @@
void CoordinatedGraphicsScene::detach()
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
m_isActive = false;
m_client = nullptr;
LockHolder locker(m_renderQueueMutex);
@@ -654,7 +654,7 @@
if (!m_isActive)
return;
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
LockHolder locker(m_renderQueueMutex);
m_renderQueue.append(WTFMove(function));
}
Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp (218762 => 218763)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp 2017-06-23 21:18:28 UTC (rev 218763)
@@ -45,7 +45,7 @@
public:
static WorkQueuePool& singleton()
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
static NeverDestroyed<WorkQueuePool> workQueuePool;
return workQueuePool;
}
@@ -52,7 +52,7 @@
void dispatch(void* context, Function<void ()>&& function)
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
getOrCreateWorkQueueForContext(context).dispatch(WTFMove(function));
}
@@ -119,7 +119,7 @@
CompositingRunLoop::~CompositingRunLoop()
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
// Make sure the WorkQueue is deleted after the CompositingRunLoop, because m_updateTimer has a reference
// of the WorkQueue run loop. Passing this is not a problem because the pointer will only be used as a
// HashMap key by WorkQueuePool.
@@ -128,13 +128,13 @@
void CompositingRunLoop::performTask(Function<void ()>&& function)
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
WorkQueuePool::singleton().dispatch(this, WTFMove(function));
}
void CompositingRunLoop::performTaskSync(Function<void ()>&& function)
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
LockHolder locker(m_dispatchSyncConditionMutex);
WorkQueuePool::singleton().dispatch(this, [this, function = WTFMove(function)] {
function();
Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (218762 => 218763)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2017-06-23 21:18:28 UTC (rev 218763)
@@ -81,7 +81,7 @@
void ThreadedCompositor::createGLContext()
{
- ASSERT(!isMainThread());
+ ASSERT(!RunLoop::isMain());
ASSERT(m_nativeSurfaceHandle);
@@ -165,13 +165,13 @@
void ThreadedCompositor::renderNextFrame()
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
m_client.renderNextFrame();
}
void ThreadedCompositor::commitScrollOffset(uint32_t layerID, const IntSize& offset)
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
m_client.commitScrollOffset(layerID, offset);
}
@@ -239,7 +239,7 @@
void ThreadedCompositor::updateSceneState(const CoordinatedGraphicsState& state)
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
m_scene->appendUpdate([this, scene = makeRef(*m_scene), state] {
scene->commitSceneState(state);
@@ -259,7 +259,7 @@
void ThreadedCompositor::releaseUpdateAtlases(Vector<uint32_t>&& atlasesToRemove)
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
m_scene->appendUpdate([scene = makeRef(*m_scene), atlasesToRemove = WTFMove(atlasesToRemove)] {
scene->releaseUpdateAtlases(atlasesToRemove);
});
@@ -294,7 +294,7 @@
void ThreadedCompositor::frameComplete()
{
- ASSERT(!isMainThread());
+ ASSERT(!RunLoop::isMain());
sceneUpdateFinished();
}
Modified: trunk/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp (218762 => 218763)
--- trunk/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp 2017-06-23 21:18:28 UTC (rev 218763)
@@ -302,7 +302,7 @@
// Since NPAPI behavior on a background thread is undefined, it is okay to limit this workaround to the one API
// that is known to be misused during plugin teardown, and to not be concerned about change in behavior if this
// occured at any other time.
- if (!isMainThread()) {
+ if (!RunLoop::isMain()) {
RunLoop::main().dispatch([npObject] {
NP_Deallocate(npObject);
});
Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp (218762 => 218763)
--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2017-06-23 21:18:28 UTC (rev 218763)
@@ -33,6 +33,7 @@
#include <WebCore/SecurityOriginData.h>
#include <WebCore/TextEncoding.h>
#include <wtf/MainThread.h>
+#include <wtf/RunLoop.h>
#include <wtf/WorkQueue.h>
#include <wtf/text/CString.h>
@@ -143,7 +144,7 @@
Vector<SecurityOriginData> LocalStorageDatabaseTracker::deleteDatabasesModifiedSince(std::chrono::system_clock::time_point time)
{
- ASSERT(!isMainThread());
+ ASSERT(!RunLoop::isMain());
importOriginIdentifiers();
Vector<String> originIdentifiersToDelete;
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (218762 => 218763)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-06-23 21:18:28 UTC (rev 218763)
@@ -212,7 +212,7 @@
void WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores(OptionSet<WebsiteDataType> dataTypes, Vector<String>&& topPrivatelyControlledDomains, bool shouldNotifyPage, Function<void(Vector<String>)>&& completionHandler)
{
// We expect this to be called on the main thread so we get the default website data store.
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
struct CallbackAggregator : ThreadSafeRefCounted<CallbackAggregator> {
explicit CallbackAggregator(Function<void(Vector<String>)>&& completionHandler)
@@ -259,7 +259,7 @@
callbackAggregator->addPendingCallback();
dataStore.removeDataForTopPrivatelyControlledDomains(dataTypes, { }, topPrivatelyControlledDomains, [callbackAggregator, shouldNotifyPage, page](Vector<String>&& domainsWithDeletedWebsiteData) {
// When completing the task, we should be getting called on the main thread.
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
if (shouldNotifyPage)
page.value->postMessageToInjectedBundle("WebsiteDataDeletionForTopPrivatelyOwnedDomainsFinished", nullptr);
@@ -273,7 +273,7 @@
void WebProcessProxy::topPrivatelyControlledDomainsWithWebsiteData(OptionSet<WebsiteDataType> dataTypes, bool shouldNotifyPage, Function<void(HashSet<String>&&)>&& completionHandler)
{
// We expect this to be called on the main thread so we get the default website data store.
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
struct CallbackAggregator : ThreadSafeRefCounted<CallbackAggregator> {
explicit CallbackAggregator(Function<void(HashSet<String>&&)>&& completionHandler)
@@ -321,7 +321,7 @@
callbackAggregator->addPendingCallback();
dataStore.topPrivatelyControlledDomainsWithWebsiteData(dataTypes, { }, [callbackAggregator, shouldNotifyPage, page](HashSet<String>&& domainsWithDataRecords) {
// When completing the task, we should be getting called on the main thread.
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
if (shouldNotifyPage)
page.value->postMessageToInjectedBundle("WebsiteDataScanForTopPrivatelyControlledDomainsFinished", nullptr);
Modified: trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp (218762 => 218763)
--- trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp 2017-06-23 21:18:28 UTC (rev 218763)
@@ -103,7 +103,7 @@
void WebResourceLoadStatisticsStore::removeDataRecords()
{
- ASSERT(!isMainThread());
+ ASSERT(!RunLoop::isMain());
if (!coreStore().shouldRemoveDataRecords())
return;
@@ -176,7 +176,7 @@
void WebResourceLoadStatisticsStore::registerSharedResourceLoadObserver()
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
ResourceLoadObserver::sharedObserver().setStatisticsStore(m_resourceLoadStatisticsStore.copyRef());
ResourceLoadObserver::sharedObserver().setStatisticsQueue(m_statisticsQueue.copyRef());
@@ -200,7 +200,7 @@
void WebResourceLoadStatisticsStore::registerSharedResourceLoadObserver(WTF::Function<void(const Vector<String>& domainsToRemove, const Vector<String>& domainsToAdd, bool clearFirst)>&& shouldPartitionCookiesForDomainsHandler)
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
registerSharedResourceLoadObserver();
m_resourceLoadStatisticsStore->setShouldPartitionCookiesCallback([shouldPartitionCookiesForDomainsHandler = WTFMove(shouldPartitionCookiesForDomainsHandler)] (const Vector<String>& domainsToRemove, const Vector<String>& domainsToAdd, bool clearFirst) {
@@ -276,7 +276,7 @@
void WebResourceLoadStatisticsStore::writeStoreToDisk()
{
- ASSERT(!isMainThread());
+ ASSERT(!RunLoop::isMain());
auto encoder = coreStore().createEncoderFromData();
writeEncoderToDisk(*encoder.get(), "full_browsing_session");
@@ -284,7 +284,7 @@
void WebResourceLoadStatisticsStore::writeEncoderToDisk(KeyedEncoder& encoder, const String& label) const
{
- ASSERT(!isMainThread());
+ ASSERT(!RunLoop::isMain());
RefPtr<SharedBuffer> rawData = encoder.finishEncoding();
if (!rawData)
Modified: trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm (218762 => 218763)
--- trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2017-06-23 21:18:28 UTC (rev 218763)
@@ -427,7 +427,7 @@
[highlightView setCornerRadius:highlightBorderRadius];
[highlightView setColor:highlightColor];
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
[self addSubview:highlightView.get()];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, duration * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
[highlightView removeFromSuperview];
Modified: trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm (218762 => 218763)
--- trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2017-06-23 21:18:28 UTC (rev 218763)
@@ -614,7 +614,7 @@
- (void)_uploadItemForImageData:(NSData *)imageData imageName:(NSString *)imageName successBlock:(void (^)(_WKFileUploadItem *))successBlock failureBlock:(void (^)(void))failureBlock
{
ASSERT_ARG(imageData, imageData);
- ASSERT(!isMainThread());
+ ASSERT(!RunLoop::isMain());
NSString * const kTemporaryDirectoryName = @"WKWebFileUpload";
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp (218762 => 218763)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp 2017-06-23 21:18:28 UTC (rev 218763)
@@ -42,7 +42,7 @@
void WebFrameNetworkingContext::ensurePrivateBrowsingSession(SessionID sessionID)
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
ASSERT(sessionID.isEphemeral());
if (NetworkStorageSession::storageSession(sessionID))
Modified: trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestInputStream.cpp (218762 => 218763)
--- trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestInputStream.cpp 2017-06-23 20:50:26 UTC (rev 218762)
+++ trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestInputStream.cpp 2017-06-23 21:18:28 UTC (rev 218763)
@@ -79,7 +79,7 @@
static void webkitSoupRequestInputStreamReadAsync(GInputStream* inputStream, void* buffer, gsize count, int /*priority*/, GCancellable* cancellable, GAsyncReadyCallback callback, gpointer userData)
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
WebKitSoupRequestInputStream* stream = WEBKIT_SOUP_REQUEST_INPUT_STREAM(inputStream);
GRefPtr<GTask> task = adoptGRef(g_task_new(stream, cancellable, callback, userData));
@@ -142,7 +142,7 @@
void webkitSoupRequestInputStreamAddData(WebKitSoupRequestInputStream* stream, const void* data, size_t dataLength)
{
- ASSERT(isMainThread());
+ ASSERT(RunLoop::isMain());
if (webkitSoupRequestInputStreamFinished(stream))
return;
