Title: [201255] trunk
Revision
201255
Author
beid...@apple.com
Date
2016-05-22 13:09:57 -0700 (Sun, 22 May 2016)

Log Message

Move to C++14.
https://bugs.webkit.org/show_bug.cgi?id=157948

Reviewed by Michael Catanzaro.

.:

* Source/cmake/OptionsCommon.cmake:

Source/bmalloc:

* Configurations/Base.xcconfig:

Source/_javascript_Core:

* Configurations/Base.xcconfig:

Source/ThirdParty:

* gtest/xcode/Config/General.xcconfig:

Source/ThirdParty/ANGLE:

* Configurations/Base.xcconfig:

Source/WebCore:

No new tests (No change in behavior).

* Configurations/Base.xcconfig:

Replace time literal suffixes that have underscores to the forms without
(e.g. 0_ms becomes 0ms):
* page/mac/ServicesOverlayController.mm:
(WebCore::ServicesOverlayController::remainingTimeUntilHighlightShouldBeShown):
* platform/graphics/cg/IOSurfacePool.cpp:

Source/WebInspectorUI:

* Configurations/Base.xcconfig:

Source/WebKit/mac:

* Configurations/Base.xcconfig:

Source/WebKit2:

* Configurations/Base.xcconfig:

Replace time literal suffixes that have underscores to the forms without
(e.g. 0_ms becomes 0ms):
* NetworkProcess/NetworkResourceLoadParameters.cpp:
(WebKit::NetworkResourceLoadParameters::NetworkResourceLoadParameters):

* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::startNetworkLoad):

* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::responseHasExpired):
(WebKit::NetworkCache::responseNeedsRevalidation):
(WebKit::NetworkCache::makeStoreDecision):

* NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
(WebKit::NetworkCache::responseNeedsRevalidation):

* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::dispatchReadOperation):
(WebKit::NetworkCache::Storage::store):
(WebKit::NetworkCache::computeRecordWorth):

* Shared/mac/RemoteLayerBackingStoreCollection.mm:

* UIProcess/ViewGestureController.cpp:

* WebProcess/Network/WebLoaderStrategy.cpp:
(WebKit::maximumBufferingTime):

* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
(WebKit::RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlushImmediately):
(WebKit::RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlush):

Source/WTF:

* Configurations/Base.xcconfig:

Delete a lot of "stl additions until we can adopt C++14" code:
* wtf/StdLibExtras.h:
(std::make_unique): Deleted.
(std::index_sequence::size): Deleted.
(std::exchange): Deleted.
(std::literals::chrono_literals::operator _s): Deleted.
(std::literals::chrono_literals::operator _ms): Deleted.

Tools:

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

Modified Paths

Diff

Modified: trunk/ChangeLog (201254 => 201255)


--- trunk/ChangeLog	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/ChangeLog	2016-05-22 20:09:57 UTC (rev 201255)
@@ -1,3 +1,12 @@
+2016-05-22  Brady Eidson  <beid...@apple.com>
+
+        Move to C++14.
+        https://bugs.webkit.org/show_bug.cgi?id=157948
+
+        Reviewed by Michael Catanzaro.
+
+        * Source/cmake/OptionsCommon.cmake:
+
 2016-05-22  Csaba Osztrogonác  <o...@webkit.org>
 
         Suppress -Wmissing-field-initializers warnings with GCC 4.9

Modified: trunk/Source/_javascript_Core/ChangeLog (201254 => 201255)


--- trunk/Source/_javascript_Core/ChangeLog	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-05-22 20:09:57 UTC (rev 201255)
@@ -1,3 +1,12 @@
+2016-05-22  Brady Eidson  <beid...@apple.com>
+
+        Move to C++14.
+        https://bugs.webkit.org/show_bug.cgi?id=157948
+
+        Reviewed by Michael Catanzaro.
+
+        * Configurations/Base.xcconfig:
+
 2016-05-22  Saam barati  <sbar...@apple.com>
 
         REGRESSION(r199075): String.prototype.replace fails after being used many times with different replace values

Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (201254 => 201255)


--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2016-05-22 20:09:57 UTC (rev 201255)
@@ -28,7 +28,7 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_BOOL_CONVERSION = YES;
 CLANG_WARN_CONSTANT_CONVERSION = YES;

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (201254 => 201255)


