Changeset 241924 in webkit

Timestamp:

Feb 21, 2019 5:05:08 PM (5 years ago)

Author:

don.olmstead@sony.com

Message:

[MSVC] Fix compilation errors with lambdas in ResourceLoadStatistics
​https://bugs.webkit.org/show_bug.cgi?id=194913

Reviewed by Brent Fulgham.

MSVC has problems with the scoping of this within a nested lambda. To work around the
behavior the enclosing lambda's wrapping of this is used within the nested lambda.

• NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp:

(WebKit::ResourceLoadStatisticsMemoryStore::processStatisticsAndDataRecords):

• NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:

(WebKit::WebResourceLoadStatisticsStore::requestStorageAccessGranted):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp (modified) (2 diffs)
• NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-02-21  Don Olmstead  <don.olmstead@sony.com>
+
+        [MSVC] Fix compilation errors with lambdas in ResourceLoadStatistics
+        https://bugs.webkit.org/show_bug.cgi?id=194913
+
+        Reviewed by Brent Fulgham.
+
+        MSVC has problems with the scoping of `this` within a nested lambda. To work around the
+        behavior the enclosing lambda's wrapping of `this` is used within the nested lambda.
+
+        * NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp:
+        (WebKit::ResourceLoadStatisticsMemoryStore::processStatisticsAndDataRecords):
+        * NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:
+        (WebKit::WebResourceLoadStatisticsStore::requestStorageAccessGranted):
+
 2019-02-21  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp

@@ -355 +355 @@
     }
 
-    removeDataRecords([this, weakThis = makeWeakPtr(*this)] {
+    removeDataRecords([this, weakThis = makeWeakPtr(*this)]() mutable {
         ASSERT(!RunLoop::isMain());
         if (!weakThis)
@@ -367 +367 @@
             return;
 
-        RunLoop::main().dispatch([this, weakThis = makeWeakPtr(*this)] {
+        RunLoop::main().dispatch([this, weakThis = WTFMove(weakThis)]() {
             ASSERT(RunLoop::isMain());
             if (!weakThis)

trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp

@@ -31 +31 @@
 #include "APIDictionary.h"
 #include "Logging.h"
+#include "NetworkProcess.h"
 #include "NetworkSession.h"
 #include "ResourceLoadStatisticsMemoryStore.h"
@@ -306 +307 @@
             auto subFramePrimaryDomain = ResourceLoadStatistics::primaryDomain(subFrameHost);
             auto topFramePrimaryDomain = ResourceLoadStatistics::primaryDomain(topFrameHost);
-            CompletionHandler<void(bool)> requestConfirmationCompletionHandler = [this, protectedThis = makeRef(*this), subFrameHost = WTFMove(subFrameHost), topFrameHost = WTFMove(topFrameHost), frameID, pageID, completionHandler = WTFMove(completionHandler)] (bool userDidGrantAccess) mutable {
+            CompletionHandler<void(bool)> requestConfirmationCompletionHandler = [this, protectedThis = protectedThis.copyRef(), subFrameHost = WTFMove(subFrameHost), topFrameHost = WTFMove(topFrameHost), frameID, pageID, completionHandler = WTFMove(completionHandler)] (bool userDidGrantAccess) mutable {
                 if (userDidGrantAccess)
                     grantStorageAccess(WTFMove(subFrameHost), WTFMove(topFrameHost), frameID, pageID, userDidGrantAccess, WTFMove(completionHandler));