Title: [244653] trunk
Revision
244653
Author
[email protected]
Date
2019-04-25 10:41:29 -0700 (Thu, 25 Apr 2019)

Log Message

Start using C++17
https://bugs.webkit.org/show_bug.cgi?id=197131

.:

Reviewed by Darin Adler.

* Source/cmake/OptionsMSVC.cmake:
* Source/cmake/WebKitCompilerFlags.cmake:

Source/bmalloc:

Reviewed by Darin Adler.

* Configurations/Base.xcconfig:

Source/_javascript_Core:

Reviewed by Darin Alder.

* Configurations/Base.xcconfig:

Source/ThirdParty:

Reviewed by Darin Adler.

* gtest/xcode/Config/General.xcconfig:

Source/ThirdParty/ANGLE:

Reviewed by Darin Adler.

* Configurations/Base.xcconfig:

Source/ThirdParty/libwebrtc:

Reviewed by Darin Adler.

* Configurations/Base.xcconfig:

Source/WebCore:

Reviewed by Darin Adler.

* Configurations/Base.xcconfig:
* DerivedSources.make:

Source/WebCore/PAL:

Reviewed by Darin Adler.

* Configurations/Base.xcconfig:

Source/WebInspectorUI:

Reviewed by Darin Adler.

* Configurations/Base.xcconfig:

Source/WebKit:

Reviewed by Darin Adler.

* Configurations/Base.xcconfig:
* DerivedSources.make:

Source/WebKitLegacy/mac:

Reviewed by Darin Adler.

* Configurations/Base.xcconfig:

Source/WTF:

Reviewed by Darin Adler.

* Configurations/Base.xcconfig:
* wtf/CMakeLists.txt:
* wtf/Variant.h:
(WTF::switchOn):

Tools:

Reviewed by Darin Adler.

* DumpRenderTree/mac/Configurations/Base.xcconfig:
* MiniBrowser/Configurations/Base.xcconfig:
* MobileMiniBrowser/Configurations/Base.xcconfig:
* TestWebKitAPI/Configurations/Base.xcconfig:
* WebKitTestRunner/Configurations/Base.xcconfig:

Modified Paths

Diff

Modified: trunk/ChangeLog (244652 => 244653)


--- trunk/ChangeLog	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/ChangeLog	2019-04-25 17:41:29 UTC (rev 244653)
@@ -1,3 +1,13 @@
+2019-04-25  Alex Christensen  <[email protected]>
+
+        Start using C++17
+        https://bugs.webkit.org/show_bug.cgi?id=197131
+
+        Reviewed by Darin Adler.
+
+        * Source/cmake/OptionsMSVC.cmake:
+        * Source/cmake/WebKitCompilerFlags.cmake:
+
 2019-04-24  Carlos Garcia Campos  <[email protected]>
 
         [GTK] Hardcoded text color in input fields

Modified: trunk/Source/_javascript_Core/ChangeLog (244652 => 244653)


--- trunk/Source/_javascript_Core/ChangeLog	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/_javascript_Core/ChangeLog	2019-04-25 17:41:29 UTC (rev 244653)
@@ -1,5 +1,14 @@
 2019-04-25  Alex Christensen  <[email protected]>
 
+        Start using C++17
+        https://bugs.webkit.org/show_bug.cgi?id=197131
+
+        Reviewed by Darin Alder.
+
+        * Configurations/Base.xcconfig:
+
+2019-04-25  Alex Christensen  <[email protected]>
+
         Remove DeprecatedOptional
         https://bugs.webkit.org/show_bug.cgi?id=197161
 

Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (244652 => 244653)


--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2019-04-25 17:41:29 UTC (rev 244653)
@@ -33,7 +33,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++17;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (244652 => 244653)


--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2019-04-25 17:41:29 UTC (rev 244653)
@@ -1,3 +1,12 @@
+2019-04-25  Alex Christensen  <[email protected]>
+
+        Start using C++17
+        https://bugs.webkit.org/show_bug.cgi?id=197131
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig:
+
 2019-03-22  Keith Rollin  <[email protected]>
 
         Enable ThinLTO support in Production builds

Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (244652 => 244653)


