Changeset 241820 in webkit

Timestamp:

Feb 20, 2019 10:23:19 AM (5 years ago)

Author:

don.olmstead@sony.com

Message:

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

Reviewed by Alex Christensen.

Source/WebCore:

No new tests. No change in behavior.

MSVC has problems with the scoping of this within a nested lambda. In these cases this is
referring to the enclosing lambda according to MSVC. This patch works around this behavior
through by using the protectedThis pattern in WebKit code.

• workers/service/server/RegistrationDatabase.cpp:

(WebCore::RegistrationDatabase::openSQLiteDatabase):

Source/WebKit:

• WebProcess/Storage/ServiceWorkerClientFetch.cpp:

(WebKit::ServiceWorkerClientFetch::didReceiveRedirectResponse):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/workers/service/server/RegistrationDatabase.cpp (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/Storage/ServiceWorkerClientFetch.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-02-20  Don Olmstead  <don.olmstead@sony.com>
+
+        [MSVC] Fix compilation errors with lambdas in Service Workers
+        https://bugs.webkit.org/show_bug.cgi?id=194841
+
+        Reviewed by Alex Christensen.
+
+        No new tests. No change in behavior.
+
+        MSVC has problems with the scoping of `this` within a nested lambda. In these cases `this` is
+        referring to the enclosing lambda according to MSVC. This patch works around this behavior
+        through by using the `protectedThis` pattern in WebKit code.
+
+        * workers/service/server/RegistrationDatabase.cpp:
+        (WebCore::RegistrationDatabase::openSQLiteDatabase):
+
 2019-02-20  Adrian Perez de Castro  <aperez@igalia.com>
 

trunk/Source/WebCore/workers/service/server/RegistrationDatabase.cpp

@@ -134 +134 @@
 
     String errorMessage;
-    auto scopeExit = makeScopeExit([&, errorMessage = &errorMessage] {
+    auto scopeExit = makeScopeExit([this, protectedThis = makeRef(*this), errorMessage = &errorMessage] {
         ASSERT_UNUSED(errorMessage, !errorMessage->isNull());
 
@@ -144 +144 @@
 
         m_database = nullptr;
-        callOnMainThread([protectedThis = makeRef(*this)] {
+        callOnMainThread([protectedThis = protectedThis.copyRef()] {
             protectedThis->databaseFailedToOpen();
         });

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-02-20  Don Olmstead  <don.olmstead@sony.com>
+
+        [MSVC] Fix compilation errors with lambdas in Service Workers
+        https://bugs.webkit.org/show_bug.cgi?id=194841
+
+        Reviewed by Alex Christensen.
+
+        * WebProcess/Storage/ServiceWorkerClientFetch.cpp:
+        (WebKit::ServiceWorkerClientFetch::didReceiveRedirectResponse):
+
 2019-02-20  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/WebProcess/Storage/ServiceWorkerClientFetch.cpp

@@ -116 +116 @@
         response.setSource(ResourceResponse::Source::ServiceWorker);
 
-        m_loader->willSendRequest(m_loader->request().redirectedRequest(response, m_shouldClearReferrerOnHTTPSToHTTPRedirect), response, [protectedThis = makeRef(*this), this](ResourceRequest&& request) {
+        m_loader->willSendRequest(m_loader->request().redirectedRequest(response, m_shouldClearReferrerOnHTTPSToHTTPRedirect), response, [this, protectedThis = protectedThis.copyRef()](ResourceRequest&& request) {
             if (!m_loader || request.isNull()) {
                 if (auto callback = WTFMove(m_callback))