--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2016-05-22 20:09:57 UTC (rev 201255)
@@ -1,3 +1,12 @@
+2016-05-22  Brady Eidson  <beid...@apple.com>
+
+        Move to C++14.
+        https://bugs.webkit.org/show_bug.cgi?id=157948
+
+        Reviewed by Michael Catanzaro.
+
+        * Configurations/Base.xcconfig:
+
 2016-04-26  Per Arne Vollan  <pe...@outlook.com>
 
         [WinCairo][ANGLE] Display object is not created.

Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (201254 => 201255)


--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2016-05-22 20:09:57 UTC (rev 201255)
@@ -5,7 +5,7 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_BOOL_CONVERSION = YES;
 CLANG_WARN_CONSTANT_CONVERSION = YES;

Modified: trunk/Source/ThirdParty/ChangeLog (201254 => 201255)


--- trunk/Source/ThirdParty/ChangeLog	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/ThirdParty/ChangeLog	2016-05-22 20:09:57 UTC (rev 201255)
@@ -1,3 +1,12 @@
+2016-05-22  Brady Eidson  <beid...@apple.com>
+
+        Move to C++14.
+        https://bugs.webkit.org/show_bug.cgi?id=157948
+
+        Reviewed by Michael Catanzaro.
+
+        * gtest/xcode/Config/General.xcconfig:
+
 2016-03-17  Csaba Osztrogonác  <o...@webkit.org>
 
         Unreviewed, line ending fixes.

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


--- trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig	2016-05-22 20:09:57 UTC (rev 201255)
@@ -49,8 +49,8 @@
 // Force C99 dialect
 GCC_C_LANGUAGE_STANDARD = c99
 
-// Force C++11
-CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
+// Force C++14
+CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
 
 // not sure why apple defaults this on, but it's pretty risky
 ALWAYS_SEARCH_USER_PATHS = NO

Modified: trunk/Source/WTF/ChangeLog (201254 => 201255)


--- trunk/Source/WTF/ChangeLog	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WTF/ChangeLog	2016-05-22 20:09:57 UTC (rev 201255)
@@ -1,3 +1,20 @@
+2016-05-22  Brady Eidson  <beid...@apple.com>
+
+        Move to C++14.
+        https://bugs.webkit.org/show_bug.cgi?id=157948
+
+        Reviewed by Michael Catanzaro.
+
+        * Configurations/Base.xcconfig:
+        
+        Delete a lot of "stl additions until we can adopt C++14" code:
+        * wtf/StdLibExtras.h:
+        (std::make_unique): Deleted.
+        (std::index_sequence::size): Deleted.
+        (std::exchange): Deleted.
+        (std::literals::chrono_literals::operator _s): Deleted.
+        (std::literals::chrono_literals::operator _ms): Deleted.
+
 2016-05-20  Rawinder Singh  <rawinder.singh-web...@cisra.canon.com.au>
 
         Implement operator== for WeakPtr

Modified: trunk/Source/WTF/Configurations/Base.xcconfig (201254 => 201255)


--- trunk/Source/WTF/Configurations/Base.xcconfig	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WTF/Configurations/Base.xcconfig	2016-05-22 20:09:57 UTC (rev 201255)
@@ -28,7 +28,7 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_BOOL_CONVERSION = YES;
 CLANG_WARN_CONSTANT_CONVERSION = YES;

Modified: trunk/Source/WTF/wtf/StdLibExtras.h (201254 => 201255)