--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2019-04-25 17:41:29 UTC (rev 244653)
@@ -10,7 +10,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++17;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;

Modified: trunk/Source/ThirdParty/ChangeLog (244652 => 244653)


--- trunk/Source/ThirdParty/ChangeLog	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/ThirdParty/ChangeLog	2019-04-25 17:41:29 UTC (rev 244653)
@@ -1,3 +1,12 @@
+2019-04-25  Alex Christensen  <[email protected]>
+
+        Start using C++17
+        https://bugs.webkit.org/show_bug.cgi?id=197131
+
+        Reviewed by Darin Adler.
+
+        * gtest/xcode/Config/General.xcconfig:
+
 2018-10-30  Don Olmstead  <[email protected]>
 
         [PlayStation] Enable _javascript_Core

Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (244652 => 244653)


--- trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig	2019-04-25 17:41:29 UTC (rev 244653)
@@ -51,7 +51,7 @@
 GCC_C_LANGUAGE_STANDARD = c99
 
 // Force C++14
-CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++17;
 
 // not sure why apple defaults this on, but it's pretty risky
 ALWAYS_SEARCH_USER_PATHS = NO

Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (244652 => 244653)


--- trunk/Source/ThirdParty/libwebrtc/ChangeLog	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog	2019-04-25 17:41:29 UTC (rev 244653)
@@ -1,3 +1,12 @@
+2019-04-25  Alex Christensen  <[email protected]>
+
+        Start using C++17
+        https://bugs.webkit.org/show_bug.cgi?id=197131
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig:
+
 2019-04-23  Alex Christensen  <[email protected]>
 
         Add unit tests for WKWebView.serverTrust

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig (244652 => 244653)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig	2019-04-25 17:41:29 UTC (rev 244653)
@@ -12,7 +12,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++17;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_ARC = YES;
 CLANG_ENABLE_OBJC_WEAK = YES;

Modified: trunk/Source/WTF/ChangeLog (244652 => 244653)


--- trunk/Source/WTF/ChangeLog	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/WTF/ChangeLog	2019-04-25 17:41:29 UTC (rev 244653)
@@ -1,5 +1,17 @@
 2019-04-25  Alex Christensen  <[email protected]>
 
+        Start using C++17
+        https://bugs.webkit.org/show_bug.cgi?id=197131
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig:
+        * wtf/CMakeLists.txt:
+        * wtf/Variant.h:
+        (WTF::switchOn):
+
+2019-04-25  Alex Christensen  <[email protected]>
+
         Remove DeprecatedOptional
         https://bugs.webkit.org/show_bug.cgi?id=197161
 

Modified: trunk/Source/WTF/Configurations/Base.xcconfig (244652 => 244653)


--- trunk/Source/WTF/Configurations/Base.xcconfig	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/WTF/Configurations/Base.xcconfig	2019-04-25 17:41:29 UTC (rev 244653)
@@ -33,7 +33,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++17;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_ARC = YES;
 CLANG_ENABLE_OBJC_WEAK = YES;

Modified: trunk/Source/WTF/wtf/Variant.h (244652 => 244653)


--- trunk/Source/WTF/wtf/Variant.h	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/WTF/wtf/Variant.h	2019-04-25 17:41:29 UTC (rev 244653)
@@ -2044,9 +2044,9 @@
 // -- WebKit Additions --
 
 template<class V, class... F>
-auto switchOn(V&& v, F&&... f) -> decltype(visit(makeVisitor(std::forward<F>(f)...), std::forward<V>(v)))
+auto switchOn(V&& v, F&&... f) -> decltype(WTF::visit(makeVisitor(std::forward<F>(f)...), std::forward<V>(v)))
 {
-    return visit(makeVisitor(std::forward<F>(f)...), std::forward<V>(v));
+    return WTF::visit(makeVisitor(std::forward<F>(f)...), std::forward<V>(v));
 }
 
 } // namespace WTF

Modified: trunk/Source/WebCore/ChangeLog (244652 => 244653)


