Title: [228478] trunk/Source/WebKit
Revision
228478
Author
wilan...@apple.com
Date
2018-02-14 11:47:57 -0800 (Wed, 14 Feb 2018)

Log Message

Make maximumParallelReadCount static to fix lambda capture error in WebKit::NetworkCache::Storage::traverse()
https://bugs.webkit.org/show_bug.cgi?id=182797
<rdar://problem/37540594>

Reviewed by Tim Horton.

This capture was added in r228455 and causes a build failure when
run with -Wunused-lambda-capture. Xcode also warns about it.

* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::traverse):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (228477 => 228478)


--- trunk/Source/WebKit/ChangeLog	2018-02-14 19:46:47 UTC (rev 228477)
+++ trunk/Source/WebKit/ChangeLog	2018-02-14 19:47:57 UTC (rev 228478)
@@ -1,3 +1,17 @@
+2018-02-14  John Wilander  <wilan...@apple.com>
+
+        Make maximumParallelReadCount static to fix lambda capture error in WebKit::NetworkCache::Storage::traverse()
+        https://bugs.webkit.org/show_bug.cgi?id=182797
+        <rdar://problem/37540594>
+
+        Reviewed by Tim Horton.
+
+        This capture was added in r228455 and causes a build failure when
+        run with -Wunused-lambda-capture. Xcode also warns about it.
+
+        * NetworkProcess/cache/NetworkCacheStorage.cpp:
+        (WebKit::NetworkCache::Storage::traverse):
+
 2018-02-14  Ryosuke Niwa  <rn...@webkit.org>
 
         EventDispatcher::wheelEvent uses a wrong enum values in switch

Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp (228477 => 228478)


--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp	2018-02-14 19:46:47 UTC (rev 228477)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp	2018-02-14 19:47:57 UTC (rev 228478)
@@ -907,8 +907,8 @@
                 traverseOperation.activeCondition.notifyOne();
             });
 
-            const unsigned maximumParallelReadCount = 5;
-            traverseOperation.activeCondition.wait(lock, [&traverseOperation, maximumParallelReadCount] {
+            static const unsigned maximumParallelReadCount = 5;
+            traverseOperation.activeCondition.wait(lock, [&traverseOperation] {
                 return traverseOperation.activeCount <= maximumParallelReadCount;
             });
         });
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to