--- trunk/Source/WTF/wtf/StdLibExtras.h	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WTF/wtf/StdLibExtras.h	2016-05-22 20:09:57 UTC (rev 201255)
@@ -320,87 +320,7 @@
 
 // This adds various C++14 features for versions of the STL that may not yet have them.
 namespace std {
-// MSVC 2013 supports std::make_unique already.
-#if !defined(_MSC_VER) || _MSC_VER < 1800
-template<class T> struct _Unique_if {
-    typedef unique_ptr<T> _Single_object;
-};
 
-template<class T> struct _Unique_if<T[]> {
-    typedef unique_ptr<T[]> _Unknown_bound;
-};
-
-template<class T, size_t N> struct _Unique_if<T[N]> {
-    typedef void _Known_bound;
-};
-
-template<class T, class... Args> inline typename _Unique_if<T>::_Single_object
-make_unique(Args&&... args)
-{
-    return unique_ptr<T>(new T(std::forward<Args>(args)...));
-}
-
-template<class T> inline typename _Unique_if<T>::_Unknown_bound
-make_unique(size_t n)
-{
-    typedef typename remove_extent<T>::type U;
-    return unique_ptr<T>(new U[n]());
-}
-
-template<class T, class... Args> typename _Unique_if<T>::_Known_bound
-make_unique(Args&&...) = delete;
-#endif
-
-// MSVC 2015 supports these functions.
-#if !COMPILER(MSVC) || _MSC_VER < 1900
-// Compile-time integer sequences
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3658.html
-// (Note that we only implement index_sequence, and not the more generic integer_sequence).
-template<size_t... indexes> struct index_sequence {
-    static size_t size() { return sizeof...(indexes); }
-};
-
-template<size_t currentIndex, size_t...indexes> struct make_index_sequence_helper;
-
-template<size_t...indexes> struct make_index_sequence_helper<0, indexes...> {
-    typedef std::index_sequence<indexes...> type;
-};
-
-template<size_t currentIndex, size_t...indexes> struct make_index_sequence_helper {
-    typedef typename make_index_sequence_helper<currentIndex - 1, currentIndex - 1, indexes...>::type type;
-};
-
-template<size_t length> struct make_index_sequence : public make_index_sequence_helper<length>::type { };
-
-// std::exchange
-template<class T, class U = T>
-T exchange(T& t, U&& newValue)
-{
-    T oldValue = std::move(t);
-    t = std::forward<U>(newValue);
-
-    return oldValue;
-}
-#endif
-
-#if COMPILER_SUPPORTS(CXX_USER_LITERALS)
-// These literals are available in C++14, so once we require C++14 compilers we can get rid of them here.
-// (User-literals need to have a leading underscore so we add it here - the "real" literals don't have underscores).
-namespace literals {
-namespace chrono_literals {
-    constexpr inline chrono::seconds operator"" _s(unsigned long long s)
-    {
-        return chrono::seconds(static_cast<chrono::seconds::rep>(s));
-    }
-
-    constexpr chrono::milliseconds operator"" _ms(unsigned long long ms)
-    {
-        return chrono::milliseconds(static_cast<chrono::milliseconds::rep>(ms));
-    }
-}
-}
-#endif
-
 template<WTF::CheckMoveParameterTag, typename T>
 ALWAYS_INLINE constexpr typename remove_reference<T>::type&& move(T&& value)
 {
@@ -431,9 +351,7 @@
 using WTF::safeCast;
 using WTF::tryBinarySearch;
 
-#if COMPILER_SUPPORTS(CXX_USER_LITERALS)
 // We normally don't want to bring in entire std namespaces, but literals are an exception.
 using namespace std::literals::chrono_literals;
-#endif
 
 #endif // WTF_StdLibExtras_h

Modified: trunk/Source/WebCore/ChangeLog (201254 => 201255)


--- trunk/Source/WebCore/ChangeLog	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebCore/ChangeLog	2016-05-22 20:09:57 UTC (rev 201255)
@@ -1,3 +1,20 @@
+2016-05-22  Brady Eidson  <beid...@apple.com>
+
+        Move to C++14.
+        https://bugs.webkit.org/show_bug.cgi?id=157948
+
+        Reviewed by Michael Catanzaro.
+
+        No new tests (No change in behavior).
+
+        * Configurations/Base.xcconfig:
+        
+        Replace time literal suffixes that have underscores to the forms without
+        (e.g. 0_ms becomes 0ms):
+        * page/mac/ServicesOverlayController.mm:
+        (WebCore::ServicesOverlayController::remainingTimeUntilHighlightShouldBeShown):
+        * platform/graphics/cg/IOSurfacePool.cpp:
+
 2016-05-22  Chris Dumez  <cdu...@apple.com>
 
         Remove uses of PassRefPtr in JS bindings code

Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (201254 => 201255)


--- trunk/Source/WebCore/Configurations/Base.xcconfig	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig	2016-05-22 20:09:57 UTC (rev 201255)
@@ -28,7 +28,7 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_BOOL_CONVERSION = YES;
 CLANG_WARN_CONSTANT_CONVERSION = YES;

Modified: trunk/Source/WebCore/page/mac/ServicesOverlayController.mm (201254 => 201255)


--- trunk/Source/WebCore/page/mac/ServicesOverlayController.mm	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebCore/page/mac/ServicesOverlayController.mm	2016-05-22 20:09:57 UTC (rev 201255)
@@ -438,10 +438,10 @@
     if (!highlight)
         return std::chrono::milliseconds::zero();
 
-    auto minimumTimeUntilHighlightShouldBeShown = 200_ms;
+    auto minimumTimeUntilHighlightShouldBeShown = 200ms;
     Page* page = m_mainFrame.page();
     if (page && page->focusController().focusedOrMainFrame().selection().selection().isContentEditable())
-        minimumTimeUntilHighlightShouldBeShown = 1000_ms;
+        minimumTimeUntilHighlightShouldBeShown = 1000ms;
 
     bool mousePressed = m_mainFrame.eventHandler().mousePressed();
 
@@ -449,12 +449,12 @@
     // by virtue of being expanded to include the entire telephone number. However, we will still avoid highlighting
     // telephone numbers while the mouse is down.
     if (highlight->type() == Highlight::TelephoneNumberType)
-        return mousePressed ? minimumTimeUntilHighlightShouldBeShown : 0_ms;
+        return mousePressed ? minimumTimeUntilHighlightShouldBeShown : 0ms;
 
     auto now = std::chrono::steady_clock::now();
     auto timeSinceLastSelectionChange = now - m_lastSelectionChangeTime;
     auto timeSinceHighlightBecameActive = now - m_nextActiveHighlightChangeTime;
-    auto timeSinceLastMouseUp = mousePressed ? 0_ms : now - m_lastMouseUpTime;
+    auto timeSinceLastMouseUp = mousePressed ? 0ms : now - m_lastMouseUpTime;
 
     auto remainingDelay = minimumTimeUntilHighlightShouldBeShown - std::min(std::min(timeSinceLastSelectionChange, timeSinceHighlightBecameActive), timeSinceLastMouseUp);
     return std::chrono::duration_cast<std::chrono::milliseconds>(remainingDelay);

Modified: trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp (201254 => 201255)


--- trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp	2016-05-22 20:09:57 UTC (rev 201255)
@@ -33,8 +33,8 @@
 #include <chrono>
 #include <wtf/NeverDestroyed.h>
 
-const std::chrono::milliseconds collectionInterval = 500_ms;
-const std::chrono::seconds surfaceAgeBeforeMarkingPurgeable = 2_s;
+const std::chrono::milliseconds collectionInterval = 500ms;
+const std::chrono::seconds surfaceAgeBeforeMarkingPurgeable = 2s;
 const size_t defaultMaximumBytesCached = 1024 * 1024 * 64;
 
 // We'll never allow more than 1/2 of the cache to be filled with in-use surfaces, because

Modified: trunk/Source/WebInspectorUI/ChangeLog (201254 => 201255)


--- trunk/Source/WebInspectorUI/ChangeLog	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebInspectorUI/ChangeLog	2016-05-22 20:09:57 UTC (rev 201255)
@@ -1,3 +1,12 @@
+2016-05-22  Brady Eidson  <beid...@apple.com>
+
+        Move to C++14.
+        https://bugs.webkit.org/show_bug.cgi?id=157948
+
+        Reviewed by Michael Catanzaro.
+
+        * Configurations/Base.xcconfig:
+
 2016-05-21  Matt Baker  <mattba...@apple.com>
 
         Web Inspector: Creating the CSSStyleDetailsSidebarPanel takes about 50ms (20%) of main load

Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (201254 => 201255)


--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig	2016-05-22 20:09:57 UTC (rev 201255)
@@ -10,7 +10,7 @@
 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
 FRAMEWORK_SEARCH_PATHS = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(inherited);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_BOOL_CONVERSION = YES;
 CLANG_WARN_CONSTANT_CONVERSION = YES;

Modified: trunk/Source/WebKit/mac/ChangeLog (201254 => 201255)


--- trunk/Source/WebKit/mac/ChangeLog	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebKit/mac/ChangeLog	2016-05-22 20:09:57 UTC (rev 201255)
@@ -1,3 +1,12 @@
+2016-05-22  Brady Eidson  <beid...@apple.com>
+
+        Move to C++14.
+        https://bugs.webkit.org/show_bug.cgi?id=157948
+
+        Reviewed by Michael Catanzaro.
+
+        * Configurations/Base.xcconfig:
+
 2016-05-20  Enrica Casucci  <enr...@apple.com>
 
         Drag cannot start if no drag data or custom data is available in the Pasteboard.

Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (201254 => 201255)


--- trunk/Source/WebKit/mac/Configurations/Base.xcconfig	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebKit/mac/Configurations/Base.xcconfig	2016-05-22 20:09:57 UTC (rev 201255)
@@ -28,7 +28,7 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_BOOL_CONVERSION = YES;
 CLANG_WARN_CONSTANT_CONVERSION = YES;

Modified: trunk/Source/WebKit2/ChangeLog (201254 => 201255)


--- trunk/Source/WebKit2/ChangeLog	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebKit2/ChangeLog	2016-05-22 20:09:57 UTC (rev 201255)
@@ -1,3 +1,44 @@
+2016-05-22  Brady Eidson  <beid...@apple.com>
+
+        Move to C++14.
+        https://bugs.webkit.org/show_bug.cgi?id=157948
+
+        Reviewed by Michael Catanzaro.
+
+        * Configurations/Base.xcconfig:
+
+        Replace time literal suffixes that have underscores to the forms without
+        (e.g. 0_ms becomes 0ms):
+        * NetworkProcess/NetworkResourceLoadParameters.cpp:
+        (WebKit::NetworkResourceLoadParameters::NetworkResourceLoadParameters):
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::startNetworkLoad):
+
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::responseHasExpired):
+        (WebKit::NetworkCache::responseNeedsRevalidation):
+        (WebKit::NetworkCache::makeStoreDecision):
+
+        * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
+        (WebKit::NetworkCache::responseNeedsRevalidation):
+
+        * NetworkProcess/cache/NetworkCacheStorage.cpp:
+        (WebKit::NetworkCache::Storage::dispatchReadOperation):
+        (WebKit::NetworkCache::Storage::store):
+        (WebKit::NetworkCache::computeRecordWorth):
+
+        * Shared/mac/RemoteLayerBackingStoreCollection.mm:
+
+        * UIProcess/ViewGestureController.cpp:
+
+        * WebProcess/Network/WebLoaderStrategy.cpp:
+        (WebKit::maximumBufferingTime):
+
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+        (WebKit::RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlushImmediately):
+        (WebKit::RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlush):
+
 2016-05-21  Andy Estes  <aes...@apple.com>
 
         REGRESSION (r188642): All pages are blank when printing a webpage in iOS Safari