--- trunk/Source/WebCore/ChangeLog	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/WebCore/ChangeLog	2019-04-25 17:41:29 UTC (rev 244653)
@@ -1,3 +1,13 @@
+2019-04-25  Alex Christensen  <[email protected]>
+
+        Start using C++17
+        https://bugs.webkit.org/show_bug.cgi?id=197131
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig:
+        * DerivedSources.make:
+
 2019-04-25  Commit Queue  <[email protected]>
 
         Unreviewed, rolling out r244627.

Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (244652 => 244653)


--- trunk/Source/WebCore/Configurations/Base.xcconfig	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig	2019-04-25 17:41:29 UTC (rev 244653)
@@ -33,7 +33,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++17;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;

Modified: trunk/Source/WebCore/DerivedSources.make (244652 => 244653)


--- trunk/Source/WebCore/DerivedSources.make	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/WebCore/DerivedSources.make	2019-04-25 17:41:29 UTC (rev 244653)
@@ -1115,35 +1115,35 @@
     TARGET_TRIPLE_FLAGS=-target $(WK_CURRENT_ARCH)-$(LLVM_TARGET_TRIPLE_VENDOR)-$(LLVM_TARGET_TRIPLE_OS_VERSION)$(LLVM_TARGET_TRIPLE_SUFFIX)
 endif
 
-ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS_FAMILY ' | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS_FAMILY ' | cut -d' ' -f3), 1)
     WTF_PLATFORM_IOS_FAMILY = 1
 else
     WTF_PLATFORM_IOS_FAMILY = 0
 endif
 
-ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_MAC ' | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_MAC ' | cut -d' ' -f3), 1)
     WTF_PLATFORM_MAC = 1
 else
     WTF_PLATFORM_MAC = 0
 endif
 
-ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep USE_APPLE_INTERNAL_SDK | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep USE_APPLE_INTERNAL_SDK | cut -d' ' -f3), 1)
     USE_APPLE_INTERNAL_SDK = 1
 else
     USE_APPLE_INTERNAL_SDK = 0
 endif
 
-ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep HAVE_OS_DARK_MODE_SUPPORT | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep HAVE_OS_DARK_MODE_SUPPORT | cut -d' ' -f3), 1)
     HAVE_OS_DARK_MODE_SUPPORT = 1
 else
     HAVE_OS_DARK_MODE_SUPPORT = 0
 endif
 
-ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1)
     ENABLE_ORIENTATION_EVENTS = 1
 endif
 
-ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_MEDIA_SOURCE | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_MEDIA_SOURCE | cut -d' ' -f3), 1)
 	ENABLE_MEDIA_SOURCE = 1
 endif
 

Modified: trunk/Source/WebCore/PAL/ChangeLog (244652 => 244653)


--- trunk/Source/WebCore/PAL/ChangeLog	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/WebCore/PAL/ChangeLog	2019-04-25 17:41:29 UTC (rev 244653)
@@ -1,3 +1,12 @@
+2019-04-25  Alex Christensen  <[email protected]>
+
+        Start using C++17
+        https://bugs.webkit.org/show_bug.cgi?id=197131
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig:
+
 2019-04-25  Commit Queue  <[email protected]>
 
         Unreviewed, rolling out r244627.

Modified: trunk/Source/WebCore/PAL/Configurations/Base.xcconfig (244652 => 244653)


--- trunk/Source/WebCore/PAL/Configurations/Base.xcconfig	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/WebCore/PAL/Configurations/Base.xcconfig	2019-04-25 17:41:29 UTC (rev 244653)
@@ -33,7 +33,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++17;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;

Modified: trunk/Source/WebCore/platform/ios/LegacyTileGrid.mm (244652 => 244653)


--- trunk/Source/WebCore/platform/ios/LegacyTileGrid.mm	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/WebCore/platform/ios/LegacyTileGrid.mm	2019-04-25 17:41:29 UTC (rev 244653)
@@ -131,9 +131,9 @@
             continue;
         toRemove.append(std::make_pair(distance, index));
         ALLOW_DEPRECATED_DECLARATIONS_BEGIN
