Diff
Modified: trunk/Source/WTF/ChangeLog (217606 => 217607)
--- trunk/Source/WTF/ChangeLog 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WTF/ChangeLog 2017-05-31 17:00:53 UTC (rev 217607)
@@ -1,3 +1,15 @@
+2017-05-31 Matt Lewis <[email protected]>
+
+ Unreviewed, rolling out r217603.
+
+ This patch broke the internal builds.
+
+ Reverted changeset:
+
+ "Get <chrono> out of StdLibExtras.h"
+ https://bugs.webkit.org/show_bug.cgi?id=172744
+ http://trac.webkit.org/changeset/217603
+
2017-05-31 Simon Fraser <[email protected]>
Get <chrono> out of StdLibExtras.h
Modified: trunk/Source/WTF/wtf/StdLibExtras.h (217606 => 217607)
--- trunk/Source/WTF/wtf/StdLibExtras.h 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WTF/wtf/StdLibExtras.h 2017-05-31 17:00:53 UTC (rev 217607)
@@ -27,6 +27,7 @@
#ifndef WTF_StdLibExtras_h
#define WTF_StdLibExtras_h
+#include <chrono>
#include <cstring>
#include <memory>
#include <type_traits>
@@ -542,4 +543,9 @@
using WTF::safeCast;
using WTF::tryBinarySearch;
+#if !COMPILER(CLANG) || __cplusplus >= 201400L
+// 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 (217606 => 217607)
--- trunk/Source/WebCore/ChangeLog 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WebCore/ChangeLog 2017-05-31 17:00:53 UTC (rev 217607)
@@ -1,3 +1,15 @@
+2017-05-31 Matt Lewis <[email protected]>
+
+ Unreviewed, rolling out r217603.
+
+ This patch broke the internal builds.
+
+ Reverted changeset:
+
+ "Get <chrono> out of StdLibExtras.h"
+ https://bugs.webkit.org/show_bug.cgi?id=172744
+ http://trac.webkit.org/changeset/217603
+
2017-05-31 Simon Fraser <[email protected]>
Get <chrono> out of StdLibExtras.h
Modified: trunk/Source/WebCore/fileapi/FileReader.cpp (217606 => 217607)
--- trunk/Source/WebCore/fileapi/FileReader.cpp 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WebCore/fileapi/FileReader.cpp 2017-05-31 17:00:53 UTC (rev 217607)
@@ -43,8 +43,6 @@
namespace WebCore {
-using namespace std::literals::chrono_literals;
-
// Fire the progress event at least every 50ms.
static const auto progressNotificationInterval = 50ms;
Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (217606 => 217607)
--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2017-05-31 17:00:53 UTC (rev 217607)
@@ -63,7 +63,6 @@
#include <inspector/InspectorValues.h>
using namespace Inspector;
-using namespace std::literals::chrono_literals;
namespace WebCore {
Modified: trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp (217606 => 217607)
--- trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp 2017-05-31 17:00:53 UTC (rev 217607)
@@ -33,11 +33,10 @@
#include "ResourceResponse.h"
#include <wtf/MainThread.h>
#include <wtf/NeverDestroyed.h>
+#include <wtf/StdLibExtras.h>
namespace WebCore {
-using namespace std::literals::chrono_literals;
-
// These values are at the discretion of the user agent.
static const auto defaultPreflightCacheTimeout = 5s;
static const auto maxPreflightCacheTimeout = 600s; // Should be short enough to minimize the risk of using a poisoned cache after switching to a secure network.
Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (217606 => 217607)
--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2017-05-31 17:00:53 UTC (rev 217607)
@@ -395,8 +395,6 @@
std::chrono::microseconds CachedResource::freshnessLifetime(const ResourceResponse& response) const
{
- using namespace std::literals::chrono_literals;
-
if (!response.url().protocolIsInHTTPFamily()) {
StringView protocol = response.url().protocol();
if (!shouldCacheSchemeIndefinitely(protocol)) {
Modified: trunk/Source/WebCore/page/ResourceUsageThread.cpp (217606 => 217607)
--- trunk/Source/WebCore/page/ResourceUsageThread.cpp 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WebCore/page/ResourceUsageThread.cpp 2017-05-31 17:00:53 UTC (rev 217607)
@@ -110,8 +110,6 @@
NO_RETURN void ResourceUsageThread::threadBody()
{
- using namespace std::literals::chrono_literals;
-
while (true) {
// Only do work if we have observers.
waitUntilObservers();
Modified: trunk/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm (217606 => 217607)
--- trunk/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm 2017-05-31 17:00:53 UTC (rev 217607)
@@ -66,8 +66,6 @@
void jettisonExpensiveObjectsOnTopLevelNavigation()
{
#if PLATFORM(IOS)
- using namespace std::literals::chrono_literals;
-
// Protect against doing excessive jettisoning during repeated navigations.
const auto minimumTimeSinceNavigation = 2s;
Modified: trunk/Source/WebCore/platform/network/CacheValidation.cpp (217606 => 217607)
--- trunk/Source/WebCore/platform/network/CacheValidation.cpp 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WebCore/platform/network/CacheValidation.cpp 2017-05-31 17:00:53 UTC (rev 217607)
@@ -38,8 +38,6 @@
namespace WebCore {
-using namespace std::literals::chrono_literals;
-
// These response headers are not copied from a revalidated response to the
// cached response headers. For compatibility, this list is based on Chromium's
// net/http/http_response_headers.cc.
@@ -115,7 +113,6 @@
std::chrono::microseconds computeFreshnessLifetimeForHTTPFamily(const ResourceResponse& response, std::chrono::system_clock::time_point responseTime)
{
using namespace std::chrono;
-
ASSERT(response.url().protocolIsInHTTPFamily());
// Freshness Lifetime:
Modified: trunk/Source/WebCore/platform/network/CacheValidation.h (217606 => 217607)
--- trunk/Source/WebCore/platform/network/CacheValidation.h 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WebCore/platform/network/CacheValidation.h 2017-05-31 17:00:53 UTC (rev 217607)
@@ -23,11 +23,11 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#pragma once
+#ifndef CacheValidation_h
+#define CacheValidation_h
#include "PlatformExportMacros.h"
#include "SessionID.h"
-#include <chrono>
#include <wtf/Optional.h>
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
@@ -77,3 +77,5 @@
WEBCORE_EXPORT bool isStatusCodePotentiallyCacheable(int statusCode);
}
+
+#endif
Modified: trunk/Source/WebKit2/ChangeLog (217606 => 217607)
--- trunk/Source/WebKit2/ChangeLog 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WebKit2/ChangeLog 2017-05-31 17:00:53 UTC (rev 217607)
@@ -1,3 +1,15 @@
+2017-05-31 Matt Lewis <[email protected]>
+
+ Unreviewed, rolling out r217603.
+
+ This patch broke the internal builds.
+
+ Reverted changeset:
+
+ "Get <chrono> out of StdLibExtras.h"
+ https://bugs.webkit.org/show_bug.cgi?id=172744
+ http://trac.webkit.org/changeset/217603
+
2017-05-31 Brent Fulgham <[email protected]>
Make ResourceLoadStatistics testing more reliable
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (217606 => 217607)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2017-05-31 17:00:53 UTC (rev 217607)
@@ -50,8 +50,6 @@
#include <notify.h>
#endif
-using namespace std::literals::chrono_literals;
-
namespace WebKit {
namespace NetworkCache {
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.h (217606 => 217607)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.h 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.h 2017-05-31 17:00:53 UTC (rev 217607)
@@ -23,12 +23,12 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#pragma once
+#ifndef NetworkCacheFileSystem_h
+#define NetworkCacheFileSystem_h
#if ENABLE(NETWORK_CACHE)
#include <WebCore/FileSystem.h>
-#include <chrono>
#include <functional>
namespace WebKit {
@@ -52,3 +52,6 @@
}
#endif
+
+#endif
+
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp (217606 => 217607)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2017-05-31 17:00:53 UTC (rev 217607)
@@ -46,7 +46,6 @@
namespace NetworkCache {
using namespace WebCore;
-using namespace std::literals::chrono_literals;
static const Seconds preloadedEntryLifetime { 10_s };
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (217606 => 217607)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2017-05-31 17:00:53 UTC (rev 217607)
@@ -934,8 +934,6 @@
static double computeRecordWorth(FileTimes times)
{
using namespace std::chrono;
- using namespace std::literals::chrono_literals;
-
auto age = system_clock::now() - times.creation;
// File modification time is updated manually on cache read. We don't use access time since OS may update it automatically.
auto accessAge = times.modification - times.creation;
Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm (217606 => 217607)
--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm 2017-05-31 17:00:53 UTC (rev 217607)
@@ -30,8 +30,6 @@
#import "RemoteLayerBackingStore.h"
#import "RemoteLayerTreeContext.h"
-using namespace std::literals::chrono_literals;
-
const std::chrono::seconds volatileBackingStoreAgeThreshold = 1s;
const std::chrono::milliseconds volatileSecondaryBackingStoreAgeThreshold = 200ms;
const Seconds volatilityTimerInterval = 200_ms;
Modified: trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h (217606 => 217607)
--- trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h 2017-05-31 17:00:53 UTC (rev 217607)
@@ -23,7 +23,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#pragma once
+#ifndef WebCookieManager_h
+#define WebCookieManager_h
#include "HTTPCookieAcceptPolicy.h"
#include "MessageReceiver.h"
@@ -30,7 +31,6 @@
#include "NetworkProcessSupplement.h"
#include "WebProcessSupplement.h"
#include <WebCore/SessionID.h>
-#include <chrono>
#include <stdint.h>
#include <wtf/Forward.h>
#include <wtf/Noncopyable.h>
@@ -91,3 +91,5 @@
};
} // namespace WebKit
+
+#endif // WebCookieManager_h
Modified: trunk/Tools/ChangeLog (217606 => 217607)
--- trunk/Tools/ChangeLog 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Tools/ChangeLog 2017-05-31 17:00:53 UTC (rev 217607)
@@ -1,3 +1,15 @@
+2017-05-31 Matt Lewis <[email protected]>
+
+ Unreviewed, rolling out r217603.
+
+ This patch broke the internal builds.
+
+ Reverted changeset:
+
+ "Get <chrono> out of StdLibExtras.h"
+ https://bugs.webkit.org/show_bug.cgi?id=172744
+ http://trac.webkit.org/changeset/217603
+
2017-05-31 Brent Fulgham <[email protected]>
Make ResourceLoadStatistics testing more reliable
Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/WorkQueue.cpp (217606 => 217607)
--- trunk/Tools/TestWebKitAPI/Tests/WTF/WorkQueue.cpp 2017-05-31 16:58:53 UTC (rev 217606)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/WorkQueue.cpp 2017-05-31 17:00:53 UTC (rev 217607)
@@ -35,8 +35,6 @@
namespace TestWebKitAPI {
-using namespace std::literals::chrono_literals;
-
static const char* simpleTestLabel = "simpleTest";
static const char* longTestLabel = "longTest";
static const char* thirdTestLabel = "thirdTest";
