Attachment 394390 Details for Bug 209358 – Patch

[patch] Patch

bug-209358.diff (text/plain), 3.31 KB, created by Don Olmstead on 2020-03-24 11:57:26 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2020-03-24 11:57:26 PDT

Size: 3.31 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index 5dcf196e5eb3..0f564b0e5e86 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,15 @@
>+2020-03-20  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [MSVC] Remove experimental lambda processor usage
>+        https://bugs.webkit.org/show_bug.cgi?id=209358
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove /experimental:newLambdaProcessor since WebKit is no longer able to build
>+        with this setting as of Visual Studio 16.5.0.
>+
>+        * Source/cmake/OptionsMSVC.cmake:
>+
> 2020-03-17  Philippe Normand  <pnormand@igalia.com>
> 
>         RELEASE_LOG should not be Cocoa specific
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index df190cf40f23..3fa23957a926 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2020-03-20  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [MSVC] Remove experimental lambda processor usage
>+        https://bugs.webkit.org/show_bug.cgi?id=209358
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Fix build for Visual Studio scoping issue for lambdas. The experimental lambada
>+        processor did build this code but is now failing to build WebKit at all.
>+
>+        * dom/DocumentStorageAccess.cpp:
>+        (WebCore::DocumentStorageAccess::requestStorageAccess):
>+
> 2020-03-20  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][IFC] Avoid infinite loop when stuck on partial content
>diff --git a/Source/WebCore/dom/DocumentStorageAccess.cpp b/Source/WebCore/dom/DocumentStorageAccess.cpp
>index be6944d638cb..0f52d601e600 100644
>--- a/Source/WebCore/dom/DocumentStorageAccess.cpp
>+++ b/Source/WebCore/dom/DocumentStorageAccess.cpp
>@@ -182,7 +182,7 @@ void DocumentStorageAccess::requestStorageAccess(Ref<DeferredPromise>&& promise)
>         bool shouldPreserveUserGesture = wasGranted == StorageAccessWasGranted::Yes || promptWasShown == StorageAccessPromptWasShown::No;
> 
>         if (shouldPreserveUserGesture) {
>-            m_document.eventLoop().queueMicrotask([this, weakThis = makeWeakPtr(*this)] {
>+            m_document.eventLoop().queueMicrotask([this, weakThis = makeWeakPtr(*weakThis)] {
>                 if (weakThis)
>                     enableTemporaryTimeUserGesture();
>             });
>@@ -197,7 +197,7 @@ void DocumentStorageAccess::requestStorageAccess(Ref<DeferredPromise>&& promise)
>         }
> 
>         if (shouldPreserveUserGesture) {
>-            m_document.eventLoop().queueMicrotask([this, weakThis = makeWeakPtr(*this)] {
>+            m_document.eventLoop().queueMicrotask([this, weakThis = makeWeakPtr(*weakThis)] {
>                 if (weakThis)
>                     consumeTemporaryTimeUserGesture();
>             });
>diff --git a/Source/cmake/OptionsMSVC.cmake b/Source/cmake/OptionsMSVC.cmake
>index 2ab23e4fb375..9f2d755038c4 100644
>--- a/Source/cmake/OptionsMSVC.cmake
>+++ b/Source/cmake/OptionsMSVC.cmake
>@@ -29,11 +29,6 @@ endif ()
> # Specify the source code encoding
> add_compile_options(/utf-8 /validate-charset)
> 
>-# Enable the new lambda processor for better C++ conformance with /std:c++17
>-if (NOT COMPILER_IS_CLANG_CL)
>-    add_compile_options(/experimental:newLambdaProcessor)
>-endif ()
>-
> if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
>     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:NOREF /OPT:NOICF")
>     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:NOREF /OPT:NOICF")

Actions: View | Formatted Diff | Diff

Attachments on bug 209358: 394111 | 394390 | 394697