-        std::push_heap(toRemove.begin(), toRemove.end(), std::ptr_fun(isFartherAway<TileIndex>));
+        std::push_heap(toRemove.begin(), toRemove.end(), isFartherAway<TileIndex>);
         if (toRemove.size() > tilesToRemoveCount) {
-            std::pop_heap(toRemove.begin(), toRemove.end(), std::ptr_fun(isFartherAway<TileIndex>));
+            std::pop_heap(toRemove.begin(), toRemove.end(), isFartherAway<TileIndex>);
             toRemove.removeLast();
         }
         ALLOW_DEPRECATED_DECLARATIONS_END

Modified: trunk/Source/WebInspectorUI/ChangeLog (244652 => 244653)


--- trunk/Source/WebInspectorUI/ChangeLog	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/WebInspectorUI/ChangeLog	2019-04-25 17:41:29 UTC (rev 244653)
@@ -1,3 +1,12 @@
+2019-04-25  Alex Christensen  <[email protected]>
+
+        Start using C++17
+        https://bugs.webkit.org/show_bug.cgi?id=197131
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig:
+
 2019-04-24  Nikita Vasilyev  <[email protected]>
 
         Web Inspector: Styles: don't start property selection when pressing right mouse button

Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (244652 => 244653)


--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig	2019-04-25 17:41:29 UTC (rev 244653)
@@ -17,7 +17,7 @@
 ALWAYS_SEARCH_USER_PATHS = NO;
 FRAMEWORK_SEARCH_PATHS = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(inherited);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++17;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;

Modified: trunk/Source/WebKit/ChangeLog (244652 => 244653)


--- trunk/Source/WebKit/ChangeLog	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/WebKit/ChangeLog	2019-04-25 17:41:29 UTC (rev 244653)
@@ -1,3 +1,13 @@
+2019-04-25  Alex Christensen  <[email protected]>
+
+        Start using C++17
+        https://bugs.webkit.org/show_bug.cgi?id=197131
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig:
+        * DerivedSources.make:
+
 2019-04-25  Alexander Mikhaylenko  <[email protected]>
 
         [GTK] Back/Forward gesture interferes with scrolling

Modified: trunk/Source/WebKit/Configurations/Base.xcconfig (244652 => 244653)


--- trunk/Source/WebKit/Configurations/Base.xcconfig	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/WebKit/Configurations/Base.xcconfig	2019-04-25 17:41:29 UTC (rev 244653)
@@ -31,7 +31,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++17;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;

Modified: trunk/Source/WebKit/DerivedSources.make (244652 => 244653)


--- trunk/Source/WebKit/DerivedSources.make	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/WebKit/DerivedSources.make	2019-04-25 17:41:29 UTC (rev 244653)
@@ -269,7 +269,7 @@
 AUTOMATION_PROTOCOL_OUTPUT_PATTERNS = $(subst .,%,$(AUTOMATION_PROTOCOL_OUTPUT_FILES))
 
 ifeq ($(OS),MACOS)
-ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS_FAMILY ' | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS_FAMILY ' | cut -d' ' -f3), 1)
 	AUTOMATION_BACKEND_PLATFORM_ARGUMENTS = --platform iOS
 else
 	AUTOMATION_BACKEND_PLATFORM_ARGUMENTS = --platform macOS

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (244652 => 244653)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2019-04-25 17:41:29 UTC (rev 244653)
@@ -1,3 +1,12 @@
+2019-04-25  Alex Christensen  <[email protected]>
+
+        Start using C++17
+        https://bugs.webkit.org/show_bug.cgi?id=197131
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig:
+
 2019-04-25  Commit Queue  <[email protected]>
 
         Unreviewed, rolling out r244627.

Modified: trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig (244652 => 244653)


--- trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig	2019-04-25 17:41:29 UTC (rev 244653)
@@ -33,7 +33,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++17;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;

Modified: trunk/Source/bmalloc/ChangeLog (244652 => 244653)


--- trunk/Source/bmalloc/ChangeLog	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/bmalloc/ChangeLog	2019-04-25 17:41:29 UTC (rev 244653)
@@ -1,3 +1,12 @@
+2019-04-25  Alex Christensen  <[email protected]>
+
+        Start using C++17
+        https://bugs.webkit.org/show_bug.cgi?id=197131
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig:
+
 2019-04-24  Yusuke Suzuki  <[email protected]>
 
         Unreviewed, fix typo in r244481

