Attachment 343593 Details for Bug 187035 – Patch

[patch] Patch

bug-187035-20180626172251.patch (text/plain), 3.92 KB, created by Fujii Hironori on 2018-06-26 01:22:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-06-26 01:22:53 PDT

Size: 3.92 KB

patch

obsolete

>Subversion Revision: 233191
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 3c07cd5583b58fa2e25f96de25845356a3333513..5184ff3edd13032933ba53491a1f6b463f97ea83 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,23 @@
>+2018-06-26  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [Win] 'deref': is not a member of 'WebKit::WebResourceLoadStatisticsStore::updateCookiePartitioningForDomains::<lambda_9d761a6dc12d95db7fa2d6f3f5aa26fa>'
>+        https://bugs.webkit.org/show_bug.cgi?id=187035
>+
>+        Unreviewed build fix.
>+
>+        MSVC can't compile the code using `this` in a generalized lambda
>+        capture in another lambda.
>+
>+        In this case, there is no need to copy `protectedThis` for the
>+        inner lambda. Move `protectedThis` of the outer lambda to the
>+        inner as well as `completionHandler`.
>+
>+        * UIProcess/WebResourceLoadStatisticsStore.cpp:
>+        (WebKit::WebResourceLoadStatisticsStore::updateCookiePartitioning):
>+        Moved `protectedThis` from the outer lambda to the inner.
>+        (WebKit::WebResourceLoadStatisticsStore::updateCookiePartitioningForDomains):
>+        Ditto.
>+
> 2018-06-25  Tim Horton  <timothy_horton@apple.com>
> 
>         WKThumbnailView fallback background is blindingly bright in Dark Mode
>diff --git a/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp b/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp
>index 4c6e578e4129f9fc1be55d451599802f5b8f4c46..b08c2814a2b75176ee8249d8e4a26ab6ec3029ad 100644
>--- a/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp
>+++ b/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp
>@@ -1321,7 +1321,7 @@ void WebResourceLoadStatisticsStore::updateCookiePartitioning(CompletionHandler<
> #endif
> 
>     RunLoop::main().dispatch([this, protectedThis = makeRef(*this), domainsToPartition = crossThreadCopy(domainsToPartition), domainsToBlock = crossThreadCopy(domainsToBlock), domainsToNeitherPartitionNorBlock = crossThreadCopy(domainsToNeitherPartitionNorBlock), completionHandler = WTFMove(completionHandler)] () mutable {
>-        m_updatePrevalentDomainsToPartitionOrBlockCookiesHandler(domainsToPartition, domainsToBlock, domainsToNeitherPartitionNorBlock, ShouldClearFirst::No, [this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)]() mutable {
>+        m_updatePrevalentDomainsToPartitionOrBlockCookiesHandler(domainsToPartition, domainsToBlock, domainsToNeitherPartitionNorBlock, ShouldClearFirst::No, [this, protectedThis = WTFMove(protectedThis), completionHandler = WTFMove(completionHandler)]() mutable {
>             m_statisticsQueue->dispatch([completionHandler = WTFMove(completionHandler)]() mutable {
>                 completionHandler();
>             });
>@@ -1357,7 +1357,7 @@ void WebResourceLoadStatisticsStore::updateCookiePartitioningForDomains(const Ve
>         ensureResourceStatisticsForPrimaryDomain(domain).isMarkedForCookieBlocking = true;
> 
>     RunLoop::main().dispatch([this, shouldClearFirst, protectedThis = makeRef(*this), domainsToPartition = crossThreadCopy(domainsToPartition), domainsToBlock = crossThreadCopy(domainsToBlock), domainsToNeitherPartitionNorBlock = crossThreadCopy(domainsToNeitherPartitionNorBlock), completionHandler = WTFMove(completionHandler)] () mutable {
>-        m_updatePrevalentDomainsToPartitionOrBlockCookiesHandler(domainsToPartition, domainsToBlock, domainsToNeitherPartitionNorBlock, shouldClearFirst, [this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)]() mutable {
>+        m_updatePrevalentDomainsToPartitionOrBlockCookiesHandler(domainsToPartition, domainsToBlock, domainsToNeitherPartitionNorBlock, shouldClearFirst, [this, protectedThis = WTFMove(protectedThis), completionHandler = WTFMove(completionHandler)]() mutable {
>             m_statisticsQueue->dispatch([completionHandler = WTFMove(completionHandler)]() mutable {
>                 completionHandler();
>             });

Actions: View | Formatted Diff | Diff

Attachments on bug 187035: 343593