Modified: trunk/Source/WebKit2/Configurations/Base.xcconfig (201254 => 201255)


--- trunk/Source/WebKit2/Configurations/Base.xcconfig	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebKit2/Configurations/Base.xcconfig	2016-05-22 20:09:57 UTC (rev 201255)
@@ -28,7 +28,7 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_BOOL_CONVERSION = YES;
 CLANG_WARN_CONSTANT_CONVERSION = YES;

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.cpp (201254 => 201255)


--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.cpp	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.cpp	2016-05-22 20:09:57 UTC (rev 201255)
@@ -45,7 +45,7 @@
     , shouldClearReferrerOnHTTPSToHTTPRedirect(true)
     , defersLoading(false)
     , needsCertificateInfo(false)
-    , maximumBufferingTime(0_ms)
+    , maximumBufferingTime(0ms)
 {
 }
 

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (201254 => 201255)


--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2016-05-22 20:09:57 UTC (rev 201255)
@@ -195,7 +195,7 @@
 {
     consumeSandboxExtensions();
 
-    if (isSynchronous() || m_parameters.maximumBufferingTime > 0_ms)
+    if (isSynchronous() || m_parameters.maximumBufferingTime > 0ms)
         m_bufferedData = SharedBuffer::create();
 
 #if ENABLE(NETWORK_CACHE)

Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (201254 => 201255)


--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp	2016-05-22 20:09:57 UTC (rev 201255)
@@ -191,7 +191,7 @@
     auto age = WebCore::computeCurrentAge(response, timestamp);
     auto lifetime = WebCore::computeFreshnessLifetimeForHTTPFamily(response, timestamp);
 
-    auto maximumStaleness = maxStale ? maxStale.value() : 0_ms;
+    auto maximumStaleness = maxStale ? maxStale.value() : 0ms;
     bool hasExpired = age - lifetime > maximumStaleness;
 
 #ifndef LOG_DISABLED
@@ -208,7 +208,7 @@
     if (requestDirectives.noCache)
         return true;
     // For requests we ignore max-age values other than zero.
-    if (requestDirectives.maxAge && requestDirectives.maxAge.value() == 0_ms)
+    if (requestDirectives.maxAge && requestDirectives.maxAge.value() == 0ms)
         return true;
 
     return responseHasExpired(response, timestamp, requestDirectives.maxStale);
@@ -325,7 +325,7 @@
     bool storeUnconditionallyForHistoryNavigation = isMainResource || originalRequest.priority() == WebCore::ResourceLoadPriority::VeryHigh;
     if (!storeUnconditionallyForHistoryNavigation) {
         auto now = std::chrono::system_clock::now();
-        bool hasNonZeroLifetime = !response.cacheControlContainsNoCache() && WebCore::computeFreshnessLifetimeForHTTPFamily(response, now) > 0_ms;
+        bool hasNonZeroLifetime = !response.cacheControlContainsNoCache() && WebCore::computeFreshnessLifetimeForHTTPFamily(response, now) > 0ms;
 
         bool possiblyReusable = response.hasCacheValidatorFields() || hasNonZeroLifetime;
         if (!possiblyReusable)

Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp (201254 => 201255)


--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp	2016-05-22 20:09:57 UTC (rev 201255)
@@ -46,7 +46,7 @@
 
 using namespace WebCore;
 
-static const auto preloadedEntryLifetime = 10_s;
+static const auto preloadedEntryLifetime = 10s;
 
 #if !LOG_DISABLED
 static HashCountedSet<String>& allSpeculativeLoadingDiagnosticMessages()
@@ -114,7 +114,7 @@
 
     auto age = computeCurrentAge(response, timestamp);
     auto lifetime = computeFreshnessLifetimeForHTTPFamily(response, timestamp);
-    return age - lifetime > 0_ms;
+    return age - lifetime > 0ms;
 }
 
 class SpeculativeLoadManager::ExpiringEntry {

Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (201254 => 201255)


--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp	2016-05-22 20:09:57 UTC (rev 201255)
@@ -572,7 +572,7 @@
     m_activeReadOperations.add(WTFMove(readOperationPtr));
 
     // I/O pressure may make disk operations slow. If they start taking very long time we rather go to network.
-    const auto readTimeout = 1500_ms;
+    const auto readTimeout = 1500ms;
     m_readOperationTimeoutTimer.startOneShot(readTimeout);
 
     bool shouldGetBodyBlob = mayContainBlob(readOperation.key);
@@ -795,7 +795,7 @@
 
     // Delay the start of writes a bit to avoid affecting early page load.
     // Completing writes will dispatch more writes without delay.
-    static const auto initialWriteDelay = 1_s;
+    static const auto initialWriteDelay = 1s;
     m_writeOperationDispatchTimer.startOneShot(initialWriteDelay);
 }
 
@@ -935,7 +935,7 @@
     auto accessAge = times.modification - times.creation;
 
     // For sanity.
-    if (age <= 0_s || accessAge < 0_s || accessAge > age)
+    if (age <= 0s || accessAge < 0s || accessAge > age)
         return 0;
 
     // We like old entries that have been accessed recently.

Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm (201254 => 201255)


--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm	2016-05-22 20:09:57 UTC (rev 201255)
@@ -30,9 +30,9 @@
 #import "RemoteLayerBackingStore.h"
 #import "RemoteLayerTreeContext.h"
 
-const std::chrono::seconds volatileBackingStoreAgeThreshold = 1_s;
-const std::chrono::milliseconds volatileSecondaryBackingStoreAgeThreshold = 200_ms;
-const std::chrono::milliseconds volatilityTimerInterval = 200_ms;
+const std::chrono::seconds volatileBackingStoreAgeThreshold = 1s;
+const std::chrono::milliseconds volatileSecondaryBackingStoreAgeThreshold = 200ms;
+const std::chrono::milliseconds volatilityTimerInterval = 200ms;
 
 namespace WebKit {
 

Modified: trunk/Source/WebKit2/UIProcess/ViewGestureController.cpp (201254 => 201255)


--- trunk/Source/WebKit2/UIProcess/ViewGestureController.cpp	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebKit2/UIProcess/ViewGestureController.cpp	2016-05-22 20:09:57 UTC (rev 201255)
@@ -38,13 +38,13 @@
 
 namespace WebKit {
 
-static const std::chrono::seconds swipeSnapshotRemovalWatchdogAfterFirstVisuallyNonEmptyLayoutDuration = 3_s;
-static const std::chrono::milliseconds swipeSnapshotRemovalActiveLoadMonitoringInterval = 250_ms;
+static const std::chrono::seconds swipeSnapshotRemovalWatchdogAfterFirstVisuallyNonEmptyLayoutDuration = 3s;
+static const std::chrono::milliseconds swipeSnapshotRemovalActiveLoadMonitoringInterval = 250ms;
 
 #if PLATFORM(MAC)
-static const std::chrono::seconds swipeSnapshotRemovalWatchdogDuration = 5_s;
+static const std::chrono::seconds swipeSnapshotRemovalWatchdogDuration = 5s;
 #else
-static const std::chrono::seconds swipeSnapshotRemovalWatchdogDuration = 3_s;
+static const std::chrono::seconds swipeSnapshotRemovalWatchdogDuration = 3s;
 #endif
 
 static HashMap<uint64_t, ViewGestureController*>& viewGestureControllersForAllPages()

Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (201254 => 201255)


--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp	2016-05-22 20:09:57 UTC (rev 201255)
@@ -90,11 +90,11 @@
 static std::chrono::milliseconds maximumBufferingTime(CachedResource* resource)
 {
 #if !ENABLE(NETWORK_CACHE)
-    return 0_ms;
+    return 0ms;
 #endif
 
     if (!resource)
-        return 0_ms;
+        return 0ms;
 
     switch (resource->type()) {
     case CachedResource::CSSStyleSheet:
@@ -105,7 +105,7 @@
     case CachedResource::FontResource:
         return std::chrono::milliseconds::max();
     case CachedResource::ImageResource:
-        return 500_ms;
+        return 500ms;
     case CachedResource::MediaResource:
     case CachedResource::MainResource:
     case CachedResource::RawResource:
@@ -121,11 +121,11 @@
 #if ENABLE(XSLT)
     case CachedResource::XSLStyleSheet:
 #endif
-        return 0_ms;
+        return 0ms;
     }
 
     ASSERT_NOT_REACHED();
-    return 0_ms;
+    return 0ms;
 }
 
 void WebLoaderStrategy::scheduleLoad(ResourceLoader* resourceLoader, CachedResource* resource, bool shouldClearReferrerOnHTTPSToHTTPRedirect)

Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (201254 => 201255)


--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm	2016-05-22 20:09:57 UTC (rev 201255)
@@ -284,7 +284,7 @@
 
 void RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlushImmediately()
 {
-    m_layerFlushTimer.startOneShot(0_ms);
+    m_layerFlushTimer.startOneShot(0ms);
 }
 
 void RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlush()
@@ -303,9 +303,9 @@
     if (m_layerFlushTimer.isActive())
         return;
 
-    const auto initialFlushDelay = 500_ms;
-    const auto flushDelay = 1500_ms;
-    auto throttleDelay = m_isThrottlingLayerFlushes ? (m_isInitialThrottledLayerFlush ? initialFlushDelay : flushDelay) : 0_ms;
+    const auto initialFlushDelay = 500ms;
+    const auto flushDelay = 1500ms;
+    auto throttleDelay = m_isThrottlingLayerFlushes ? (m_isInitialThrottledLayerFlush ? initialFlushDelay : flushDelay) : 0ms;
     m_isInitialThrottledLayerFlush = false;
 
     m_layerFlushTimer.startOneShot(throttleDelay);

Modified: trunk/Source/bmalloc/ChangeLog (201254 => 201255)


--- trunk/Source/bmalloc/ChangeLog	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/bmalloc/ChangeLog	2016-05-22 20:09:57 UTC (rev 201255)
@@ -1,3 +1,12 @@
+2016-05-22  Brady Eidson  <beid...@apple.com>
+
+        Move to C++14.
+        https://bugs.webkit.org/show_bug.cgi?id=157948
+
+        Reviewed by Michael Catanzaro.
+
+        * Configurations/Base.xcconfig:
+
 2016-05-17  Geoffrey Garen  <gga...@apple.com>
 
         REGRESSION: JetStream crashes on some iPhones

Modified: trunk/Source/bmalloc/Configurations/Base.xcconfig (201254 => 201255)


--- trunk/Source/bmalloc/Configurations/Base.xcconfig	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/bmalloc/Configurations/Base.xcconfig	2016-05-22 20:09:57 UTC (rev 201255)
@@ -28,7 +28,7 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_BOOL_CONVERSION = YES;
 CLANG_WARN_CONSTANT_CONVERSION = YES;

Modified: trunk/Source/cmake/OptionsCommon.cmake (201254 => 201255)


--- trunk/Source/cmake/OptionsCommon.cmake	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Source/cmake/OptionsCommon.cmake	2016-05-22 20:09:57 UTC (rev 201255)
@@ -29,7 +29,7 @@
 if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-exceptions -fno-strict-aliasing")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-exceptions -fno-strict-aliasing -fno-rtti")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
 endif ()
 
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND CMAKE_GENERATOR STREQUAL "Ninja")

Modified: trunk/Tools/ChangeLog (201254 => 201255)


--- trunk/Tools/ChangeLog	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Tools/ChangeLog	2016-05-22 20:09:57 UTC (rev 201255)
@@ -1,3 +1,15 @@
+2016-05-22  Brady Eidson  <beid...@apple.com>
+
+        Move to C++14.
+        https://bugs.webkit.org/show_bug.cgi?id=157948
+
+        Reviewed by Michael Catanzaro.
+
+        * DumpRenderTree/mac/Configurations/Base.xcconfig:
+        * MiniBrowser/Configurations/Base.xcconfig:
+        * TestWebKitAPI/Configurations/Base.xcconfig:
+        * WebKitTestRunner/Configurations/Base.xcconfig:
+
 2016-05-21  Aakash Jain  <aakash_j...@apple.com>
 
         Simulator launch fails intermittently due to failure in checking simulator boot status

Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (201254 => 201255)


--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig	2016-05-22 20:09:57 UTC (rev 201255)
@@ -28,7 +28,7 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_CXX0X_EXTENSIONS = NO;
 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport ForwardingHeaders $(PLATFORM_HEADER_SEARCH_PATHS) $(SRCROOT)/../../Source/_javascript_Core/icu;

Modified: trunk/Tools/MiniBrowser/Configurations/Base.xcconfig (201254 => 201255)


--- trunk/Tools/MiniBrowser/Configurations/Base.xcconfig	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Tools/MiniBrowser/Configurations/Base.xcconfig	2016-05-22 20:09:57 UTC (rev 201255)
@@ -28,7 +28,7 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
 CLANG_CXX_LIBRARY = libc++;
 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
 PREBINDING = NO

Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (201254 => 201255)


--- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig	2016-05-22 20:09:57 UTC (rev 201255)
@@ -28,7 +28,7 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_CXX0X_EXTENSIONS = NO;
 HEADER_SEARCH_PATHS = ${BUILT_PRODUCTS_DIR}/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport;

Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (201254 => 201255)


--- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig	2016-05-22 19:13:23 UTC (rev 201254)
+++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig	2016-05-22 20:09:57 UTC (rev 201255)
@@ -28,7 +28,7 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_CXX0X_EXTENSIONS = NO;
 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(SRCROOT)/../../Source/_javascript_Core/icu $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to