Modified: trunk/Source/bmalloc/Configurations/Base.xcconfig (244652 => 244653)


--- trunk/Source/bmalloc/Configurations/Base.xcconfig	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/bmalloc/Configurations/Base.xcconfig	2019-04-25 17:41:29 UTC (rev 244653)
@@ -31,7 +31,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++17;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_ARC = YES;
 CLANG_ENABLE_OBJC_WEAK = YES;

Modified: trunk/Source/cmake/OptionsMSVC.cmake (244652 => 244653)


--- trunk/Source/cmake/OptionsMSVC.cmake	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/cmake/OptionsMSVC.cmake	2019-04-25 17:41:29 UTC (rev 244653)
@@ -26,9 +26,9 @@
     add_definitions(-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1)
 endif ()
 
-# Enable C++14
+# Enable C++17
 # https://docs.microsoft.com/en-us/cpp/build/reference/std-specify-language-standard-version
-add_compile_options(/std:c++14)
+add_compile_options(/std:c++17)
 
 # Specify the source code encoding
 add_compile_options(/utf-8 /validate-charset)

Modified: trunk/Source/cmake/WebKitCompilerFlags.cmake (244652 => 244653)


--- trunk/Source/cmake/WebKitCompilerFlags.cmake	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Source/cmake/WebKitCompilerFlags.cmake	2019-04-25 17:41:29 UTC (rev 244653)
@@ -104,11 +104,11 @@
         WEBKIT_APPEND_GLOBAL_COMPILER_FLAGS(-fno-exceptions)
         WEBKIT_APPEND_GLOBAL_CXX_FLAGS(-fno-rtti)
 
-        check_cxx_compiler_flag("-std=c++14" CXX_COMPILER_SUPPORTS_CXX14)
-        if (CXX_COMPILER_SUPPORTS_CXX14)
-            WEBKIT_APPEND_GLOBAL_CXX_FLAGS(-std=c++14)
+        check_cxx_compiler_flag("-std=c++17" CXX_COMPILER_SUPPORTS_CXX17)
+        if (CXX_COMPILER_SUPPORTS_CXX17)
+            WEBKIT_APPEND_GLOBAL_CXX_FLAGS(-std=c++17)
         else ()
-            message(FATAL_ERROR "Compiler with C++14 support is required")
+            message(FATAL_ERROR "Compiler with C++17 support is required")
         endif ()
 
         if (WIN32)

Modified: trunk/Tools/ChangeLog (244652 => 244653)


--- trunk/Tools/ChangeLog	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Tools/ChangeLog	2019-04-25 17:41:29 UTC (rev 244653)
@@ -1,3 +1,16 @@
+2019-04-25  Alex Christensen  <[email protected]>
+
+        Start using C++17
+        https://bugs.webkit.org/show_bug.cgi?id=197131
+
+        Reviewed by Darin Adler.
+
+        * DumpRenderTree/mac/Configurations/Base.xcconfig:
+        * MiniBrowser/Configurations/Base.xcconfig:
+        * MobileMiniBrowser/Configurations/Base.xcconfig:
+        * TestWebKitAPI/Configurations/Base.xcconfig:
+        * WebKitTestRunner/Configurations/Base.xcconfig:
+
 2019-04-25  Commit Queue  <[email protected]>
 
         Unreviewed, rolling out r244627.

Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (244652 => 244653)


--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig	2019-04-25 17:41:29 UTC (rev 244653)
@@ -35,7 +35,7 @@
 
 FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++17;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_CXX0X_EXTENSIONS = NO;

Modified: trunk/Tools/MiniBrowser/Configurations/Base.xcconfig (244652 => 244653)


--- trunk/Tools/MiniBrowser/Configurations/Base.xcconfig	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Tools/MiniBrowser/Configurations/Base.xcconfig	2019-04-25 17:41:29 UTC (rev 244653)
@@ -31,7 +31,7 @@
 
 GCC_PREPROCESSOR_DEFINITIONS = DISABLE_LEGACY_WEBKIT_DEPRECATIONS $(inherited);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++17;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;

Modified: trunk/Tools/MobileMiniBrowser/Configurations/Base.xcconfig (244652 => 244653)


--- trunk/Tools/MobileMiniBrowser/Configurations/Base.xcconfig	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Tools/MobileMiniBrowser/Configurations/Base.xcconfig	2019-04-25 17:41:29 UTC (rev 244653)
@@ -31,7 +31,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 CLANG_ANALYZER_NONNULL = YES;
-CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++17;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_MODULES = YES;
 CLANG_ENABLE_OBJC_ARC = YES;

Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (244652 => 244653)


--- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig	2019-04-25 17:41:29 UTC (rev 244653)
@@ -29,7 +29,7 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++17;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_CXX0X_EXTENSIONS = NO;

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm (244652 => 244653)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm	2019-04-25 17:41:29 UTC (rev 244653)
@@ -27,8 +27,10 @@
 
 #import "TCPServer.h"
 #import "Utilities.h"
+#import <WebKit/WKProcessPoolPrivate.h>
 #import <WebKit/WKWebsiteDataStorePrivate.h>
 #import <WebKit/WebKit.h>
+#import <WebKit/_WKProcessPoolConfiguration.h>
 #import <WebKit/_WKWebsiteDataStoreConfiguration.h>
 #import <wtf/RetainPtr.h>
 
@@ -64,6 +66,7 @@
 
         const char* reply = ""
         "HTTP/1.1 200 OK\r\n"
+        "Strict-Transport-Security: max-age=16070400; includeSubDomains\r\n"
         "Content-Length: 34\r\n\r\n"
         "<script>alert('success!')</script>";
         auto writeResult = SSL_write(ssl, reply, strlen(reply));
@@ -70,10 +73,19 @@
         ASSERT_UNUSED(writeResult, writeResult == static_cast<int>(strlen(reply)));
     });
 
+    RetainPtr<NSString> tempDir = NSTemporaryDirectory();
+    WTFLogAlways("ORIGINAL TEMP DIR %@", tempDir.get());
+    if ([tempDir hasSuffix:@"/"])
+        tempDir = [tempDir substringWithRange:NSMakeRange(0, [tempDir length] - 1)];
+    
+    WTFLogAlways("TEMP DIR %@", tempDir.get());
+    auto poolConfiguration = adoptNS([_WKProcessPoolConfiguration new]);
+    [poolConfiguration setHSTSStorageDirectory:tempDir.get()];
     auto storeConfiguration = adoptNS([_WKWebsiteDataStoreConfiguration new]);
     [storeConfiguration setHTTPSProxy:[NSURL URLWithString:[NSString stringWithFormat:@"https://127.0.0.1:%d/", server.port()]]];
     auto viewConfiguration = adoptNS([WKWebViewConfiguration new]);
     [viewConfiguration setWebsiteDataStore:[[[WKWebsiteDataStore alloc] _initWithConfiguration:storeConfiguration.get()] autorelease]];
+    [viewConfiguration setProcessPool:[[[WKProcessPool alloc] _initWithConfiguration:poolConfiguration.get()] autorelease]];
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 100, 100) configuration:viewConfiguration.get()]);
     auto delegate = adoptNS([ProxyDelegate new]);
     [webView setNavigationDelegate:delegate.get()];
@@ -81,6 +93,13 @@
 
     [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"https://example.com/"]]];
     TestWebKitAPI::Util::run(&receivedAlert);
+    
+    RetainPtr<NSString> filePath = [tempDir stringByAppendingPathComponent:@"HSTS.plist"];
+    WTFLogAlways("WAITING FOR FILE TO BE WRITTEN TO %@", filePath.get());
+    while (![[NSFileManager defaultManager] fileExistsAtPath:filePath.get()])
+        TestWebKitAPI::Util::spinRunLoop();
+    [[NSFileManager defaultManager] removeItemAtPath:filePath.get() error:nil];
+    WTFLogAlways("DONE");
 }
 
 } // namespace TestWebKitAPI

Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (244652 => 244653)


--- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig	2019-04-25 17:36:58 UTC (rev 244652)
+++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig	2019-04-25 17:41:29 UTC (rev 244653)
@@ -29,7 +29,7 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++17;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to