[WTF] Move currentCPUTime and sleep(Seconds) to CPUTime.h and Seconds.h respectively
authorutatane.tea@gmail.com <utatane.tea@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 5 Mar 2018 02:33:55 +0000 (02:33 +0000)
committerutatane.tea@gmail.com <utatane.tea@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 5 Mar 2018 02:33:55 +0000 (02:33 +0000)
https://bugs.webkit.org/show_bug.cgi?id=183312

Reviewed by Mark Lam.

Source/JavaScriptCore:

Remove wtf/CurrentTime.h include pragma.

* API/tests/ExecutionTimeLimitTest.cpp:
(currentCPUTimeAsJSFunctionCallback):
(testExecutionTimeLimit):
* bytecode/SuperSampler.cpp:
* dfg/DFGPlan.cpp:
* heap/BlockDirectory.cpp:
* heap/Heap.cpp:
* heap/IncrementalSweeper.cpp:
* inspector/agents/InspectorConsoleAgent.cpp:
* inspector/agents/InspectorRuntimeAgent.cpp:
* profiler/ProfilerDatabase.cpp:
* runtime/CodeCache.h:
* runtime/JSDateMath.cpp:
* runtime/TypeProfilerLog.cpp:
* runtime/VM.cpp:
* runtime/Watchdog.cpp:
(JSC::Watchdog::shouldTerminate):
(JSC::Watchdog::startTimer):
* testRegExp.cpp:
* wasm/js/JSWebAssemblyCodeBlock.cpp:

Source/WebCore:

Remove wtf/CurrentTime.h include pragma.

* Modules/geolocation/Geolocation.cpp:
* Modules/mediasource/SourceBuffer.cpp:
* Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
* Modules/speech/SpeechSynthesis.cpp:
* contentextensions/ContentExtensionCompiler.cpp:
* contentextensions/ContentExtensionParser.cpp:
* dom/Document.cpp:
* dom/Element.cpp:
* dom/Event.cpp:
* dom/ScriptedAnimationController.cpp:
* dom/SimulatedClick.cpp:
* fileapi/File.cpp:
* fileapi/FileReader.cpp:
* history/CachedPage.cpp:
* html/BaseDateAndTimeInputType.cpp:
* html/DateTimeInputType.cpp:
* html/HTMLMediaElement.cpp:
* html/MediaController.cpp:
* html/MediaElementSession.cpp:
* html/MonthInputType.cpp:
* html/TimeInputType.cpp:
* html/parser/HTMLParserScheduler.h:
* inspector/InspectorCanvas.cpp:
* loader/FrameLoader.cpp:
* loader/LoadTiming.cpp:
* loader/NavigationScheduler.cpp:
* loader/ProgressTracker.cpp:
* loader/cache/CachedCSSStyleSheet.cpp:
* loader/cache/CachedImage.cpp:
* loader/cache/CachedResource.cpp:
* loader/cache/MemoryCache.cpp:
* page/DOMTimer.cpp:
* page/DOMWindow.cpp:
* page/DragController.cpp:
* page/EventHandler.cpp:
* page/FocusController.cpp:
* page/FrameView.cpp:
* page/Page.cpp:
* page/Performance.cpp:
* page/PerformanceTiming.cpp:
* page/animation/AnimationBase.cpp:
* page/animation/CSSAnimationController.cpp:
* page/mac/WheelEventDeltaFilterMac.mm:
* page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
* platform/ScrollAnimationKinetic.cpp:
* platform/ScrollAnimationSmooth.cpp:
* platform/ThreadTimers.cpp:
* platform/Timer.cpp:
* platform/audio/mac/AudioSampleDataSource.mm:
* platform/cocoa/ScrollController.mm:
* platform/gamepad/cocoa/GameControllerGamepad.mm:
* platform/gamepad/mac/HIDGamepad.cpp:
* platform/graphics/BitmapImage.cpp:
* platform/graphics/DisplayRefreshMonitorManager.cpp:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
* platform/graphics/ca/GraphicsLayerCA.cpp:
* platform/graphics/ca/LayerPool.cpp:
* platform/graphics/ca/PlatformCALayer.h:
* platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
* platform/graphics/ca/win/CACFLayerTreeHost.cpp:
* platform/graphics/ca/win/PlatformCALayerWin.cpp:
* platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp:
* platform/graphics/cg/GraphicsContextCG.cpp:
* platform/graphics/cocoa/WebCoreDecompressionSession.mm:
* platform/graphics/ios/DisplayRefreshMonitorIOS.mm:
* platform/graphics/mac/DisplayRefreshMonitorMac.cpp:
* platform/graphics/texmap/BitmapTexturePool.h:
* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
* platform/graphics/texmap/TextureMapper.cpp:
* platform/graphics/texmap/TextureMapperAnimation.cpp:
* platform/graphics/texmap/TextureMapperFPSCounter.cpp:
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
* platform/graphics/win/GraphicsContextDirect2D.cpp:
* platform/graphics/win/GraphicsLayerDirect2D.cpp:
* platform/gtk/PlatformKeyboardEventGtk.cpp:
* platform/gtk/ScrollAnimatorGtk.cpp:
* platform/ios/LegacyTileCache.mm:
* platform/ios/LegacyTileLayerPool.mm:
* platform/ios/ScrollViewIOS.mm:
* platform/mediastream/RealtimeOutgoingVideoSource.cpp:
* platform/mediastream/mac/DisplayCaptureSourceCocoa.cpp:
* platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm:
* platform/mock/MockRealtimeMediaSource.cpp:
* platform/mock/MockRealtimeVideoSource.cpp:
* platform/network/CacheValidation.cpp:
* platform/network/DNSResolveQueue.cpp:
* platform/network/ResourceResponseBase.cpp:
* platform/network/curl/CurlCacheEntry.cpp:
* platform/network/soup/ResourceHandleSoup.cpp:
* platform/text/TextEncodingRegistry.cpp:
* platform/text/win/LocaleWin.cpp:
* platform/win/MainThreadSharedTimerWin.cpp:
* platform/win/PlatformMouseEventWin.cpp:
* rendering/RenderLayerCompositor.cpp:
* rendering/RenderProgress.cpp:
* svg/animation/SMILTimeContainer.cpp:
* testing/MockGamepad.cpp:
* workers/WorkerRunLoop.cpp:

Source/WebCore/PAL:

Remove wtf/CurrentTime.h include pragma.

* pal/system/ClockGeneric.cpp:

Source/WebKit:

Remove wtf/CurrentTime.h include pragma.

* NetworkProcess/NetworkResourceLoader.cpp:
* NetworkProcess/cache/CacheStorageEngineCache.cpp:
* NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
* Platform/IPC/Connection.cpp:
* Platform/unix/SharedMemoryUnix.cpp:
* PluginProcess/WebProcessConnection.cpp:
* Shared/ios/NativeWebTouchEventIOS.mm:
* UIProcess/DrawingAreaProxyImpl.cpp:
* UIProcess/ios/WKContentView.mm:
* UIProcess/linux/MemoryPressureMonitor.cpp:
* WebProcess/Gamepad/WebGamepad.cpp:
* WebProcess/Plugins/PDF/PDFPlugin.mm:
* WebProcess/WebCoreSupport/WebInspectorClient.cpp:
* WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm:
* WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemote.cpp:
* WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDisplayRefreshMonitor.mm:
* WebProcess/WebPage/WebURLSchemeTaskProxy.cpp:
* WebProcess/WebProcess.cpp:
* WebProcess/cocoa/WebProcessCocoa.mm:
* WebProcess/gtk/WebProcessMainGtk.cpp:
* WebProcess/win/WebProcessMainWin.cpp:
* WebProcess/wpe/WebProcessMainWPE.cpp:

Source/WebKitLegacy/mac:

Remove wtf/CurrentTime.h include pragma.

* WebView/WebFrame.mm:
* WebView/WebPDFView.mm:

Source/WebKitLegacy/win:

Remove wtf/CurrentTime.h include pragma.

* WebDownload.cpp:
* WebDownloadCFNet.cpp:
* WebDropSource.cpp:

Source/WTF:

1. currentCPUTime to CPUTime.h. It is now defined as CPUTime::forCurrentThread.
We also removes fallback implementation for currentCPUTime since (1) that implementation
is wrong and (2) no environments we support needs this.

2. sleep(Seconds) to Seconds.h. Since sleep(MonotonicTime) and sleep(WallTime) are defined
in MonotonicTime.h and WallTime.h, this code move is natural.

3. Remove wtf/CurrentTime.h since nothing is defined now. But we keep CurrentTime.cpp to
consolidate various time-source implementations in one place.

* WTF.xcodeproj/project.pbxproj:
* benchmarks/ConditionSpeedTest.cpp:
* benchmarks/LockFairnessTest.cpp:
* benchmarks/LockSpeedTest.cpp:
* wtf/CMakeLists.txt:
* wtf/CPUTime.h:
* wtf/CurrentTime.cpp:
(WTF::currentCPUTime): Deleted.
(WTF::sleep): Deleted.
* wtf/CurrentTime.h: Removed.
* wtf/DateMath.cpp:
* wtf/DebugUtilities.h:
* wtf/FastMalloc.cpp:
* wtf/MainThread.cpp:
* wtf/MonotonicTime.cpp:
* wtf/ParkingLot.cpp:
* wtf/Seconds.cpp:
(WTF::sleep):
* wtf/Seconds.h:
* wtf/StackShotProfiler.h:
* wtf/Stopwatch.h:
* wtf/ThreadingPthreads.cpp:
* wtf/ThreadingWin.cpp:
* wtf/cocoa/CPUTimeCocoa.mm:
(WTF::CPUTime::forCurrentThread):
* wtf/cocoa/MemoryPressureHandlerCocoa.mm:
* wtf/linux/MemoryPressureHandlerLinux.cpp:
* wtf/unix/CPUTimeUnix.cpp:
(WTF::CPUTime::forCurrentThread):
* wtf/win/CPUTimeWin.cpp:
(WTF::CPUTime::forCurrentThread):
* wtf/win/RunLoopWin.cpp:

Tools:

Remove wtf/CurrentTime.h include pragma.

* DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp:
* DumpRenderTree/TestNetscapePlugIn/Tests/EvaluateJSWithinNPP_New.cpp:
* DumpRenderTree/TestNetscapePlugIn/Tests/InvokeDestroysPluginWithinNPP_New.cpp:
* DumpRenderTree/TestNetscapePlugIn/Tests/SlowNPPNew.cpp:
* TestWebKitAPI/Tests/WTF/Condition.cpp:
* TestWebKitAPI/Tests/WTF/Signals.cpp:
* TestWebKitAPI/Tests/WTF/ThreadGroup.cpp:
* TestWebKitAPI/Tests/WTF/WorkQueue.cpp:
* TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm:
* TestWebKitAPI/Tests/ios/DataInteractionTests.mm:
* TestWebKitAPI/jsconly/PlatformUtilitiesJSCOnly.cpp:
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229209 268f45cc-cd09-0410-ab3c-d52691b4dbfc

188 files changed:
Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/bytecode/SuperSampler.cpp
Source/JavaScriptCore/dfg/DFGPlan.cpp
Source/JavaScriptCore/heap/BlockDirectory.cpp
Source/JavaScriptCore/heap/Heap.cpp
Source/JavaScriptCore/heap/IncrementalSweeper.cpp
Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp
Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp
Source/JavaScriptCore/profiler/ProfilerDatabase.cpp
Source/JavaScriptCore/runtime/CodeCache.h
Source/JavaScriptCore/runtime/JSDateMath.cpp
Source/JavaScriptCore/runtime/TypeProfilerLog.cpp
Source/JavaScriptCore/runtime/VM.cpp
Source/JavaScriptCore/runtime/Watchdog.cpp
Source/JavaScriptCore/testRegExp.cpp
Source/JavaScriptCore/wasm/js/JSWebAssemblyCodeBlock.cpp
Source/WTF/ChangeLog
Source/WTF/WTF.xcodeproj/project.pbxproj
Source/WTF/benchmarks/ConditionSpeedTest.cpp
Source/WTF/benchmarks/LockFairnessTest.cpp
Source/WTF/benchmarks/LockSpeedTest.cpp
Source/WTF/wtf/CMakeLists.txt
Source/WTF/wtf/CPUTime.h
Source/WTF/wtf/CurrentTime.cpp
Source/WTF/wtf/CurrentTime.h [deleted file]
Source/WTF/wtf/DateMath.cpp
Source/WTF/wtf/DebugUtilities.h
Source/WTF/wtf/FastMalloc.cpp
Source/WTF/wtf/MainThread.cpp
Source/WTF/wtf/MonotonicTime.cpp
Source/WTF/wtf/ParkingLot.cpp
Source/WTF/wtf/Seconds.cpp
Source/WTF/wtf/Seconds.h
Source/WTF/wtf/StackShotProfiler.h
Source/WTF/wtf/Stopwatch.h
Source/WTF/wtf/ThreadingPthreads.cpp
Source/WTF/wtf/ThreadingWin.cpp
Source/WTF/wtf/cocoa/CPUTimeCocoa.mm
Source/WTF/wtf/cocoa/MemoryPressureHandlerCocoa.mm
Source/WTF/wtf/linux/MemoryPressureHandlerLinux.cpp
Source/WTF/wtf/unix/CPUTimeUnix.cpp
Source/WTF/wtf/win/CPUTimeWin.cpp
Source/WTF/wtf/win/RunLoopWin.cpp
Source/WebCore/ChangeLog
Source/WebCore/Modules/geolocation/Geolocation.cpp
Source/WebCore/Modules/mediasource/SourceBuffer.cpp
Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp
Source/WebCore/Modules/speech/SpeechSynthesis.cpp
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/pal/system/ClockGeneric.cpp
Source/WebCore/contentextensions/ContentExtensionCompiler.cpp
Source/WebCore/contentextensions/ContentExtensionParser.cpp
Source/WebCore/dom/Document.cpp
Source/WebCore/dom/Element.cpp
Source/WebCore/dom/Event.cpp
Source/WebCore/dom/ScriptedAnimationController.cpp
Source/WebCore/dom/SimulatedClick.cpp
Source/WebCore/fileapi/File.cpp
Source/WebCore/fileapi/FileReader.cpp
Source/WebCore/history/CachedPage.cpp
Source/WebCore/html/BaseDateAndTimeInputType.cpp
Source/WebCore/html/DateTimeInputType.cpp
Source/WebCore/html/HTMLMediaElement.cpp
Source/WebCore/html/MediaController.cpp
Source/WebCore/html/MediaElementSession.cpp
Source/WebCore/html/MonthInputType.cpp
Source/WebCore/html/TimeInputType.cpp
Source/WebCore/html/parser/HTMLParserScheduler.h
Source/WebCore/inspector/InspectorCanvas.cpp
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/loader/LoadTiming.cpp
Source/WebCore/loader/NavigationScheduler.cpp
Source/WebCore/loader/ProgressTracker.cpp
Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp
Source/WebCore/loader/cache/CachedImage.cpp
Source/WebCore/loader/cache/CachedResource.cpp
Source/WebCore/loader/cache/MemoryCache.cpp
Source/WebCore/page/DOMTimer.cpp
Source/WebCore/page/DOMWindow.cpp
Source/WebCore/page/DragController.cpp
Source/WebCore/page/EventHandler.cpp
Source/WebCore/page/FocusController.cpp
Source/WebCore/page/FrameView.cpp
Source/WebCore/page/Page.cpp
Source/WebCore/page/Performance.cpp
Source/WebCore/page/PerformanceTiming.cpp
Source/WebCore/page/animation/AnimationBase.cpp
Source/WebCore/page/animation/CSSAnimationController.cpp
Source/WebCore/page/mac/WheelEventDeltaFilterMac.mm
Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm
Source/WebCore/platform/ScrollAnimationKinetic.cpp
Source/WebCore/platform/ScrollAnimationSmooth.cpp
Source/WebCore/platform/ThreadTimers.cpp
Source/WebCore/platform/Timer.cpp
Source/WebCore/platform/audio/mac/AudioSampleDataSource.mm
Source/WebCore/platform/cocoa/ScrollController.mm
Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.mm
Source/WebCore/platform/gamepad/mac/HIDGamepad.cpp
Source/WebCore/platform/graphics/BitmapImage.cpp
Source/WebCore/platform/graphics/DisplayRefreshMonitorManager.cpp
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
Source/WebCore/platform/graphics/ca/LayerPool.cpp
Source/WebCore/platform/graphics/ca/PlatformCALayer.h
Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm
Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp
Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
Source/WebCore/platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp
Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm
Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.mm
Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.cpp
Source/WebCore/platform/graphics/texmap/BitmapTexturePool.h
Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
Source/WebCore/platform/graphics/texmap/TextureMapper.cpp
Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp
Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.cpp
Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
Source/WebCore/platform/graphics/win/GraphicsContextDirect2D.cpp
Source/WebCore/platform/graphics/win/GraphicsLayerDirect2D.cpp
Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
Source/WebCore/platform/gtk/ScrollAnimatorGtk.cpp
Source/WebCore/platform/ios/LegacyTileCache.mm
Source/WebCore/platform/ios/LegacyTileLayerPool.mm
Source/WebCore/platform/ios/ScrollViewIOS.mm
Source/WebCore/platform/mediastream/RealtimeOutgoingVideoSource.cpp
Source/WebCore/platform/mediastream/mac/DisplayCaptureSourceCocoa.cpp
Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm
Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp
Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp
Source/WebCore/platform/network/CacheValidation.cpp
Source/WebCore/platform/network/DNSResolveQueue.cpp
Source/WebCore/platform/network/ResourceResponseBase.cpp
Source/WebCore/platform/network/curl/CurlCacheEntry.cpp
Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
Source/WebCore/platform/text/TextEncodingRegistry.cpp
Source/WebCore/platform/text/win/LocaleWin.cpp
Source/WebCore/platform/win/MainThreadSharedTimerWin.cpp
Source/WebCore/platform/win/PlatformMouseEventWin.cpp
Source/WebCore/rendering/RenderLayerCompositor.cpp
Source/WebCore/rendering/RenderProgress.cpp
Source/WebCore/svg/animation/SMILTimeContainer.cpp
Source/WebCore/testing/MockGamepad.cpp
Source/WebCore/workers/WorkerRunLoop.cpp
Source/WebKit/ChangeLog
Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
Source/WebKit/NetworkProcess/cache/CacheStorageEngineCache.cpp
Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp
Source/WebKit/Platform/IPC/Connection.cpp
Source/WebKit/Platform/unix/SharedMemoryUnix.cpp
Source/WebKit/PluginProcess/WebProcessConnection.cpp
Source/WebKit/Shared/ios/NativeWebTouchEventIOS.mm
Source/WebKit/UIProcess/DrawingAreaProxyImpl.cpp
Source/WebKit/UIProcess/ios/WKContentView.mm
Source/WebKit/UIProcess/linux/MemoryPressureMonitor.cpp
Source/WebKit/WebProcess/Gamepad/WebGamepad.cpp
Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm
Source/WebKit/WebProcess/WebCoreSupport/WebInspectorClient.cpp
Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm
Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemote.cpp
Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDisplayRefreshMonitor.mm
Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.cpp
Source/WebKit/WebProcess/WebProcess.cpp
Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp
Source/WebKit/WebProcess/win/WebProcessMainWin.cpp
Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/WebView/WebFrame.mm
Source/WebKitLegacy/mac/WebView/WebPDFView.mm
Source/WebKitLegacy/win/ChangeLog
Source/WebKitLegacy/win/WebDownload.cpp
Source/WebKitLegacy/win/WebDownloadCFNet.cpp
Source/WebKitLegacy/win/WebDropSource.cpp
Tools/ChangeLog
Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp
Tools/DumpRenderTree/TestNetscapePlugIn/Tests/EvaluateJSWithinNPP_New.cpp
Tools/DumpRenderTree/TestNetscapePlugIn/Tests/InvokeDestroysPluginWithinNPP_New.cpp
Tools/DumpRenderTree/TestNetscapePlugIn/Tests/SlowNPPNew.cpp
Tools/TestWebKitAPI/Tests/WTF/Condition.cpp
Tools/TestWebKitAPI/Tests/WTF/Signals.cpp
Tools/TestWebKitAPI/Tests/WTF/ThreadGroup.cpp
Tools/TestWebKitAPI/Tests/WTF/WorkQueue.cpp
Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm
Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm
Tools/TestWebKitAPI/jsconly/PlatformUtilitiesJSCOnly.cpp
Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

index f982bb2..637b304 100644 (file)
@@ -32,8 +32,8 @@
 #include "Options.h"
 
 #include <wtf/Atomics.h>
 #include "Options.h"
 
 #include <wtf/Atomics.h>
+#include <wtf/CPUTime.h>
 #include <wtf/Condition.h>
 #include <wtf/Condition.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/Lock.h>
 #include <wtf/Threading.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/Lock.h>
 #include <wtf/Threading.h>
 #include <wtf/text/StringBuilder.h>
@@ -55,7 +55,7 @@ static JSValueRef currentCPUTimeAsJSFunctionCallback(JSContextRef ctx, JSObjectR
     UNUSED_PARAM(exception);
     
     ASSERT(JSContextGetGlobalContext(ctx) == context);
     UNUSED_PARAM(exception);
     
     ASSERT(JSContextGetGlobalContext(ctx) == context);
-    return JSValueMakeNumber(ctx, currentCPUTime().seconds());
+    return JSValueMakeNumber(ctx, CPUTime::forCurrentThread().seconds());
 }
 
 bool shouldTerminateCallbackWasCalled = false;
 }
 
 bool shouldTerminateCallbackWasCalled = false;
@@ -197,9 +197,9 @@ int testExecutionTimeLimit()
             JSStringRef script = JSStringCreateWithUTF8CString(scriptBuilder.toString().utf8().data());
             exception = nullptr;
             shouldTerminateCallbackWasCalled = false;
             JSStringRef script = JSStringCreateWithUTF8CString(scriptBuilder.toString().utf8().data());
             exception = nullptr;
             shouldTerminateCallbackWasCalled = false;
-            auto startTime = currentCPUTime();
+            auto startTime = CPUTime::forCurrentThread();
             JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception);
             JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception);
-            auto endTime = currentCPUTime();
+            auto endTime = CPUTime::forCurrentThread();
 
             if (((endTime - startTime) < timeAfterWatchdogShouldHaveFired) && shouldTerminateCallbackWasCalled)
                 printf("PASS: %s script timed out as expected.\n", tierOptions.tier);
 
             if (((endTime - startTime) < timeAfterWatchdogShouldHaveFired) && shouldTerminateCallbackWasCalled)
                 printf("PASS: %s script timed out as expected.\n", tierOptions.tier);
@@ -240,9 +240,9 @@ int testExecutionTimeLimit()
             JSStringRef script = JSStringCreateWithUTF8CString(scriptBuilder.toString().utf8().data());
             exception = nullptr;
             shouldTerminateCallbackWasCalled = false;
             JSStringRef script = JSStringCreateWithUTF8CString(scriptBuilder.toString().utf8().data());
             exception = nullptr;
             shouldTerminateCallbackWasCalled = false;
-            auto startTime = currentCPUTime();
+            auto startTime = CPUTime::forCurrentThread();
             JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception);
             JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception);
-            auto endTime = currentCPUTime();
+            auto endTime = CPUTime::forCurrentThread();
 
             if (((endTime - startTime) < timeAfterWatchdogShouldHaveFired) && shouldTerminateCallbackWasCalled)
                 printf("PASS: %s script with infinite tail calls timed out as expected .\n", tierOptions.tier);
 
             if (((endTime - startTime) < timeAfterWatchdogShouldHaveFired) && shouldTerminateCallbackWasCalled)
                 printf("PASS: %s script with infinite tail calls timed out as expected .\n", tierOptions.tier);
@@ -277,9 +277,9 @@ int testExecutionTimeLimit()
             exception = nullptr;
             shouldTerminateCallbackWasCalled = false;
 
             exception = nullptr;
             shouldTerminateCallbackWasCalled = false;
 
-            auto startTime = currentCPUTime();
+            auto startTime = CPUTime::forCurrentThread();
             JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception);
             JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception);
-            auto endTime = currentCPUTime();
+            auto endTime = CPUTime::forCurrentThread();
             
             if (((endTime - startTime) >= timeAfterWatchdogShouldHaveFired) || !shouldTerminateCallbackWasCalled) {
                 if (!((endTime - startTime) < timeAfterWatchdogShouldHaveFired))
             
             if (((endTime - startTime) >= timeAfterWatchdogShouldHaveFired) || !shouldTerminateCallbackWasCalled) {
                 if (!((endTime - startTime) < timeAfterWatchdogShouldHaveFired))
@@ -314,9 +314,9 @@ int testExecutionTimeLimit()
             exception = nullptr;
             shouldTerminateCallbackWasCalled = false;
 
             exception = nullptr;
             shouldTerminateCallbackWasCalled = false;
 
-            auto startTime = currentCPUTime();
+            auto startTime = CPUTime::forCurrentThread();
             JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception);
             JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception);
-            auto endTime = currentCPUTime();
+            auto endTime = CPUTime::forCurrentThread();
             
             if (((endTime - startTime) < timeAfterWatchdogShouldHaveFired) && !shouldTerminateCallbackWasCalled)
                 printf("PASS: %s script timed out as expected when no callback is specified.\n", tierOptions.tier);
             
             if (((endTime - startTime) < timeAfterWatchdogShouldHaveFired) && !shouldTerminateCallbackWasCalled)
                 printf("PASS: %s script timed out as expected when no callback is specified.\n", tierOptions.tier);
@@ -351,9 +351,9 @@ int testExecutionTimeLimit()
             exception = nullptr;
             cancelTerminateCallbackWasCalled = false;
 
             exception = nullptr;
             cancelTerminateCallbackWasCalled = false;
 
-            auto startTime = currentCPUTime();
+            auto startTime = CPUTime::forCurrentThread();
             JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception);
             JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception);
-            auto endTime = currentCPUTime();
+            auto endTime = CPUTime::forCurrentThread();
             
             if (((endTime - startTime) >= timeAfterWatchdogShouldHaveFired) && cancelTerminateCallbackWasCalled && !exception)
                 printf("PASS: %s script timeout was cancelled as expected.\n", tierOptions.tier);
             
             if (((endTime - startTime) >= timeAfterWatchdogShouldHaveFired) && cancelTerminateCallbackWasCalled && !exception)
                 printf("PASS: %s script timeout was cancelled as expected.\n", tierOptions.tier);
@@ -388,9 +388,9 @@ int testExecutionTimeLimit()
             exception = nullptr;
             extendTerminateCallbackCalled = 0;
 
             exception = nullptr;
             extendTerminateCallbackCalled = 0;
 
-            auto startTime = currentCPUTime();
+            auto startTime = CPUTime::forCurrentThread();
             JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception);
             JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception);
-            auto endTime = currentCPUTime();
+            auto endTime = CPUTime::forCurrentThread();
             auto deltaTime = endTime - startTime;
             
             if ((deltaTime >= timeBeforeExtendedDeadline) && (deltaTime < timeAfterExtendedDeadline) && (extendTerminateCallbackCalled == 2) && exception)
             auto deltaTime = endTime - startTime;
             
             if ((deltaTime >= timeBeforeExtendedDeadline) && (deltaTime < timeAfterExtendedDeadline) && (extendTerminateCallbackCalled == 2) && exception)
@@ -449,9 +449,9 @@ int testExecutionTimeLimit()
 
             dispatch_group_t group = dispatch_group_create();
             dispatch_group_async(group, dispatch_get_global_queue(0, 0), ^{
 
             dispatch_group_t group = dispatch_group_create();
             dispatch_group_async(group, dispatch_get_global_queue(0, 0), ^{
-                startTimeRef = currentCPUTime();
+                startTimeRef = CPUTime::forCurrentThread();
                 JSEvaluateScript(contextRef, scriptRef, nullptr, nullptr, 1, &exceptionRef);
                 JSEvaluateScript(contextRef, scriptRef, nullptr, nullptr, 1, &exceptionRef);
-                endTimeRef = currentCPUTime();
+                endTimeRef = CPUTime::forCurrentThread();
                 auto locker = WTF::holdLock(syncLockRef);
                 didSynchronizeRef = true;
                 synchronizeRef.notifyAll();
                 auto locker = WTF::holdLock(syncLockRef);
                 didSynchronizeRef = true;
                 synchronizeRef.notifyAll();
index 9735cba..c168904 100644 (file)
@@ -1,3 +1,33 @@
+2018-03-04  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [WTF] Move currentCPUTime and sleep(Seconds) to CPUTime.h and Seconds.h respectively
+        https://bugs.webkit.org/show_bug.cgi?id=183312
+
+        Reviewed by Mark Lam.
+
+        Remove wtf/CurrentTime.h include pragma.
+
+        * API/tests/ExecutionTimeLimitTest.cpp:
+        (currentCPUTimeAsJSFunctionCallback):
+        (testExecutionTimeLimit):
+        * bytecode/SuperSampler.cpp:
+        * dfg/DFGPlan.cpp:
+        * heap/BlockDirectory.cpp:
+        * heap/Heap.cpp:
+        * heap/IncrementalSweeper.cpp:
+        * inspector/agents/InspectorConsoleAgent.cpp:
+        * inspector/agents/InspectorRuntimeAgent.cpp:
+        * profiler/ProfilerDatabase.cpp:
+        * runtime/CodeCache.h:
+        * runtime/JSDateMath.cpp:
+        * runtime/TypeProfilerLog.cpp:
+        * runtime/VM.cpp:
+        * runtime/Watchdog.cpp:
+        (JSC::Watchdog::shouldTerminate):
+        (JSC::Watchdog::startTimer):
+        * testRegExp.cpp:
+        * wasm/js/JSWebAssemblyCodeBlock.cpp:
+
 2018-03-04  Tim Horton  <timothy_horton@apple.com>
 
         Make !ENABLE(DATA_DETECTION) iOS build actually succeed
 2018-03-04  Tim Horton  <timothy_horton@apple.com>
 
         Make !ENABLE(DATA_DETECTION) iOS build actually succeed
index 7bbac47..f2efc67 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "MacroAssembler.h"
 #include "Options.h"
 
 #include "MacroAssembler.h"
 #include "Options.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/DataLog.h>
 #include <wtf/Lock.h>
 #include <wtf/Threading.h>
 #include <wtf/DataLog.h>
 #include <wtf/Lock.h>
 #include <wtf/Threading.h>
index a571471..549a9db 100644 (file)
@@ -79,7 +79,6 @@
 #include "ProfilerDatabase.h"
 #include "TrackedReferences.h"
 #include "VMInlines.h"
 #include "ProfilerDatabase.h"
 #include "TrackedReferences.h"
 #include "VMInlines.h"
-#include <wtf/CurrentTime.h>
 
 #if ENABLE(FTL_JIT)
 #include "FTLCapabilities.h"
 
 #if ENABLE(FTL_JIT)
 #include "FTLCapabilities.h"
index 9e589b9..a4f8384 100644 (file)
@@ -35,7 +35,6 @@
 #include "SuperSampler.h"
 #include "ThreadLocalCacheInlines.h"
 #include "VM.h"
 #include "SuperSampler.h"
 #include "ThreadLocalCacheInlines.h"
 #include "VM.h"
-#include <wtf/CurrentTime.h>
 
 namespace JSC {
 
 
 namespace JSC {
 
index 17e37ae..a53a446 100644 (file)
@@ -81,7 +81,6 @@
 #if PLATFORM(IOS)
 #include <bmalloc/bmalloc.h>
 #endif
 #if PLATFORM(IOS)
 #include <bmalloc/bmalloc.h>
 #endif
-#include <wtf/CurrentTime.h>
 #include <wtf/ListDump.h>
 #include <wtf/MainThread.h>
 #include <wtf/ParallelVectorIterator.h>
 #include <wtf/ListDump.h>
 #include <wtf/MainThread.h>
 #include <wtf/ParallelVectorIterator.h>
index 9159f2d..e5e49dd 100644 (file)
@@ -31,7 +31,6 @@
 #include "JSString.h"
 #include "MarkedBlock.h"
 #include "JSCInlines.h"
 #include "JSString.h"
 #include "MarkedBlock.h"
 #include "JSCInlines.h"
-#include <wtf/CurrentTime.h>
 
 namespace JSC {
 
 
 namespace JSC {
 
index 2a67a1e..fb1aa6a 100644 (file)
@@ -35,7 +35,6 @@
 #include "ScriptCallStack.h"
 #include "ScriptCallStackFactory.h"
 #include "ScriptObject.h"
 #include "ScriptCallStack.h"
 #include "ScriptCallStackFactory.h"
 #include "ScriptObject.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/text/WTFString.h>
 
 namespace Inspector {
 #include <wtf/text/WTFString.h>
 
 namespace Inspector {
index 99da9da..0e3c3be 100644 (file)
@@ -44,7 +44,6 @@
 #include "SourceCode.h"
 #include "TypeProfiler.h"
 #include "TypeProfilerLog.h"
 #include "SourceCode.h"
 #include "TypeProfiler.h"
 #include "TypeProfilerLog.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/JSONValues.h>
 
 namespace Inspector {
 #include <wtf/JSONValues.h>
 
 namespace Inspector {
index d2823b5..d454e78 100644 (file)
@@ -31,7 +31,6 @@
 #include "JSONObject.h"
 #include "ObjectConstructor.h"
 #include "JSCInlines.h"
 #include "JSONObject.h"
 #include "ObjectConstructor.h"
 #include "JSCInlines.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/FilePrintStream.h>
 
 namespace JSC { namespace Profiler {
 #include <wtf/FilePrintStream.h>
 
 namespace JSC { namespace Profiler {
index 4fb5bd1..73ca5ec 100644 (file)
@@ -37,7 +37,6 @@
 #include "UnlinkedEvalCodeBlock.h"
 #include "UnlinkedModuleProgramCodeBlock.h"
 #include "UnlinkedProgramCodeBlock.h"
 #include "UnlinkedEvalCodeBlock.h"
 #include "UnlinkedModuleProgramCodeBlock.h"
 #include "UnlinkedProgramCodeBlock.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/Forward.h>
 #include <wtf/text/WTFString.h>
 
 #include <wtf/Forward.h>
 #include <wtf/text/WTFString.h>
 
index 6c04e3c..c2bf826 100644 (file)
@@ -83,7 +83,6 @@
 #include <time.h>
 #include <wtf/ASCIICType.h>
 #include <wtf/Assertions.h>
 #include <time.h>
 #include <wtf/ASCIICType.h>
 #include <wtf/Assertions.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/MathExtras.h>
 #include <wtf/StdLibExtras.h>
 
 #include <wtf/MathExtras.h>
 #include <wtf/StdLibExtras.h>
 
index ff0a761..2c24690 100644 (file)
@@ -32,7 +32,6 @@
 #include "JSCInlines.h"
 #include "SlotVisitor.h"
 #include "TypeLocation.h"
 #include "JSCInlines.h"
 #include "SlotVisitor.h"
 #include "TypeLocation.h"
-#include <wtf/CurrentTime.h>
 
 
 namespace JSC {
 
 
 namespace JSC {
index ce6e4c1..8c7531f 100644 (file)
 #include "WeakGCMapInlines.h"
 #include "WebAssemblyFunction.h"
 #include "WebAssemblyWrapperFunction.h"
 #include "WeakGCMapInlines.h"
 #include "WebAssemblyFunction.h"
 #include "WebAssemblyWrapperFunction.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/ProcessID.h>
 #include <wtf/ReadWriteLock.h>
 #include <wtf/SimpleStats.h>
 #include <wtf/ProcessID.h>
 #include <wtf/ReadWriteLock.h>
 #include <wtf/SimpleStats.h>
index 3cd3ee8..63a0e59 100644 (file)
@@ -27,7 +27,7 @@
 #include "Watchdog.h"
 
 #include "CallFrame.h"
 #include "Watchdog.h"
 
 #include "CallFrame.h"
-#include <wtf/CurrentTime.h>
+#include <wtf/CPUTime.h>
 #include <wtf/MathExtras.h>
 
 namespace JSC {
 #include <wtf/MathExtras.h>
 
 namespace JSC {
@@ -70,7 +70,7 @@ bool Watchdog::shouldTerminate(ExecState* exec)
     // spurious wakes.
     m_deadline = MonotonicTime::infinity();
 
     // spurious wakes.
     m_deadline = MonotonicTime::infinity();
 
-    auto cpuTime = currentCPUTime();
+    auto cpuTime = CPUTime::forCurrentThread();
     if (cpuTime < m_cpuDeadline) {
         auto remainingCPUTime = m_cpuDeadline - cpuTime;
         startTimer(remainingCPUTime);
     if (cpuTime < m_cpuDeadline) {
         auto remainingCPUTime = m_cpuDeadline - cpuTime;
         startTimer(remainingCPUTime);
@@ -131,7 +131,7 @@ void Watchdog::startTimer(Seconds timeLimit)
     ASSERT(hasTimeLimit());
     ASSERT(timeLimit <= m_timeLimit);
 
     ASSERT(hasTimeLimit());
     ASSERT(timeLimit <= m_timeLimit);
 
-    m_cpuDeadline = currentCPUTime() + timeLimit;
+    m_cpuDeadline = CPUTime::forCurrentThread() + timeLimit;
     auto now = MonotonicTime::now();
     auto deadline = now + timeLimit;
 
     auto now = MonotonicTime::now();
     auto deadline = now + timeLimit;
 
index e438f56..a6552f0 100644 (file)
@@ -21,7 +21,6 @@
 #include "config.h"
 #include "RegExp.h"
 
 #include "config.h"
 #include "RegExp.h"
 
-#include <wtf/CurrentTime.h>
 #include "InitializeThreading.h"
 #include "JSCInlines.h"
 #include "JSGlobalObject.h"
 #include "InitializeThreading.h"
 #include "JSCInlines.h"
 #include "JSGlobalObject.h"
index 94e483b..edf94ef 100644 (file)
@@ -34,7 +34,6 @@
 #include "WasmModuleInformation.h"
 #include "WasmToJS.h"
 
 #include "WasmModuleInformation.h"
 #include "WasmToJS.h"
 
-#include <wtf/CurrentTime.h>
 
 namespace JSC {
 
 
 namespace JSC {
 
index 6616fbd..929c313 100644 (file)
@@ -1,5 +1,55 @@
 2018-03-04  Yusuke Suzuki  <utatane.tea@gmail.com>
 
 2018-03-04  Yusuke Suzuki  <utatane.tea@gmail.com>
 
+        [WTF] Move currentCPUTime and sleep(Seconds) to CPUTime.h and Seconds.h respectively
+        https://bugs.webkit.org/show_bug.cgi?id=183312
+
+        Reviewed by Mark Lam.
+
+        1. currentCPUTime to CPUTime.h. It is now defined as CPUTime::forCurrentThread.
+        We also removes fallback implementation for currentCPUTime since (1) that implementation
+        is wrong and (2) no environments we support needs this.
+
+        2. sleep(Seconds) to Seconds.h. Since sleep(MonotonicTime) and sleep(WallTime) are defined
+        in MonotonicTime.h and WallTime.h, this code move is natural.
+
+        3. Remove wtf/CurrentTime.h since nothing is defined now. But we keep CurrentTime.cpp to
+        consolidate various time-source implementations in one place.
+
+        * WTF.xcodeproj/project.pbxproj:
+        * benchmarks/ConditionSpeedTest.cpp:
+        * benchmarks/LockFairnessTest.cpp:
+        * benchmarks/LockSpeedTest.cpp:
+        * wtf/CMakeLists.txt:
+        * wtf/CPUTime.h:
+        * wtf/CurrentTime.cpp:
+        (WTF::currentCPUTime): Deleted.
+        (WTF::sleep): Deleted.
+        * wtf/CurrentTime.h: Removed.
+        * wtf/DateMath.cpp:
+        * wtf/DebugUtilities.h:
+        * wtf/FastMalloc.cpp:
+        * wtf/MainThread.cpp:
+        * wtf/MonotonicTime.cpp:
+        * wtf/ParkingLot.cpp:
+        * wtf/Seconds.cpp:
+        (WTF::sleep):
+        * wtf/Seconds.h:
+        * wtf/StackShotProfiler.h:
+        * wtf/Stopwatch.h:
+        * wtf/ThreadingPthreads.cpp:
+        * wtf/ThreadingWin.cpp:
+        * wtf/cocoa/CPUTimeCocoa.mm:
+        (WTF::CPUTime::forCurrentThread):
+        * wtf/cocoa/MemoryPressureHandlerCocoa.mm:
+        * wtf/linux/MemoryPressureHandlerLinux.cpp:
+        * wtf/unix/CPUTimeUnix.cpp:
+        (WTF::CPUTime::forCurrentThread):
+        * wtf/win/CPUTimeWin.cpp:
+        (WTF::CPUTime::forCurrentThread):
+        * wtf/win/RunLoopWin.cpp:
+
+2018-03-04  Yusuke Suzuki  <utatane.tea@gmail.com>
+
         [WTF] Use __builtin_xxx_overflow for CheckedArithmetic
         https://bugs.webkit.org/show_bug.cgi?id=183319
 
         [WTF] Use __builtin_xxx_overflow for CheckedArithmetic
         https://bugs.webkit.org/show_bug.cgi?id=183319
 
index 60a25bf..b8c7395 100644 (file)
                A8A47273151A825A004123FF /* CryptographicallyRandomNumber.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptographicallyRandomNumber.cpp; sourceTree = "<group>"; };
                A8A47274151A825A004123FF /* CryptographicallyRandomNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptographicallyRandomNumber.h; sourceTree = "<group>"; };
                A8A47275151A825A004123FF /* CurrentTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CurrentTime.cpp; sourceTree = "<group>"; };
                A8A47273151A825A004123FF /* CryptographicallyRandomNumber.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptographicallyRandomNumber.cpp; sourceTree = "<group>"; };
                A8A47274151A825A004123FF /* CryptographicallyRandomNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptographicallyRandomNumber.h; sourceTree = "<group>"; };
                A8A47275151A825A004123FF /* CurrentTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CurrentTime.cpp; sourceTree = "<group>"; };
-               A8A47276151A825A004123FF /* CurrentTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurrentTime.h; sourceTree = "<group>"; };
                A8A47277151A825A004123FF /* DataLog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DataLog.cpp; sourceTree = "<group>"; };
                A8A47278151A825A004123FF /* DataLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataLog.h; sourceTree = "<group>"; };
                A8A47279151A825A004123FF /* DateMath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateMath.cpp; sourceTree = "<group>"; };
                A8A47277151A825A004123FF /* DataLog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DataLog.cpp; sourceTree = "<group>"; };
                A8A47278151A825A004123FF /* DataLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataLog.h; sourceTree = "<group>"; };
                A8A47279151A825A004123FF /* DateMath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateMath.cpp; sourceTree = "<group>"; };
                                E15556F318A0CC18006F48FB /* CryptographicUtilities.cpp */,
                                E15556F418A0CC18006F48FB /* CryptographicUtilities.h */,
                                A8A47275151A825A004123FF /* CurrentTime.cpp */,
                                E15556F318A0CC18006F48FB /* CryptographicUtilities.cpp */,
                                E15556F418A0CC18006F48FB /* CryptographicUtilities.h */,
                                A8A47275151A825A004123FF /* CurrentTime.cpp */,
-                               A8A47276151A825A004123FF /* CurrentTime.h */,
                                A8A47277151A825A004123FF /* DataLog.cpp */,
                                A8A47278151A825A004123FF /* DataLog.h */,
                                A8A47279151A825A004123FF /* DateMath.cpp */,
                                A8A47277151A825A004123FF /* DataLog.cpp */,
                                A8A47278151A825A004123FF /* DataLog.h */,
                                A8A47279151A825A004123FF /* DateMath.cpp */,
                                A8A4727F151A825A004123FF /* DispatchPtr.h */,
                                0F4570421BE5B58F0062A629 /* Dominators.h */,
                                A8A47280151A825A004123FF /* DoublyLinkedList.h */,
                                A8A4727F151A825A004123FF /* DispatchPtr.h */,
                                0F4570421BE5B58F0062A629 /* Dominators.h */,
                                A8A47280151A825A004123FF /* DoublyLinkedList.h */,
-                               FE05FAE61FDB214300093230 /* DumbPtrTraits.h */,
-                               AD653DA82006B6C200D820D7 /* DumbValueTraits.h */,
                                A8A47297151A825A004123FF /* dtoa.cpp */,
                                A8A47298151A825A004123FF /* dtoa.h */,
                                A8A47297151A825A004123FF /* dtoa.cpp */,
                                A8A47298151A825A004123FF /* dtoa.h */,
+                               FE05FAE61FDB214300093230 /* DumbPtrTraits.h */,
+                               AD653DA82006B6C200D820D7 /* DumbValueTraits.h */,
                                1AEA88E11D6BBCF400E5AD64 /* EnumTraits.h */,
                                AD7C434A1DD2A4A70026888B /* Expected.h */,
                                A8A4729F151A825A004123FF /* ExportMacros.h */,
                                1AEA88E11D6BBCF400E5AD64 /* EnumTraits.h */,
                                AD7C434A1DD2A4A70026888B /* Expected.h */,
                                A8A4729F151A825A004123FF /* ExportMacros.h */,
                                A8A47370151A825B004123FF /* Vector.h */,
                                A8A47371151A825B004123FF /* VectorTraits.h */,
                                A8A47372151A825B004123FF /* VMTags.h */,
                                A8A47370151A825B004123FF /* Vector.h */,
                                A8A47371151A825B004123FF /* VectorTraits.h */,
                                A8A47372151A825B004123FF /* VMTags.h */,
-                               FE05FAFE1FE5007500093230 /* WTFAssertions.cpp */,
                                0F66B2881DC97BAB004A1D3F /* WallTime.cpp */,
                                0F66B2891DC97BAB004A1D3F /* WallTime.h */,
                                974CFC8D16A4F327006D5404 /* WeakPtr.h */,
                                0F66B2881DC97BAB004A1D3F /* WallTime.cpp */,
                                0F66B2891DC97BAB004A1D3F /* WallTime.h */,
                                974CFC8D16A4F327006D5404 /* WeakPtr.h */,
                                0FE4479B1B7AAA03009498EB /* WordLock.h */,
                                E4A0AD371A96245500536DF6 /* WorkQueue.cpp */,
                                E4A0AD381A96245500536DF6 /* WorkQueue.h */,
                                0FE4479B1B7AAA03009498EB /* WordLock.h */,
                                E4A0AD371A96245500536DF6 /* WorkQueue.cpp */,
                                E4A0AD381A96245500536DF6 /* WorkQueue.h */,
+                               FE05FAFE1FE5007500093230 /* WTFAssertions.cpp */,
                        );
                        path = wtf;
                        sourceTree = "<group>";
                        );
                        path = wtf;
                        sourceTree = "<group>";
                                0F66B28A1DC97BAB004A1D3F /* ClockType.cpp in Sources */,
                                A8A47460151A825B004123FF /* CollatorDefault.cpp in Sources */,
                                A8A47463151A825B004123FF /* CollatorICU.cpp in Sources */,
                                0F66B28A1DC97BAB004A1D3F /* ClockType.cpp in Sources */,
                                A8A47460151A825B004123FF /* CollatorDefault.cpp in Sources */,
                                A8A47463151A825B004123FF /* CollatorICU.cpp in Sources */,
-                               FE05FAFF1FE5007500093230 /* WTFAssertions.cpp in Sources */,
                                0F8F2B92172E0103007DBDA5 /* CompilationThread.cpp in Sources */,
                                0F30CB5A1FCDF134004B5323 /* ConcurrentPtrHashSet.cpp in Sources */,
                                0F8E85DB1FD485B000691889 /* CountingLock.cpp in Sources */,
                                0F8F2B92172E0103007DBDA5 /* CompilationThread.cpp in Sources */,
                                0F30CB5A1FCDF134004B5323 /* ConcurrentPtrHashSet.cpp in Sources */,
                                0F8E85DB1FD485B000691889 /* CountingLock.cpp in Sources */,
                                0FE4479C1B7AAA03009498EB /* WordLock.cpp in Sources */,
                                E4A0AD391A96245500536DF6 /* WorkQueue.cpp in Sources */,
                                E4A0AD3D1A96253C00536DF6 /* WorkQueueCocoa.cpp in Sources */,
                                0FE4479C1B7AAA03009498EB /* WordLock.cpp in Sources */,
                                E4A0AD391A96245500536DF6 /* WorkQueue.cpp in Sources */,
                                E4A0AD3D1A96253C00536DF6 /* WorkQueueCocoa.cpp in Sources */,
+                               FE05FAFF1FE5007500093230 /* WTFAssertions.cpp in Sources */,
                                A8A47445151A825B004123FF /* WTFString.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                                A8A47445151A825B004123FF /* WTFString.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
index 847c8b7..f59b08d 100644 (file)
@@ -35,7 +35,6 @@
 #include <type_traits>
 #include <unistd.h>
 #include <wtf/Condition.h>
 #include <type_traits>
 #include <unistd.h>
 #include <wtf/Condition.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/DataLog.h>
 #include <wtf/Deque.h>
 #include <wtf/Lock.h>
 #include <wtf/DataLog.h>
 #include <wtf/Deque.h>
 #include <wtf/Lock.h>
index d7fceda..cc707de 100644 (file)
@@ -33,7 +33,6 @@
 #include <unistd.h>
 #include <wtf/CommaPrinter.h>
 #include <wtf/Compiler.h>
 #include <unistd.h>
 #include <wtf/CommaPrinter.h>
 #include <wtf/Compiler.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/DataLog.h>
 #include <wtf/HashMap.h>
 #include <wtf/Lock.h>
 #include <wtf/DataLog.h>
 #include <wtf/HashMap.h>
 #include <wtf/Lock.h>
index dc839ab..f15650d 100644 (file)
@@ -31,7 +31,6 @@
 #include "ToyLocks.h"
 #include <thread>
 #include <unistd.h>
 #include "ToyLocks.h"
 #include <thread>
 #include <unistd.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/DataLog.h>
 #include <wtf/HashMap.h>
 #include <wtf/Lock.h>
 #include <wtf/DataLog.h>
 #include <wtf/HashMap.h>
 #include <wtf/Lock.h>
index 220bafd..29fff29 100644 (file)
@@ -41,7 +41,6 @@ set(WTF_HEADERS
     CrossThreadTaskHandler.h
     CryptographicUtilities.h
     CryptographicallyRandomNumber.h
     CrossThreadTaskHandler.h
     CryptographicUtilities.h
     CryptographicallyRandomNumber.h
-    CurrentTime.h
     DataLog.h
     DateMath.h
     DebugUtilities.h
     DataLog.h
     DateMath.h
     DebugUtilities.h
index 1f3958b..6ac3fe7 100644 (file)
@@ -39,6 +39,11 @@ struct CPUTime {
     WTF_EXPORT_PRIVATE double percentageCPUUsageSince(const CPUTime&) const;
 
     WTF_EXPORT_PRIVATE static std::optional<CPUTime> get();
     WTF_EXPORT_PRIVATE double percentageCPUUsageSince(const CPUTime&) const;
 
     WTF_EXPORT_PRIVATE static std::optional<CPUTime> get();
+
+    // Returns the current CPU time of the current thread.
+    // Precision varies depending on platform but is usually as good or better
+    // than a millisecond.
+    WTF_EXPORT_PRIVATE static Seconds forCurrentThread();
 };
 
 } // namespace WTF
 };
 
 } // namespace WTF
index 1eb63ca..272fc46 100644 (file)
  */
 
 #include "config.h"
  */
 
 #include "config.h"
-#include "CurrentTime.h"
 #include "MonotonicTime.h"
 #include "WallTime.h"
 
 #include "MonotonicTime.h"
 #include "WallTime.h"
 
-#include "Condition.h"
-#include "Lock.h"
-
 #if OS(DARWIN)
 #include <mach/mach.h>
 #include <mach/mach_time.h>
 #if OS(DARWIN)
 #include <mach/mach.h>
 #include <mach/mach_time.h>
@@ -279,54 +275,4 @@ MonotonicTime MonotonicTime::now()
 #endif
 }
 
 #endif
 }
 
-Seconds currentCPUTime()
-{
-#if OS(DARWIN)
-    mach_msg_type_number_t infoCount = THREAD_BASIC_INFO_COUNT;
-    thread_basic_info_data_t info;
-
-    // Get thread information
-    mach_port_t threadPort = mach_thread_self();
-    thread_info(threadPort, THREAD_BASIC_INFO, reinterpret_cast<thread_info_t>(&info), &infoCount);
-    mach_port_deallocate(mach_task_self(), threadPort);
-
-    return Seconds(info.user_time.seconds + info.system_time.seconds) + Seconds::fromMicroseconds(info.user_time.microseconds + info.system_time.microseconds);
-#elif OS(WINDOWS)
-    union {
-        FILETIME fileTime;
-        unsigned long long fileTimeAsLong;
-    } userTime, kernelTime;
-    
-    // GetThreadTimes won't accept null arguments so we pass these even though
-    // they're not used.
-    FILETIME creationTime, exitTime;
-    
-    GetThreadTimes(GetCurrentThread(), &creationTime, &exitTime, &kernelTime.fileTime, &userTime.fileTime);
-
-    return Seconds::fromMicroseconds((userTime.fileTimeAsLong + kernelTime.fileTimeAsLong) / 10);
-#elif OS(LINUX) || OS(FREEBSD) || OS(OPENBSD) || OS(NETBSD)
-    struct timespec ts { };
-    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts);
-    return Seconds(ts.tv_sec) + Seconds::fromNanoseconds(ts.tv_nsec);
-#else
-    // FIXME: We should return the time the current thread has spent executing.
-
-    static MonotonicTime firstTime = MonotonicTime::now();
-    return MonotonicTime::now() - firstTime;
-#endif
-}
-
-void sleep(Seconds value)
-{
-    // It's very challenging to find portable ways of sleeping for less than a second. On UNIX, you want to
-    // use usleep() but it's hard to #include it in a portable way (you'd think it's in unistd.h, but then
-    // you'd be wrong on some OSX SDKs). Also, usleep() won't save you on Windows. Hence, bottoming out in
-    // lock code, which already solves the sleeping problem, is probably for the best.
-    
-    Lock fakeLock;
-    Condition fakeCondition;
-    LockHolder fakeLocker(fakeLock);
-    fakeCondition.waitFor(fakeLock, value);
-}
-
 } // namespace WTF
 } // namespace WTF
diff --git a/Source/WTF/wtf/CurrentTime.h b/Source/WTF/wtf/CurrentTime.h
deleted file mode 100644 (file)
index b2f6fd5..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2006 Apple Inc.  All rights reserved.
- * Copyright (C) 2008 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef CurrentTime_h
-#define CurrentTime_h
-
-#include <time.h>
-#include <wtf/Seconds.h>
-
-namespace WTF {
-
-// Returns the current CPU time of the current thread.
-// Precision varies depending on platform but is usually as good or better
-// than a millisecond.
-WTF_EXPORT_PRIVATE Seconds currentCPUTime();
-
-WTF_EXPORT_PRIVATE void sleep(Seconds);
-
-} // namespace WTF
-
-using WTF::currentCPUTime;
-using WTF::sleep;
-
-#endif // CurrentTime_h
index 6420b5d..cce56b3 100644 (file)
@@ -74,7 +74,6 @@
 
 #include "Assertions.h"
 #include "ASCIICType.h"
 
 #include "Assertions.h"
 #include "ASCIICType.h"
-#include "CurrentTime.h"
 #include "MathExtras.h"
 #include "StdLibExtras.h"
 
 #include "MathExtras.h"
 #include "StdLibExtras.h"
 
index 32ac379..0989280 100644 (file)
@@ -27,7 +27,6 @@
 #define WTF_DebugUtilities_h
 
 #include <wtf/Assertions.h>
 #define WTF_DebugUtilities_h
 
 #include <wtf/Assertions.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/ProcessID.h>
 
 #define SLEEP_THREAD_FOR_DEBUGGER() \
 #include <wtf/ProcessID.h>
 
 #define SLEEP_THREAD_FOR_DEBUGGER() \
index 9a0f08b..e1918f0 100644 (file)
@@ -27,7 +27,6 @@
 #include "FastMalloc.h"
 
 #include "CheckedArithmetic.h"
 #include "FastMalloc.h"
 
 #include "CheckedArithmetic.h"
-#include "CurrentTime.h"
 #include <limits>
 #include <string.h>
 #include <wtf/DataLog.h>
 #include <limits>
 #include <string.h>
 #include <wtf/DataLog.h>
index d8592b7..7475888 100644 (file)
@@ -29,7 +29,6 @@
 #include "config.h"
 #include "MainThread.h"
 
 #include "config.h"
 #include "MainThread.h"
 
-#include "CurrentTime.h"
 #include "Deque.h"
 #include "MonotonicTime.h"
 #include "StdLibExtras.h"
 #include "Deque.h"
 #include "MonotonicTime.h"
 #include "StdLibExtras.h"
index e0d7d91..4d0ed46 100644 (file)
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "MonotonicTime.h"
 
 #include "config.h"
 #include "MonotonicTime.h"
 
-#include "CurrentTime.h"
 #include "PrintStream.h"
 #include "TimeWithDynamicClockType.h"
 #include "WallTime.h"
 #include "PrintStream.h"
 #include "TimeWithDynamicClockType.h"
 #include "WallTime.h"
index 5179dc8..539bc2a 100644 (file)
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "ParkingLot.h"
 
 #include "config.h"
 #include "ParkingLot.h"
 
-#include "CurrentTime.h"
 #include "DataLog.h"
 #include "HashFunctions.h"
 #include "StringPrintStream.h"
 #include "DataLog.h"
 #include "HashFunctions.h"
 #include "StringPrintStream.h"
index 8f7383d..358c7c3 100644 (file)
@@ -26,7 +26,8 @@
 #include "config.h"
 #include "Seconds.h"
 
 #include "config.h"
 #include "Seconds.h"
 
-#include "CurrentTime.h"
+#include "Condition.h"
+#include "Lock.h"
 #include "MonotonicTime.h"
 #include "PrintStream.h"
 #include "TimeWithDynamicClockType.h"
 #include "MonotonicTime.h"
 #include "PrintStream.h"
 #include "TimeWithDynamicClockType.h"
@@ -69,5 +70,18 @@ void Seconds::dump(PrintStream& out) const
     out.print(m_value, " sec");
 }
 
     out.print(m_value, " sec");
 }
 
+void sleep(Seconds value)
+{
+    // It's very challenging to find portable ways of sleeping for less than a second. On UNIX, you want to
+    // use usleep() but it's hard to #include it in a portable way (you'd think it's in unistd.h, but then
+    // you'd be wrong on some OSX SDKs). Also, usleep() won't save you on Windows. Hence, bottoming out in
+    // lock code, which already solves the sleeping problem, is probably for the best.
+
+    Lock fakeLock;
+    Condition fakeCondition;
+    LockHolder fakeLocker(fakeLock);
+    fakeCondition.waitFor(fakeLock, value);
+}
+
 } // namespace WTF
 
 } // namespace WTF
 
index e43ec4c..61086f3 100644 (file)
@@ -251,6 +251,8 @@ private:
     double m_value { 0 };
 };
 
     double m_value { 0 };
 };
 
+WTF_EXPORT_PRIVATE void sleep(Seconds);
+
 inline namespace seconds_literals {
 
 constexpr Seconds operator"" _min(long double minutes)
 inline namespace seconds_literals {
 
 constexpr Seconds operator"" _min(long double minutes)
@@ -317,6 +319,8 @@ constexpr Seconds operator"" _ns(unsigned long long nanoseconds)
 
 } // namespace WTF
 
 
 } // namespace WTF
 
+using WTF::sleep;
+
 namespace std {
 
 inline bool isnan(WTF::Seconds seconds)
 namespace std {
 
 inline bool isnan(WTF::Seconds seconds)
index 5755113..3d39b1d 100644 (file)
@@ -25,7 +25,6 @@
 
 #pragma once
 
 
 #pragma once
 
-#include <wtf/CurrentTime.h>
 #include <wtf/DataLog.h>
 #include <wtf/Locker.h>
 #include <wtf/ProcessID.h>
 #include <wtf/DataLog.h>
 #include <wtf/Locker.h>
 #include <wtf/ProcessID.h>
index 48522d4..406ac2c 100644 (file)
@@ -25,7 +25,6 @@
 #pragma once
 
 #include <cmath>
 #pragma once
 
 #include <cmath>
-#include <wtf/CurrentTime.h>
 #include <wtf/MonotonicTime.h>
 #include <wtf/RefCounted.h>
 
 #include <wtf/MonotonicTime.h>
 #include <wtf/RefCounted.h>
 
index a10594b..c47cf24 100644 (file)
@@ -35,7 +35,6 @@
 #if USE(PTHREADS)
 
 #include <errno.h>
 #if USE(PTHREADS)
 
 #include <errno.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/DataLog.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/RawPointer.h>
 #include <wtf/DataLog.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/RawPointer.h>
index 4a55443..6eddfd6 100644 (file)
@@ -91,7 +91,6 @@
 #include <errno.h>
 #include <process.h>
 #include <windows.h>
 #include <errno.h>
 #include <process.h>
 #include <windows.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/HashMap.h>
 #include <wtf/Lock.h>
 #include <wtf/MainThread.h>
 #include <wtf/HashMap.h>
 #include <wtf/Lock.h>
 #include <wtf/MainThread.h>
index 257d8ab..9d2d020 100644 (file)
 #import "config.h"
 #import "CPUTime.h"
 
 #import "config.h"
 #import "CPUTime.h"
 
-#import <mach/mach_init.h>
+#import <mach/mach.h>
+#import <mach/mach_time.h>
 #import <mach/task.h>
 #import <mach/task_info.h>
 #import <mach/task.h>
 #import <mach/task_info.h>
+#import <mach/thread_info.h>
+#import <sys/time.h>
 
 namespace WTF {
 
 
 namespace WTF {
 
@@ -67,4 +70,16 @@ std::optional<CPUTime> CPUTime::get()
     return CPUTime { MonotonicTime::now(), Seconds::fromMicroseconds(userTime), Seconds::fromMicroseconds(systemTime) };
 }
 
     return CPUTime { MonotonicTime::now(), Seconds::fromMicroseconds(userTime), Seconds::fromMicroseconds(systemTime) };
 }
 
+Seconds CPUTime::forCurrentThread()
+{
+    mach_msg_type_number_t infoCount = THREAD_BASIC_INFO_COUNT;
+    thread_basic_info_data_t info;
+
+    mach_port_t threadPort = mach_thread_self();
+    thread_info(threadPort, THREAD_BASIC_INFO, reinterpret_cast<thread_info_t>(&info), &infoCount);
+    mach_port_deallocate(mach_task_self(), threadPort);
+
+    return Seconds(info.user_time.seconds + info.system_time.seconds) + Seconds::fromMicroseconds(info.user_time.microseconds + info.system_time.microseconds);
+}
+
 }
 }
index 5003d0e..f7ee647 100644 (file)
@@ -30,7 +30,6 @@
 #import <mach/task_info.h>
 #import <malloc/malloc.h>
 #import <notify.h>
 #import <mach/task_info.h>
 #import <malloc/malloc.h>
 #import <notify.h>
-#import <wtf/CurrentTime.h>
 
 #define ENABLE_FMW_FOOTPRINT_COMPARISON 0
 
 
 #define ENABLE_FMW_FOOTPRINT_COMPARISON 0
 
index e881441..8e85f58 100644 (file)
@@ -36,7 +36,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/MainThread.h>
 #include <wtf/MemoryFootprint.h>
 #include <wtf/linux/CurrentProcessMemoryStatus.h>
 #include <wtf/MainThread.h>
 #include <wtf/MemoryFootprint.h>
 #include <wtf/linux/CurrentProcessMemoryStatus.h>
index 9752b1b..edc1be6 100644 (file)
@@ -44,4 +44,11 @@ std::optional<CPUTime> CPUTime::get()
     return CPUTime { MonotonicTime::now(), timevalToSeconds(resource.ru_utime), timevalToSeconds(resource.ru_stime) };
 }
 
     return CPUTime { MonotonicTime::now(), timevalToSeconds(resource.ru_utime), timevalToSeconds(resource.ru_stime) };
 }
 
+Seconds CPUTime::forCurrentThread()
+{
+    struct timespec ts { };
+    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts);
+    return Seconds(ts.tv_sec) + Seconds::fromNanoseconds(ts.tv_nsec);
+}
+
 }
 }
index fe0dae5..ca8fc76 100644 (file)
@@ -60,4 +60,14 @@ std::optional<CPUTime> CPUTime::get()
     return CPUTime { MonotonicTime::now(), fileTimeToSeconds(userTime), fileTimeToSeconds(kernelTime) };
 }
 
     return CPUTime { MonotonicTime::now(), fileTimeToSeconds(userTime), fileTimeToSeconds(kernelTime) };
 }
 
+Seconds CPUTime::forCurrentThread()
+{
+    FILETIME userTime, kernelTime, creationTime, exitTime;
+
+    BOOL ret = GetThreadTimes(GetCurrentThread(), &creationTime, &exitTime, &kernelTime, &userTime);
+    ASSERT_UNUSED(ret, ret);
+
+    return fileTimeToSeconds(userTime) + fileTimeToSeconds(kernelTime);
+}
+
 }
 }
index 83d3bf9..368132a 100644 (file)
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "RunLoop.h"
 
 #include "config.h"
 #include "RunLoop.h"
 
-#include <wtf/CurrentTime.h>
 #include <wtf/WindowsExtras.h>
 
 namespace WTF {
 #include <wtf/WindowsExtras.h>
 
 namespace WTF {
index c4e5d89..e01d394 100644 (file)
@@ -1,3 +1,111 @@
+2018-03-04  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [WTF] Move currentCPUTime and sleep(Seconds) to CPUTime.h and Seconds.h respectively
+        https://bugs.webkit.org/show_bug.cgi?id=183312
+
+        Reviewed by Mark Lam.
+
+        Remove wtf/CurrentTime.h include pragma.
+
+        * Modules/geolocation/Geolocation.cpp:
+        * Modules/mediasource/SourceBuffer.cpp:
+        * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
+        * Modules/speech/SpeechSynthesis.cpp:
+        * contentextensions/ContentExtensionCompiler.cpp:
+        * contentextensions/ContentExtensionParser.cpp:
+        * dom/Document.cpp:
+        * dom/Element.cpp:
+        * dom/Event.cpp:
+        * dom/ScriptedAnimationController.cpp:
+        * dom/SimulatedClick.cpp:
+        * fileapi/File.cpp:
+        * fileapi/FileReader.cpp:
+        * history/CachedPage.cpp:
+        * html/BaseDateAndTimeInputType.cpp:
+        * html/DateTimeInputType.cpp:
+        * html/HTMLMediaElement.cpp:
+        * html/MediaController.cpp:
+        * html/MediaElementSession.cpp:
+        * html/MonthInputType.cpp:
+        * html/TimeInputType.cpp:
+        * html/parser/HTMLParserScheduler.h:
+        * inspector/InspectorCanvas.cpp:
+        * loader/FrameLoader.cpp:
+        * loader/LoadTiming.cpp:
+        * loader/NavigationScheduler.cpp:
+        * loader/ProgressTracker.cpp:
+        * loader/cache/CachedCSSStyleSheet.cpp:
+        * loader/cache/CachedImage.cpp:
+        * loader/cache/CachedResource.cpp:
+        * loader/cache/MemoryCache.cpp:
+        * page/DOMTimer.cpp:
+        * page/DOMWindow.cpp:
+        * page/DragController.cpp:
+        * page/EventHandler.cpp:
+        * page/FocusController.cpp:
+        * page/FrameView.cpp:
+        * page/Page.cpp:
+        * page/Performance.cpp:
+        * page/PerformanceTiming.cpp:
+        * page/animation/AnimationBase.cpp:
+        * page/animation/CSSAnimationController.cpp:
+        * page/mac/WheelEventDeltaFilterMac.mm:
+        * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
+        * platform/ScrollAnimationKinetic.cpp:
+        * platform/ScrollAnimationSmooth.cpp:
+        * platform/ThreadTimers.cpp:
+        * platform/Timer.cpp:
+        * platform/audio/mac/AudioSampleDataSource.mm:
+        * platform/cocoa/ScrollController.mm:
+        * platform/gamepad/cocoa/GameControllerGamepad.mm:
+        * platform/gamepad/mac/HIDGamepad.cpp:
+        * platform/graphics/BitmapImage.cpp:
+        * platform/graphics/DisplayRefreshMonitorManager.cpp:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        * platform/graphics/ca/LayerPool.cpp:
+        * platform/graphics/ca/PlatformCALayer.h:
+        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+        * platform/graphics/ca/win/CACFLayerTreeHost.cpp:
+        * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+        * platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp:
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        * platform/graphics/cocoa/WebCoreDecompressionSession.mm:
+        * platform/graphics/ios/DisplayRefreshMonitorIOS.mm:
+        * platform/graphics/mac/DisplayRefreshMonitorMac.cpp:
+        * platform/graphics/texmap/BitmapTexturePool.h:
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+        * platform/graphics/texmap/TextureMapper.cpp:
+        * platform/graphics/texmap/TextureMapperAnimation.cpp:
+        * platform/graphics/texmap/TextureMapperFPSCounter.cpp:
+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+        * platform/graphics/win/GraphicsContextDirect2D.cpp:
+        * platform/graphics/win/GraphicsLayerDirect2D.cpp:
+        * platform/gtk/PlatformKeyboardEventGtk.cpp:
+        * platform/gtk/ScrollAnimatorGtk.cpp:
+        * platform/ios/LegacyTileCache.mm:
+        * platform/ios/LegacyTileLayerPool.mm:
+        * platform/ios/ScrollViewIOS.mm:
+        * platform/mediastream/RealtimeOutgoingVideoSource.cpp:
+        * platform/mediastream/mac/DisplayCaptureSourceCocoa.cpp:
+        * platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm:
+        * platform/mock/MockRealtimeMediaSource.cpp:
+        * platform/mock/MockRealtimeVideoSource.cpp:
+        * platform/network/CacheValidation.cpp:
+        * platform/network/DNSResolveQueue.cpp:
+        * platform/network/ResourceResponseBase.cpp:
+        * platform/network/curl/CurlCacheEntry.cpp:
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        * platform/text/TextEncodingRegistry.cpp:
+        * platform/text/win/LocaleWin.cpp:
+        * platform/win/MainThreadSharedTimerWin.cpp:
+        * platform/win/PlatformMouseEventWin.cpp:
+        * rendering/RenderLayerCompositor.cpp:
+        * rendering/RenderProgress.cpp:
+        * svg/animation/SMILTimeContainer.cpp:
+        * testing/MockGamepad.cpp:
+        * workers/WorkerRunLoop.cpp:
+
 2018-03-04  Tim Horton  <timothy_horton@apple.com>
 
         Make !ENABLE(DATA_DETECTION) iOS build actually succeed
 2018-03-04  Tim Horton  <timothy_horton@apple.com>
 
         Make !ENABLE(DATA_DETECTION) iOS build actually succeed
index 68f5a81..dcbf703 100644 (file)
@@ -42,7 +42,6 @@
 #include "PositionError.h"
 #include "RuntimeApplicationChecks.h"
 #include "SecurityOrigin.h"
 #include "PositionError.h"
 #include "RuntimeApplicationChecks.h"
 #include "SecurityOrigin.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/Ref.h>
 #include <wtf/text/StringBuilder.h>
 
 #include <wtf/Ref.h>
 #include <wtf/text/StringBuilder.h>
 
index 800a282..dbbacfb 100644 (file)
@@ -56,7 +56,6 @@
 #include <JavaScriptCore/VM.h>
 #include <limits>
 #include <map>
 #include <JavaScriptCore/VM.h>
 #include <limits>
 #include <map>
-#include <wtf/CurrentTime.h>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index 490aa4f..e976fcd 100644 (file)
@@ -51,7 +51,6 @@
 #include <webrtc/p2p/base/basicpacketsocketfactory.h>
 #include <webrtc/p2p/client/basicportallocator.h>
 #include <webrtc/pc/peerconnectionfactory.h>
 #include <webrtc/p2p/base/basicpacketsocketfactory.h>
 #include <webrtc/p2p/client/basicportallocator.h>
 #include <webrtc/pc/peerconnectionfactory.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/MainThread.h>
 
 namespace WebCore {
 #include <wtf/MainThread.h>
 
 namespace WebCore {
index 0ae4f27..20d345e 100644 (file)
@@ -34,7 +34,6 @@
 #include "SpeechSynthesisEvent.h"
 #include "SpeechSynthesisUtterance.h"
 #include "UserGestureIndicator.h"
 #include "SpeechSynthesisEvent.h"
 #include "SpeechSynthesisUtterance.h"
 #include "UserGestureIndicator.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
 #include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
index 5d852e4..13ad88f 100644 (file)
@@ -1,3 +1,14 @@
+2018-03-04  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [WTF] Move currentCPUTime and sleep(Seconds) to CPUTime.h and Seconds.h respectively
+        https://bugs.webkit.org/show_bug.cgi?id=183312
+
+        Reviewed by Mark Lam.
+
+        Remove wtf/CurrentTime.h include pragma.
+
+        * pal/system/ClockGeneric.cpp:
+
 2018-03-04  Tim Horton  <timothy_horton@apple.com>
 
         Make !ENABLE(DATA_DETECTION) iOS build actually succeed
 2018-03-04  Tim Horton  <timothy_horton@apple.com>
 
         Make !ENABLE(DATA_DETECTION) iOS build actually succeed
index 1c8ccf9..3153168 100644 (file)
@@ -27,7 +27,6 @@
 #include "config.h"
 #include "ClockGeneric.h"
 
 #include "config.h"
 #include "ClockGeneric.h"
 
-#include <wtf/CurrentTime.h>
 
 namespace PAL {
 
 
 namespace PAL {
 
index 42db31d..5e035a6 100644 (file)
@@ -40,7 +40,6 @@
 #include "NFA.h"
 #include "NFAToDFA.h"
 #include "URLFilterParser.h"
 #include "NFA.h"
 #include "NFAToDFA.h"
 #include "URLFilterParser.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/DataLog.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/DataLog.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
index 5f8f9f0..e7c361f 100644 (file)
@@ -39,7 +39,6 @@
 #include <JavaScriptCore/JSGlobalObject.h>
 #include <JavaScriptCore/JSONObject.h>
 #include <JavaScriptCore/VM.h>
 #include <JavaScriptCore/JSGlobalObject.h>
 #include <JavaScriptCore/JSONObject.h>
 #include <JavaScriptCore/VM.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/Expected.h>
 #include <wtf/text/WTFString.h>
 
 #include <wtf/Expected.h>
 #include <wtf/text/WTFString.h>
 
index 23020b4..f860b6f 100644 (file)
 #include <JavaScriptCore/ScriptCallStack.h>
 #include <JavaScriptCore/VM.h>
 #include <ctime>
 #include <JavaScriptCore/ScriptCallStack.h>
 #include <JavaScriptCore/VM.h>
 #include <ctime>
-#include <wtf/CurrentTime.h>
 #include <wtf/Language.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/SetForScope.h>
 #include <wtf/Language.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/SetForScope.h>
index 70c18c4..874062c 100644 (file)
 #include "XMLNSNames.h"
 #include "XMLNames.h"
 #include "markup.h"
 #include "XMLNSNames.h"
 #include "XMLNames.h"
 #include "markup.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/text/CString.h>
 
 #include <wtf/NeverDestroyed.h>
 #include <wtf/text/CString.h>
 
index 6907abf..88c4381 100644 (file)
@@ -31,7 +31,6 @@
 #include "Performance.h"
 #include "UserGestureIndicator.h"
 #include "WorkerGlobalScope.h"
 #include "Performance.h"
 #include "UserGestureIndicator.h"
 #include "WorkerGlobalScope.h"
-#include <wtf/CurrentTime.h>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index 94f4c1b..59be70f 100644 (file)
@@ -41,7 +41,6 @@
 #include "RequestAnimationFrameCallback.h"
 #include "Settings.h"
 #include <algorithm>
 #include "RequestAnimationFrameCallback.h"
 #include "Settings.h"
 #include <algorithm>
-#include <wtf/CurrentTime.h>
 #include <wtf/Ref.h>
 #include <wtf/SystemTracing.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/Ref.h>
 #include <wtf/SystemTracing.h>
 #include <wtf/text/StringBuilder.h>
index ec6d947..e0f4e35 100644 (file)
@@ -31,7 +31,6 @@
 #include "Element.h"
 #include "EventNames.h"
 #include "MouseEvent.h"
 #include "Element.h"
 #include "EventNames.h"
 #include "MouseEvent.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
 #include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
index ad10bdc..e695aa5 100644 (file)
@@ -31,7 +31,6 @@
 #include "FileSystem.h"
 #include "MIMETypeRegistry.h"
 #include "ThreadableBlobRegistry.h"
 #include "FileSystem.h"
 #include "MIMETypeRegistry.h"
 #include "ThreadableBlobRegistry.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/DateMath.h>
 #include <wtf/text/WTFString.h>
 
 #include <wtf/DateMath.h>
 #include <wtf/text/WTFString.h>
 
index 35fa96f..b5fcf62 100644 (file)
@@ -37,7 +37,6 @@
 #include "ProgressEvent.h"
 #include "ScriptExecutionContext.h"
 #include <JavaScriptCore/ArrayBuffer.h>
 #include "ProgressEvent.h"
 #include "ScriptExecutionContext.h"
 #include <JavaScriptCore/ArrayBuffer.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/text/CString.h>
 
 namespace WebCore {
 #include <wtf/text/CString.h>
 
 namespace WebCore {
index d96f5dd..b3fb502 100644 (file)
@@ -40,7 +40,6 @@
 #include "ScriptDisallowedScope.h"
 #include "Settings.h"
 #include "VisitedLinkState.h"
 #include "ScriptDisallowedScope.h"
 #include "Settings.h"
 #include "VisitedLinkState.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/RefCountedLeakCounter.h>
 #include <wtf/StdLibExtras.h>
 
 #include <wtf/RefCountedLeakCounter.h>
 #include <wtf/StdLibExtras.h>
 
index da0cb04..37fc2fe 100644 (file)
@@ -39,7 +39,6 @@
 #include "KeyboardEvent.h"
 #include "PlatformLocale.h"
 #include <limits>
 #include "KeyboardEvent.h"
 #include "PlatformLocale.h"
 #include <limits>
-#include <wtf/CurrentTime.h>
 #include <wtf/DateMath.h>
 #include <wtf/MathExtras.h>
 #include <wtf/text/StringView.h>
 #include <wtf/DateMath.h>
 #include <wtf/MathExtras.h>
 #include <wtf/text/StringView.h>
index b2fc016..291ff83 100644 (file)
@@ -35,7 +35,6 @@
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
 #include "InputTypeNames.h"
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
 #include "InputTypeNames.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
 #include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
index 40922a9..1f437b9 100644 (file)
@@ -92,7 +92,6 @@
 #include <pal/SessionID.h>
 #include <pal/system/SleepDisabler.h>
 #include <wtf/Algorithms.h>
 #include <pal/SessionID.h>
 #include <pal/system/SleepDisabler.h>
 #include <wtf/Algorithms.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/Language.h>
 #include <wtf/MathExtras.h>
 #include <wtf/MemoryPressureHandler.h>
 #include <wtf/Language.h>
 #include <wtf/MathExtras.h>
 #include <wtf/MemoryPressureHandler.h>
index 4cb2f35..3dd62df 100644 (file)
@@ -32,7 +32,6 @@
 #include "HTMLMediaElement.h"
 #include "TimeRanges.h"
 #include <pal/system/Clock.h>
 #include "HTMLMediaElement.h"
 #include "TimeRanges.h"
 #include <pal/system/Clock.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/AtomicString.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/AtomicString.h>
index 8e4e9ee..a22a01e 100644 (file)
@@ -47,7 +47,6 @@
 #include "ScriptController.h"
 #include "Settings.h"
 #include "SourceBuffer.h"
 #include "ScriptController.h"
 #include "Settings.h"
 #include "SourceBuffer.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/text/StringBuilder.h>
 
 #if PLATFORM(IOS)
 #include <wtf/text/StringBuilder.h>
 
 #if PLATFORM(IOS)
index 57f668c..22eeada 100644 (file)
@@ -35,7 +35,6 @@
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
 #include "InputTypeNames.h"
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
 #include "InputTypeNames.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/DateMath.h>
 #include <wtf/MathExtras.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/DateMath.h>
 #include <wtf/MathExtras.h>
 #include <wtf/NeverDestroyed.h>
index 8db942d..4fa481d 100644 (file)
@@ -35,7 +35,6 @@
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
 #include "InputTypeNames.h"
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
 #include "InputTypeNames.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/DateMath.h>
 #include <wtf/MathExtras.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/DateMath.h>
 #include <wtf/MathExtras.h>
 #include <wtf/NeverDestroyed.h>
index 8f446a5..b5934ce 100644 (file)
@@ -27,7 +27,6 @@
 
 #include "NestingLevelIncrementer.h"
 #include "Timer.h"
 
 #include "NestingLevelIncrementer.h"
 #include "Timer.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/RefPtr.h>
 
 #if PLATFORM(IOS)
 #include <wtf/RefPtr.h>
 
 #if PLATFORM(IOS)
index 4ba64da..893eeaa 100644 (file)
@@ -70,7 +70,6 @@
 #include <JavaScriptCore/IdentifiersFactory.h>
 #include <JavaScriptCore/ScriptCallStack.h>
 #include <JavaScriptCore/ScriptCallStackFactory.h>
 #include <JavaScriptCore/IdentifiersFactory.h>
 #include <JavaScriptCore/ScriptCallStack.h>
 #include <JavaScriptCore/ScriptCallStackFactory.h>
-#include <wtf/CurrentTime.h>
 
 
 namespace WebCore {
 
 
 namespace WebCore {
index af33f8f..ce8420a 100644 (file)
 #include "WindowFeatures.h"
 #include "XMLDocumentParser.h"
 #include <wtf/CompletionHandler.h>
 #include "WindowFeatures.h"
 #include "XMLDocumentParser.h"
 #include <wtf/CompletionHandler.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/Ref.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/SystemTracing.h>
 #include <wtf/Ref.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/SystemTracing.h>
index feb0a9b..a740c1f 100644 (file)
@@ -30,7 +30,6 @@
 #include "DocumentLoader.h"
 #include "Frame.h"
 #include "SecurityOrigin.h"
 #include "DocumentLoader.h"
 #include "Frame.h"
 #include "SecurityOrigin.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
index 46d59d1..1acdc46 100644 (file)
@@ -53,7 +53,6 @@
 #include "PolicyChecker.h"
 #include "ScriptController.h"
 #include "UserGestureIndicator.h"
 #include "PolicyChecker.h"
 #include "ScriptController.h"
 #include "UserGestureIndicator.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/Ref.h>
 
 namespace WebCore {
 #include <wtf/Ref.h>
 
 namespace WebCore {
index 5a297ed..f1886bc 100644 (file)
@@ -37,7 +37,6 @@
 #include "ProgressTrackerClient.h"
 #include "ResourceResponse.h"
 #include <wtf/text/CString.h>
 #include "ProgressTrackerClient.h"
 #include "ResourceResponse.h"
 #include <wtf/text/CString.h>
-#include <wtf/CurrentTime.h>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index 046e534..a9483a8 100644 (file)
@@ -34,7 +34,6 @@
 #include "SharedBuffer.h"
 #include "StyleSheetContents.h"
 #include "TextResourceDecoder.h"
 #include "SharedBuffer.h"
 #include "StyleSheetContents.h"
 #include "TextResourceDecoder.h"
-#include <wtf/CurrentTime.h>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index c266a45..bc530c1 100644 (file)
@@ -42,7 +42,6 @@
 #include "Settings.h"
 #include "SharedBuffer.h"
 #include "SubresourceLoader.h"
 #include "Settings.h"
 #include "SharedBuffer.h"
 #include "SubresourceLoader.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/StdLibExtras.h>
 
 #include <wtf/NeverDestroyed.h>
 #include <wtf/StdLibExtras.h>
 
index 71aef83..3122c1d 100644 (file)
@@ -49,7 +49,6 @@
 #include "SubresourceLoader.h"
 #include "URL.h"
 #include <wtf/CompletionHandler.h>
 #include "SubresourceLoader.h"
 #include "URL.h"
 #include <wtf/CompletionHandler.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/MathExtras.h>
 #include <wtf/RefCountedLeakCounter.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/MathExtras.h>
 #include <wtf/RefCountedLeakCounter.h>
 #include <wtf/StdLibExtras.h>
index f675aca..8c486b3 100644 (file)
@@ -40,7 +40,6 @@
 #include "WorkerLoaderProxy.h"
 #include "WorkerThread.h"
 #include <stdio.h>
 #include "WorkerLoaderProxy.h"
 #include "WorkerThread.h"
 #include <stdio.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/MathExtras.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/SetForScope.h>
 #include <wtf/MathExtras.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/SetForScope.h>
index 84a62c0..021ce79 100644 (file)
@@ -35,7 +35,6 @@
 #include "ScheduledAction.h"
 #include "ScriptExecutionContext.h"
 #include "Settings.h"
 #include "ScheduledAction.h"
 #include "ScriptExecutionContext.h"
 #include "Settings.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/HashMap.h>
 #include <wtf/MathExtras.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/HashMap.h>
 #include <wtf/MathExtras.h>
 #include <wtf/NeverDestroyed.h>
index 68be864..a62e200 100644 (file)
 #include <JavaScriptCore/ScriptCallStackFactory.h>
 #include <algorithm>
 #include <memory>
 #include <JavaScriptCore/ScriptCallStackFactory.h>
 #include <algorithm>
 #include <memory>
-#include <wtf/CurrentTime.h>
 #include <wtf/Language.h>
 #include <wtf/MainThread.h>
 #include <wtf/MathExtras.h>
 #include <wtf/Language.h>
 #include <wtf/MainThread.h>
 #include <wtf/MathExtras.h>
index 8360050..5275425 100644 (file)
@@ -89,7 +89,6 @@
 #include "SelectionRect.h"
 #endif
 
 #include "SelectionRect.h"
 #endif
 
-#include <wtf/CurrentTime.h>
 #include <wtf/RefPtr.h>
 #include <wtf/SetForScope.h>
 #endif
 #include <wtf/RefPtr.h>
 #include <wtf/SetForScope.h>
 #endif
index 133579c..84a3ed8 100644 (file)
@@ -99,7 +99,6 @@
 #include "WheelEventDeltaFilter.h"
 #include "WindowsKeyboardCodes.h"
 #include <wtf/Assertions.h>
 #include "WheelEventDeltaFilter.h"
 #include "WindowsKeyboardCodes.h"
 #include <wtf/Assertions.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/StdLibExtras.h>
 
 #include <wtf/NeverDestroyed.h>
 #include <wtf/StdLibExtras.h>
 
index effc736..1691a07 100644 (file)
@@ -60,7 +60,6 @@
 #include "SpatialNavigation.h"
 #include "Widget.h"
 #include <limits>
 #include "SpatialNavigation.h"
 #include "Widget.h"
 #include <limits>
-#include <wtf/CurrentTime.h>
 #include <wtf/Ref.h>
 
 namespace WebCore {
 #include <wtf/Ref.h>
 
 namespace WebCore {
index e3439b5..1bc8fd3 100644 (file)
@@ -98,7 +98,6 @@
 #include "WheelEventTestTrigger.h"
 #include <wtf/text/TextStream.h>
 
 #include "WheelEventTestTrigger.h"
 #include <wtf/text/TextStream.h>
 
-#include <wtf/CurrentTime.h>
 #include <wtf/IsoMallocInlines.h>
 #include <wtf/MemoryPressureHandler.h>
 #include <wtf/Ref.h>
 #include <wtf/IsoMallocInlines.h>
 #include <wtf/MemoryPressureHandler.h>
 #include <wtf/Ref.h>
index 7a1dc6e..aa8bdb8 100644 (file)
 #include "VoidCallback.h"
 #include "WebGLStateTracker.h"
 #include "Widget.h"
 #include "VoidCallback.h"
 #include "WebGLStateTracker.h"
 #include "Widget.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/RefCountedLeakCounter.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/Base64.h>
 #include <wtf/RefCountedLeakCounter.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/Base64.h>
index 4ea29c1..2bf387e 100644 (file)
@@ -46,7 +46,6 @@
 #include "PerformanceUserTiming.h"
 #include "ResourceResponse.h"
 #include "ScriptExecutionContext.h"
 #include "PerformanceUserTiming.h"
 #include "ResourceResponse.h"
 #include "ScriptExecutionContext.h"
-#include <wtf/CurrentTime.h>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index 05fcc6e..f313616 100644 (file)
@@ -40,7 +40,6 @@
 #include "NetworkLoadMetrics.h"
 #include "Performance.h"
 #include "ResourceResponse.h"
 #include "NetworkLoadMetrics.h"
 #include "Performance.h"
 #include "ResourceResponse.h"
-#include <wtf/CurrentTime.h>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index ffe862f..73800a9 100644 (file)
@@ -41,7 +41,6 @@
 #include "RenderStyle.h"
 #include "RenderView.h"
 #include <algorithm>
 #include "RenderStyle.h"
 #include "RenderView.h"
 #include <algorithm>
-#include <wtf/CurrentTime.h>
 #include <wtf/Ref.h>
 
 namespace WebCore {
 #include <wtf/Ref.h>
 
 namespace WebCore {
index 9424762..1e90fa5 100644 (file)
@@ -44,7 +44,6 @@
 #include "TransitionEvent.h"
 #include "WebKitAnimationEvent.h"
 #include "WebKitTransitionEvent.h"
 #include "TransitionEvent.h"
 #include "WebKitAnimationEvent.h"
 #include "WebKitTransitionEvent.h"
-#include <wtf/CurrentTime.h>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index 664c8a9..c822fdd 100644 (file)
@@ -30,7 +30,6 @@
 
 #import "FloatPoint.h"
 #import <pal/spi/mac/NSScrollingInputFilterSPI.h>
 
 #import "FloatPoint.h"
 #import <pal/spi/mac/NSScrollingInputFilterSPI.h>
-#import <wtf/CurrentTime.h>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index 0a1c72c..243196c 100644 (file)
@@ -42,7 +42,6 @@
 #import <wtf/text/TextStream.h>
 
 #import <QuartzCore/QuartzCore.h>
 #import <wtf/text/TextStream.h>
 
 #import <QuartzCore/QuartzCore.h>
-#import <wtf/CurrentTime.h>
 #import <wtf/Deque.h>
 #import <wtf/text/CString.h>
 
 #import <wtf/Deque.h>
 #import <wtf/text/CString.h>
 
index 7f93653..ab47793 100644 (file)
@@ -27,7 +27,6 @@
 #include "ScrollAnimationKinetic.h"
 
 #include "ScrollableArea.h"
 #include "ScrollAnimationKinetic.h"
 
 #include "ScrollableArea.h"
-#include <wtf/CurrentTime.h>
 
 /*
  * PerAxisData is a port of GtkKineticScrolling as of GTK+ 3.20,
 
 /*
  * PerAxisData is a port of GtkKineticScrolling as of GTK+ 3.20,
index 0e176f5..d064e69 100644 (file)
@@ -32,7 +32,6 @@
 
 #include "FloatPoint.h"
 #include "ScrollableArea.h"
 
 #include "FloatPoint.h"
 #include "ScrollableArea.h"
-#include <wtf/CurrentTime.h>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index f665534..2740404 100644 (file)
@@ -31,7 +31,6 @@
 #include "SharedTimer.h"
 #include "ThreadGlobalData.h"
 #include "Timer.h"
 #include "SharedTimer.h"
 #include "ThreadGlobalData.h"
 #include "Timer.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/MainThread.h>
 
 #if PLATFORM(IOS)
 #include <wtf/MainThread.h>
 
 #if PLATFORM(IOS)
index b3efc9e..43a5920 100644 (file)
@@ -33,7 +33,6 @@
 #include <limits.h>
 #include <limits>
 #include <math.h>
 #include <limits.h>
 #include <limits>
 #include <math.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/MainThread.h>
 #include <wtf/Vector.h>
 
 #include <wtf/MainThread.h>
 #include <wtf/Vector.h>
 
index 9a4752b..274be72 100644 (file)
@@ -37,7 +37,6 @@
 #include <mutex>
 #include <pal/avfoundation/MediaTimeAVFoundation.h>
 #include <syslog.h>
 #include <mutex>
 #include <pal/avfoundation/MediaTimeAVFoundation.h>
 #include <syslog.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/StringPrintStream.h>
 
 #include <pal/cf/CoreMediaSoftLink.h>
 #include <wtf/StringPrintStream.h>
 
 #include <pal/cf/CoreMediaSoftLink.h>
index 01a89a5..e8369c6 100644 (file)
@@ -31,7 +31,6 @@
 #import "WheelEventTestTrigger.h"
 #import <sys/sysctl.h>
 #import <sys/time.h>
 #import "WheelEventTestTrigger.h"
 #import <sys/sysctl.h>
 #import <sys/time.h>
-#import <wtf/CurrentTime.h>
 
 #if ENABLE(CSS_SCROLL_SNAP)
 #import "ScrollSnapAnimatorState.h"
 
 #if ENABLE(CSS_SCROLL_SNAP)
 #import "ScrollSnapAnimatorState.h"
index df0e8f3..e3111aa 100644 (file)
@@ -28,7 +28,6 @@
 #if ENABLE(GAMEPAD) && (defined(__LP64__) || PLATFORM(IOS))
 #include "GameControllerGamepadProvider.h"
 #include <GameController/GameController.h>
 #if ENABLE(GAMEPAD) && (defined(__LP64__) || PLATFORM(IOS))
 #include "GameControllerGamepadProvider.h"
 #include <GameController/GameController.h>
-#include <wtf/CurrentTime.h>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index d8f47c9..7c1ee8f 100644 (file)
@@ -31,7 +31,6 @@
 #include <IOKit/hid/IOHIDElement.h>
 #include <IOKit/hid/IOHIDUsageTables.h>
 #include <IOKit/hid/IOHIDValue.h>
 #include <IOKit/hid/IOHIDElement.h>
 #include <IOKit/hid/IOHIDUsageTables.h>
 #include <IOKit/hid/IOHIDValue.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/cf/TypeCastsCF.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 #include <wtf/cf/TypeCastsCF.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
index a14a9bc..0e6dc15 100644 (file)
@@ -35,7 +35,6 @@
 #include "Logging.h"
 #include "Settings.h"
 #include "Timer.h"
 #include "Logging.h"
 #include "Settings.h"
 #include "Timer.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/Vector.h>
 #include <wtf/text/TextStream.h>
 #include <wtf/text/WTFString.h>
 #include <wtf/Vector.h>
 #include <wtf/text/TextStream.h>
 #include <wtf/text/WTFString.h>
index f828dc5..c93984d 100644 (file)
@@ -31,7 +31,6 @@
 #include "DisplayRefreshMonitor.h"
 #include "DisplayRefreshMonitorClient.h"
 #include "Logging.h"
 #include "DisplayRefreshMonitor.h"
 #include "DisplayRefreshMonitorClient.h"
 #include "Logging.h"
-#include <wtf/CurrentTime.h>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index 1c275e8..7bc7ca0 100644 (file)
@@ -78,7 +78,6 @@
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <pal/spi/mac/AVFoundationSPI.h>
 #import <wtf/BlockObjCExceptions.h>
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <pal/spi/mac/AVFoundationSPI.h>
 #import <wtf/BlockObjCExceptions.h>
-#import <wtf/CurrentTime.h>
 #import <wtf/ListHashSet.h>
 #import <wtf/NeverDestroyed.h>
 #import <wtf/OSObjectPtr.h>
 #import <wtf/ListHashSet.h>
 #import <wtf/NeverDestroyed.h>
 #import <wtf/OSObjectPtr.h>
index 94b47e0..b28bf58 100644 (file)
@@ -47,7 +47,6 @@
 #include <QuartzCore/CATransform3D.h>
 #include <limits.h>
 #include <pal/spi/cf/CFUtilitiesSPI.h>
 #include <QuartzCore/CATransform3D.h>
 #include <limits.h>
 #include <pal/spi/cf/CFUtilitiesSPI.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/MathExtras.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/SetForScope.h>
 #include <wtf/MathExtras.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/SetForScope.h>
index 33e3bea..c22d3d7 100644 (file)
@@ -27,7 +27,6 @@
 #include "LayerPool.h"
 
 #include "Logging.h"
 #include "LayerPool.h"
 
 #include "Logging.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
 #include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
index 3a99f8d..744662b 100644 (file)
@@ -28,7 +28,6 @@
 #include "FloatRoundedRect.h"
 #include "GraphicsLayer.h"
 #include <QuartzCore/CABase.h>
 #include "FloatRoundedRect.h"
 #include "GraphicsLayer.h"
 #include <QuartzCore/CABase.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/TypeCasts.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/TypeCasts.h>
index 6c398f4..36e71bf 100644 (file)
@@ -51,7 +51,6 @@
 #import <QuartzCore/QuartzCore.h>
 #import <objc/runtime.h>
 #import <wtf/BlockObjCExceptions.h>
 #import <QuartzCore/QuartzCore.h>
 #import <objc/runtime.h>
 #import <wtf/BlockObjCExceptions.h>
-#import <wtf/CurrentTime.h>
 #import <wtf/RetainPtr.h>
 
 #if PLATFORM(IOS)
 #import <wtf/RetainPtr.h>
 
 #if PLATFORM(IOS)
index f2160e9..1504581 100644 (file)
@@ -42,7 +42,6 @@
 #include "WebCoreInstanceHandle.h"
 #include <limits.h>
 #include <QuartzCore/CABase.h>
 #include "WebCoreInstanceHandle.h"
 #include <limits.h>
 #include <QuartzCore/CABase.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/win/GDIObject.h>
 
 #include <wtf/StdLibExtras.h>
 #include <wtf/win/GDIObject.h>
 
index d680ec9..c000b43 100644 (file)
@@ -40,7 +40,6 @@
 #include "WebTiledBackingLayerWin.h"
 #include <QuartzCore/CoreAnimationCF.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #include "WebTiledBackingLayerWin.h"
 #include <QuartzCore/CoreAnimationCF.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 
index 9e71780..7d1b095 100644 (file)
@@ -31,7 +31,6 @@
 #include "GDIUtilities.h"
 #include "PlatformCALayer.h"
 #include <QuartzCore/CACFLayer.h>
 #include "GDIUtilities.h"
 #include "PlatformCALayer.h"
 #include <QuartzCore/CACFLayer.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/MainThread.h>
 #include <wtf/SoftLinking.h>
 
 #include <wtf/MainThread.h>
 #include <wtf/SoftLinking.h>
 
index 2cb2300..895c90e 100644 (file)
@@ -43,7 +43,6 @@
 #include "Timer.h"
 #include "URL.h"
 #include <pal/spi/cg/CoreGraphicsSPI.h>
 #include "Timer.h"
 #include "URL.h"
 #include <pal/spi/cg/CoreGraphicsSPI.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/MathExtras.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/text/TextStream.h>
 #include <wtf/MathExtras.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/text/TextStream.h>
index 53595e2..3abcbdc 100644 (file)
@@ -33,7 +33,6 @@
 #import <CoreMedia/CMBufferQueue.h>
 #import <CoreMedia/CMFormatDescription.h>
 #import <pal/avfoundation/MediaTimeAVFoundation.h>
 #import <CoreMedia/CMBufferQueue.h>
 #import <CoreMedia/CMFormatDescription.h>
 #import <pal/avfoundation/MediaTimeAVFoundation.h>
-#import <wtf/CurrentTime.h>
 #import <wtf/MainThread.h>
 #import <wtf/MediaTime.h>
 #import <wtf/StringPrintStream.h>
 #import <wtf/MainThread.h>
 #import <wtf/MediaTime.h>
 #import <wtf/StringPrintStream.h>
index f49b4ce..39e56c0 100644 (file)
@@ -30,7 +30,6 @@
 
 #import "WebCoreThread.h"
 #import <QuartzCore/QuartzCore.h>
 
 #import "WebCoreThread.h"
 #import <QuartzCore/QuartzCore.h>
-#import <wtf/CurrentTime.h>
 #import <wtf/MainThread.h>
 
 using WebCore::DisplayRefreshMonitorIOS;
 #import <wtf/MainThread.h>
 
 using WebCore::DisplayRefreshMonitorIOS;
index 3b08e18..d93d2b1 100644 (file)
@@ -29,7 +29,6 @@
 #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(MAC)
 
 #include <QuartzCore/QuartzCore.h>
 #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(MAC)
 
 #include <QuartzCore/QuartzCore.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/RunLoop.h>
 
 namespace WebCore {
 #include <wtf/RunLoop.h>
 
 namespace WebCore {
index 515ea2d..396bce1 100644 (file)
@@ -29,7 +29,6 @@
 
 #include "BitmapTexture.h"
 #include "TextureMapperContextAttributes.h"
 
 #include "BitmapTexture.h"
 #include "TextureMapperContextAttributes.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/RunLoop.h>
 
 namespace WebCore {
 #include <wtf/RunLoop.h>
 
 namespace WebCore {
index 3a6d169..03c2cb7 100644 (file)
@@ -24,7 +24,6 @@
 #include "GraphicsLayerFactory.h"
 #include "ImageBuffer.h"
 #include "TextureMapperAnimation.h"
 #include "GraphicsLayerFactory.h"
 #include "ImageBuffer.h"
 #include "TextureMapperAnimation.h"
-#include <wtf/CurrentTime.h>
 
 #if !USE(COORDINATED_GRAPHICS)
 
 
 #if !USE(COORDINATED_GRAPHICS)
 
index 1f9e682..a29ec78 100644 (file)
@@ -24,7 +24,6 @@
 #include "FilterOperations.h"
 #include "GraphicsLayer.h"
 #include "Timer.h"
 #include "FilterOperations.h"
 #include "GraphicsLayer.h"
 #include "Timer.h"
-#include <wtf/CurrentTime.h>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index 38d8dd6..fa51e3e 100644 (file)
@@ -21,7 +21,6 @@
 #include "TextureMapperAnimation.h"
 
 #include "LayoutSize.h"
 #include "TextureMapperAnimation.h"
 
 #include "LayoutSize.h"
-#include <wtf/CurrentTime.h>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index a88d59d..c8cac48 100644 (file)
@@ -24,7 +24,6 @@
 #include "TextureMapperFPSCounter.h"
 
 #include "TextureMapper.h"
 #include "TextureMapperFPSCounter.h"
 
 #include "TextureMapper.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
index c69d761..c37f6b3 100644 (file)
@@ -33,7 +33,6 @@
 #include "NicosiaPaintingEngine.h"
 #include "ScrollableArea.h"
 #include "TextureMapperPlatformLayerProxyProvider.h"
 #include "NicosiaPaintingEngine.h"
 #include "ScrollableArea.h"
 #include "TextureMapperPlatformLayerProxyProvider.h"
-#include <wtf/CurrentTime.h>
 #ifndef NDEBUG
 #include <wtf/SetForScope.h>
 #endif
 #ifndef NDEBUG
 #include <wtf/SetForScope.h>
 #endif
index 010bfb3..e40dcd4 100644 (file)
@@ -27,7 +27,6 @@
 #include "GraphicsContext.h"
 
 #include "COMPtr.h"
 #include "GraphicsContext.h"
 
 #include "COMPtr.h"
-#include "CurrentTime.h"
 #include "DisplayListRecorder.h"
 #include "FloatRoundedRect.h"
 #include "GraphicsContextPlatformPrivateDirect2D.h"
 #include "DisplayListRecorder.h"
 #include "FloatRoundedRect.h"
 #include "GraphicsContextPlatformPrivateDirect2D.h"
index 5562239..644fa39 100644 (file)
@@ -32,7 +32,6 @@
 #include "GraphicsLayerFactory.h"
 #include "NotImplemented.h"
 #include <limits.h>
 #include "GraphicsLayerFactory.h"
 #include "NotImplemented.h"
 #include <limits.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/MathExtras.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/SetForScope.h>
 #include <wtf/MathExtras.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/SetForScope.h>
index 23e7c3c..a2c8c32 100644 (file)
@@ -37,7 +37,6 @@
 #include "WindowsKeyboardCodes.h"
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include "WindowsKeyboardCodes.h"
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/glib/GUniquePtr.h>
 
 namespace WebCore {
 #include <wtf/glib/GUniquePtr.h>
 
 namespace WebCore {
index 974c9ab..444fe06 100644 (file)
@@ -35,7 +35,6 @@
 #include "ScrollAnimationSmooth.h"
 #include "ScrollableArea.h"
 #include "ScrollbarTheme.h"
 #include "ScrollAnimationSmooth.h"
 #include "ScrollableArea.h"
 #include "ScrollbarTheme.h"
-#include <wtf/CurrentTime.h>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index b8781de..3a02c15 100644 (file)
@@ -40,7 +40,6 @@
 #include "WebCoreThreadRun.h"
 #include <CoreText/CoreText.h>
 #include <pal/spi/cocoa/QuartzCoreSPI.h>
 #include "WebCoreThreadRun.h"
 #include <CoreText/CoreText.h>
 #include <pal/spi/cocoa/QuartzCoreSPI.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/MemoryPressureHandler.h>
 #include <wtf/RAMSize.h>
 
 #include <wtf/MemoryPressureHandler.h>
 #include <wtf/RAMSize.h>
 
index 250028f..ee0b58b 100644 (file)
@@ -31,7 +31,6 @@
 #include "LegacyTileLayer.h"
 #include "LegacyTileGrid.h"
 #include "Logging.h"
 #include "LegacyTileLayer.h"
 #include "LegacyTileGrid.h"
 #include "Logging.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/MemoryPressureHandler.h>
 #include <wtf/NeverDestroyed.h>
 
 #include <wtf/MemoryPressureHandler.h>
 #include <wtf/NeverDestroyed.h>
 
index b293fee..5408de7 100644 (file)
@@ -40,7 +40,6 @@
 #import "WKViewPrivate.h"
 #import "WebCoreFrameView.h"
 #import <wtf/BlockObjCExceptions.h>
 #import "WKViewPrivate.h"
 #import "WebCoreFrameView.h"
 #import <wtf/BlockObjCExceptions.h>
-#import <wtf/CurrentTime.h>
 
 using namespace std;
 
 
 using namespace std;
 
index 70447f9..084c505 100644 (file)
@@ -34,7 +34,6 @@
 #include "Logging.h"
 #include <webrtc/api/video/i420_buffer.h>
 #include <webrtc/common_video/libyuv/include/webrtc_libyuv.h>
 #include "Logging.h"
 #include <webrtc/api/video/i420_buffer.h>
 #include <webrtc/common_video/libyuv/include/webrtc_libyuv.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/MainThread.h>
 
 namespace WebCore {
 #include <wtf/MainThread.h>
 
 namespace WebCore {
index 2763189..c6360a5 100644 (file)
@@ -39,7 +39,6 @@
 #include <pal/cf/CoreMediaSoftLink.h>
 #include <pal/spi/cf/CoreAudioSPI.h>
 #include <sys/time.h>
 #include <pal/cf/CoreMediaSoftLink.h>
 #include <pal/spi/cf/CoreAudioSPI.h>
 #include <sys/time.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/MainThread.h>
 #include <wtf/NeverDestroyed.h>
 
 #include <wtf/MainThread.h>
 #include <wtf/NeverDestroyed.h>
 
index f433cc5..78aa012 100644 (file)
@@ -36,7 +36,6 @@
 #include "NotImplemented.h"
 #include "PlatformLayer.h"
 #include "RealtimeMediaSourceSettings.h"
 #include "NotImplemented.h"
 #include "PlatformLayer.h"
 #include "RealtimeMediaSourceSettings.h"
-#include <wtf/CurrentTime.h>
 
 #include "CoreVideoSoftLink.h"
 
 
 #include "CoreVideoSoftLink.h"
 
index b72a1b6..e2e8f23 100644 (file)
@@ -39,7 +39,6 @@
 #include "NotImplemented.h"
 #include "RealtimeMediaSourceSettings.h"
 #include <math.h>
 #include "NotImplemented.h"
 #include "RealtimeMediaSourceSettings.h"
 #include <math.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/text/StringView.h>
 
 #include <wtf/NeverDestroyed.h>
 #include <wtf/text/StringView.h>
 
index c405c9e..40aae99 100644 (file)
@@ -43,7 +43,6 @@
 #include "PlatformLayer.h"
 #include "RealtimeMediaSourceSettings.h"
 #include <math.h>
 #include "PlatformLayer.h"
 #include "RealtimeMediaSourceSettings.h"
 #include <math.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/UUID.h>
 #include <wtf/text/StringView.h>
 
 #include <wtf/UUID.h>
 #include <wtf/text/StringView.h>
 
index dc2a57a..1213c31 100644 (file)
@@ -33,7 +33,6 @@
 #include "PlatformStrategies.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "PlatformStrategies.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/text/StringView.h>
 
 namespace WebCore {
 #include <wtf/text/StringView.h>
 
 namespace WebCore {
index 6a01b73..fe3d8c9 100644 (file)
@@ -27,7 +27,6 @@
 #include "config.h"
 #include "DNSResolveQueue.h"
 
 #include "config.h"
 #include "DNSResolveQueue.h"
 
-#include <wtf/CurrentTime.h>
 #include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
 #include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
index f67414d..23932d1 100644 (file)
@@ -33,7 +33,6 @@
 #include "MIMETypeRegistry.h"
 #include "ParsedContentRange.h"
 #include "ResourceResponse.h"
 #include "MIMETypeRegistry.h"
 #include "ParsedContentRange.h"
 #include "ResourceResponse.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/MathExtras.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/StringView.h>
 #include <wtf/MathExtras.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/StringView.h>
index 2d86357..f418bc9 100644 (file)
@@ -40,7 +40,6 @@
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "SharedBuffer.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "SharedBuffer.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/DateMath.h>
 #include <wtf/HexNumber.h>
 #include <wtf/MD5.h>
 #include <wtf/DateMath.h>
 #include <wtf/HexNumber.h>
 #include <wtf/MD5.h>
index da1bdd8..55dd247 100644 (file)
@@ -57,7 +57,6 @@
 #include <unistd.h>
 #endif
 #include <wtf/CompletionHandler.h>
 #include <unistd.h>
 #endif
 #include <wtf/CompletionHandler.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/glib/GRefPtr.h>
 #include <wtf/glib/RunLoopSourcePriority.h>
 #include <wtf/text/CString.h>
 #include <wtf/glib/GRefPtr.h>
 #include <wtf/glib/RunLoopSourcePriority.h>
 #include <wtf/text/CString.h>
index 556dff3..fda3d11 100644 (file)
@@ -37,7 +37,6 @@
 #include <mutex>
 #include <wtf/ASCIICType.h>
 #include <wtf/CheckedArithmetic.h>
 #include <mutex>
 #include <wtf/ASCIICType.h>
 #include <wtf/CheckedArithmetic.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/Lock.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/Lock.h>
index 6a128cc..29fef87 100644 (file)
@@ -36,7 +36,6 @@
 #include "LocalizedStrings.h"
 #include <limits>
 #include <windows.h>
 #include "LocalizedStrings.h"
 #include <limits>
 #include <windows.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/DateMath.h>
 #include <wtf/HashMap.h>
 #include <wtf/Language.h>
 #include <wtf/DateMath.h>
 #include <wtf/HashMap.h>
 #include <wtf/Language.h>
index 4198bfb..7786f64 100644 (file)
@@ -30,7 +30,6 @@
 #include "WebCoreInstanceHandle.h"
 #include "Widget.h"
 #include <wtf/Assertions.h>
 #include "WebCoreInstanceHandle.h"
 #include "Widget.h"
 #include <wtf/Assertions.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/WindowsExtras.h>
 
 #include <mmsystem.h>
 #include <wtf/WindowsExtras.h>
 
 #include <mmsystem.h>
index ea247c9..a50b420 100644 (file)
@@ -30,7 +30,6 @@
 #include "GDIUtilities.h"
 #include "HWndDC.h"
 #include <wtf/Assertions.h>
 #include "GDIUtilities.h"
 #include "HWndDC.h"
 #include <wtf/Assertions.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/MathExtras.h>
 #include <windows.h>
 #include <windowsx.h>
 #include <wtf/MathExtras.h>
 #include <windows.h>
 #include <windowsx.h>
index d906785..5c06c45 100644 (file)
@@ -60,7 +60,6 @@
 #include "Settings.h"
 #include "TiledBacking.h"
 #include "TransformState.h"
 #include "Settings.h"
 #include "TiledBacking.h"
 #include "TransformState.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/SetForScope.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/SetForScope.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
index a5b34f6..81cb433 100644 (file)
@@ -23,7 +23,6 @@
 
 #include "HTMLProgressElement.h"
 #include "RenderTheme.h"
 
 #include "HTMLProgressElement.h"
 #include "RenderTheme.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/IsoMallocInlines.h>
 #include <wtf/RefPtr.h>
 
 #include <wtf/IsoMallocInlines.h>
 #include <wtf/RefPtr.h>
 
index 4156f18..56a46a6 100644 (file)
@@ -31,7 +31,6 @@
 #include "Page.h"
 #include "SVGSMILElement.h"
 #include "SVGSVGElement.h"
 #include "Page.h"
 #include "SVGSMILElement.h"
 #include "SVGSVGElement.h"
-#include <wtf/CurrentTime.h>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index 9fb3346..abbc6ed 100644 (file)
@@ -28,8 +28,6 @@
 
 #if ENABLE(GAMEPAD)
 
 
 #if ENABLE(GAMEPAD)
 
-#include <wtf/CurrentTime.h>
-
 namespace WebCore {
 
 MockGamepad::MockGamepad(unsigned index, const String& gamepadID, unsigned axisCount, unsigned buttonCount)
 namespace WebCore {
 
 MockGamepad::MockGamepad(unsigned index, const String& gamepadID, unsigned axisCount, unsigned buttonCount)
index 56faf7d..f39923d 100644 (file)
@@ -39,7 +39,6 @@
 #include "WorkerGlobalScope.h"
 #include "WorkerThread.h"
 #include <JavaScriptCore/PromiseDeferredTimer.h>
 #include "WorkerGlobalScope.h"
 #include "WorkerThread.h"
 #include <JavaScriptCore/PromiseDeferredTimer.h>
-#include <wtf/CurrentTime.h>
 
 #if USE(GLIB)
 #include <glib.h>
 
 #if USE(GLIB)
 #include <glib.h>
index 2325b54..154e6cb 100644 (file)
@@ -1,3 +1,35 @@
+2018-03-04  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [WTF] Move currentCPUTime and sleep(Seconds) to CPUTime.h and Seconds.h respectively
+        https://bugs.webkit.org/show_bug.cgi?id=183312
+
+        Reviewed by Mark Lam.
+
+        Remove wtf/CurrentTime.h include pragma.
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        * NetworkProcess/cache/CacheStorageEngineCache.cpp:
+        * NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
+        * Platform/IPC/Connection.cpp:
+        * Platform/unix/SharedMemoryUnix.cpp:
+        * PluginProcess/WebProcessConnection.cpp:
+        * Shared/ios/NativeWebTouchEventIOS.mm:
+        * UIProcess/DrawingAreaProxyImpl.cpp:
+        * UIProcess/ios/WKContentView.mm:
+        * UIProcess/linux/MemoryPressureMonitor.cpp:
+        * WebProcess/Gamepad/WebGamepad.cpp:
+        * WebProcess/Plugins/PDF/PDFPlugin.mm:
+        * WebProcess/WebCoreSupport/WebInspectorClient.cpp:
+        * WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm:
+        * WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemote.cpp:
+        * WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDisplayRefreshMonitor.mm:
+        * WebProcess/WebPage/WebURLSchemeTaskProxy.cpp:
+        * WebProcess/WebProcess.cpp:
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        * WebProcess/gtk/WebProcessMainGtk.cpp:
+        * WebProcess/win/WebProcessMainWin.cpp:
+        * WebProcess/wpe/WebProcessMainWPE.cpp:
+
 2018-03-02  Brian Burg  <bburg@apple.com>
 
         Web Automation: script evaluations via WebDriver should have a user gesture indicator
 2018-03-02  Brian Burg  <bburg@apple.com>
 
         Web Automation: script evaluations via WebDriver should have a user gesture indicator
index 9889b7f..1f45d7b 100644 (file)
@@ -47,7 +47,6 @@
 #include <WebCore/ProtectionSpace.h>
 #include <WebCore/SharedBuffer.h>
 #include <WebCore/SynchronousLoaderClient.h>
 #include <WebCore/ProtectionSpace.h>
 #include <WebCore/SharedBuffer.h>
 #include <WebCore/SynchronousLoaderClient.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/RunLoop.h>
 
 #if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
 #include <wtf/RunLoop.h>
 
 #if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
index 6e1f642..d7ed89a 100644 (file)
@@ -34,7 +34,6 @@
 #include <WebCore/CacheQueryOptions.h>
 #include <WebCore/HTTPParsers.h>
 #include <pal/SessionID.h>
 #include <WebCore/CacheQueryOptions.h>
 #include <WebCore/HTTPParsers.h>
 #include <pal/SessionID.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/MainThread.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/UUID.h>
 #include <wtf/MainThread.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/UUID.h>
index 31ec94d..166c9eb 100644 (file)
@@ -34,7 +34,6 @@
 #include "NetworkSession.h"
 #include "SessionTracker.h"
 #include <pal/SessionID.h>
 #include "NetworkSession.h"
 #include "SessionTracker.h"
 #include <pal/SessionID.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/RunLoop.h>
 
 namespace WebKit {
 #include <wtf/RunLoop.h>
 
 namespace WebKit {
index 57eb370..9e27540 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "Logging.h"
 #include <memory>
 
 #include "Logging.h"
 #include <memory>
-#include <wtf/CurrentTime.h>
 #include <wtf/HashSet.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/RunLoop.h>
 #include <wtf/HashSet.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/RunLoop.h>
index da35560..713dc35 100644 (file)
@@ -39,7 +39,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <wtf/Assertions.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <wtf/Assertions.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/RandomNumber.h>
 #include <wtf/UniStdExtras.h>
 #include <wtf/text/CString.h>
 #include <wtf/RandomNumber.h>
 #include <wtf/UniStdExtras.h>
 #include <wtf/text/CString.h>
index 9b9df29..a0a2c24 100644 (file)
@@ -38,7 +38,6 @@
 #include "PluginProcessConnectionMessages.h"
 #include "PluginProxyMessages.h"
 #include "WebProcessConnectionMessages.h"
 #include "PluginProcessConnectionMessages.h"
 #include "PluginProxyMessages.h"
 #include "WebProcessConnectionMessages.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/SetForScope.h>
 
 #if !OS(WINDOWS)
 #include <wtf/SetForScope.h>
 
 #if !OS(WINDOWS)
index 7fc777e..d2fd058 100644 (file)
@@ -33,7 +33,6 @@
 #import <UIKit/UITouch.h>
 #import <WebCore/IntPoint.h>
 #import <WebCore/WAKAppKitStubs.h>
 #import <UIKit/UITouch.h>
 #import <WebCore/IntPoint.h>
 #import <WebCore/WAKAppKitStubs.h>
-#import <wtf/CurrentTime.h>
 
 namespace WebKit {
 
 
 namespace WebKit {
 
index e002411..573d32a 100644 (file)
@@ -35,7 +35,6 @@
 #include "WebPreferences.h"
 #include "WebProcessProxy.h"
 #include <WebCore/Region.h>
 #include "WebPreferences.h"
 #include "WebProcessProxy.h"
 #include <WebCore/Region.h>
-#include <wtf/CurrentTime.h>
 
 #if PLATFORM(GTK)
 #include <gtk/gtk.h>
 
 #if PLATFORM(GTK)
 #include <gtk/gtk.h>
index db902b4..1009b4f 100644 (file)
@@ -60,7 +60,6 @@
 #import <WebCore/NotImplemented.h>
 #import <WebCore/PlatformScreen.h>
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <WebCore/NotImplemented.h>
 #import <WebCore/PlatformScreen.h>
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
-#import <wtf/CurrentTime.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/text/TextStream.h>
 
 #import <wtf/RetainPtr.h>
 #import <wtf/text/TextStream.h>
 
index a0a8583..357d993 100644 (file)
@@ -38,7 +38,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/Threading.h>
 #include <wtf/UniStdExtras.h>
 
 #include <wtf/Threading.h>
 #include <wtf/UniStdExtras.h>
 
index 4ab1ec7..80c9790 100644 (file)
@@ -30,7 +30,6 @@
 
 #include "GamepadData.h"
 #include "Logging.h"
 
 #include "GamepadData.h"
 #include "Logging.h"
-#include <wtf/CurrentTime.h>
 
 
 namespace WebKit {
 
 
 namespace WebKit {
index 52e5297..e76a8a9 100644 (file)
@@ -83,7 +83,6 @@
 #import <WebCore/WheelEventTestTrigger.h>
 #import <pal/spi/cg/CoreGraphicsSPI.h>
 #import <pal/spi/mac/NSMenuSPI.h>
 #import <WebCore/WheelEventTestTrigger.h>
 #import <pal/spi/cg/CoreGraphicsSPI.h>
 #import <pal/spi/mac/NSMenuSPI.h>
-#import <wtf/CurrentTime.h>
 #import <wtf/UUID.h>
 
 using namespace WebCore;
 #import <wtf/UUID.h>
 
 using namespace WebCore;
index 02ee1c7..5bc862c 100644 (file)
@@ -34,7 +34,6 @@
 #include <WebCore/Page.h>
 #include <WebCore/PageOverlayController.h>
 #include <WebCore/Settings.h>
 #include <WebCore/Page.h>
 #include <WebCore/PageOverlayController.h>
 #include <WebCore/Settings.h>
-#include <wtf/CurrentTime.h>
 
 #if PLATFORM(IOS)
 #include <WebCore/InspectorOverlay.h>
 
 #if PLATFORM(IOS)
 #include <WebCore/InspectorOverlay.h>
index 9bdf3bb..2cf4062 100644 (file)
@@ -36,7 +36,6 @@
 #import <WebCore/TimingFunction.h>
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/BlockObjCExceptions.h>
 #import <WebCore/TimingFunction.h>
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/BlockObjCExceptions.h>
-#import <wtf/CurrentTime.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/text/TextStream.h>
 
 #import <wtf/RetainPtr.h>
 #import <wtf/text/TextStream.h>
 
index d78014c..53968fc 100644 (file)
@@ -38,7 +38,6 @@
 #import <WebCore/PlatformCAFilters.h>
 #import <WebCore/PlatformCALayerCocoa.h>
 #import <WebCore/TiledBacking.h>
 #import <WebCore/PlatformCAFilters.h>
 #import <WebCore/PlatformCALayerCocoa.h>
 #import <WebCore/TiledBacking.h>
-#import <wtf/CurrentTime.h>
 
 using namespace WebCore;
 
 
 using namespace WebCore;
 
index 892d657..9ca83b2 100644 (file)
@@ -28,8 +28,6 @@
 
 #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
 
 
 #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
 
-#import <wtf/CurrentTime.h>
-
 using namespace WebCore;
 
 namespace WebKit {
 using namespace WebCore;
 
 namespace WebKit {
index 7563355..496af41 100644 (file)
@@ -35,7 +35,6 @@
 #include <WebCore/ResourceError.h>
 #include <WebCore/ResourceLoader.h>
 #include <wtf/CompletionHandler.h>
 #include <WebCore/ResourceError.h>
 #include <WebCore/ResourceLoader.h>
 #include <wtf/CompletionHandler.h>
-#include <wtf/CurrentTime.h>
 
 using namespace WebCore;
 
 
 using namespace WebCore;
 
index d6a6db4..b02e178 100644 (file)
 #include <WebCore/Settings.h>
 #include <WebCore/URLParser.h>
 #include <WebCore/UserGestureIndicator.h>
 #include <WebCore/Settings.h>
 #include <WebCore/URLParser.h>
 #include <WebCore/UserGestureIndicator.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/Language.h>
 #include <wtf/RunLoop.h>
 #include <wtf/text/StringHash.h>
 #include <wtf/Language.h>
 #include <wtf/RunLoop.h>
 #include <wtf/text/StringHash.h>
index 4e9cd04..7da46df 100644 (file)
@@ -71,7 +71,6 @@
 #import <pal/spi/mac/NSAccessibilitySPI.h>
 #import <pal/spi/mac/NSApplicationSPI.h>
 #import <stdio.h>
 #import <pal/spi/mac/NSAccessibilitySPI.h>
 #import <pal/spi/mac/NSApplicationSPI.h>
 #import <stdio.h>
-#import <wtf/CurrentTime.h>
 
 #if PLATFORM(IOS)
 #import <UIKit/UIAccessibility.h>
 
 #if PLATFORM(IOS)
 #import <UIKit/UIAccessibility.h>
index 8b4c987..a38d060 100644 (file)
@@ -33,7 +33,6 @@
 #include <gtk/gtk.h>
 #include <libintl.h>
 #include <libsoup/soup.h>
 #include <gtk/gtk.h>
 #include <libintl.h>
 #include <libsoup/soup.h>
-#include <wtf/CurrentTime.h>
 
 #if PLATFORM(X11)
 #include <X11/Xlib.h>
 
 #if PLATFORM(X11)
 #include <X11/Xlib.h>
index ec8c683..c176609 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "ChildProcessMain.h"
 #include "WebProcess.h"
 
 #include "ChildProcessMain.h"
 #include "WebProcess.h"
-#include <wtf/CurrentTime.h>
 
 using namespace WebCore;
 
 
 using namespace WebCore;
 
index 0bcd811..8e7766e 100644 (file)
@@ -33,7 +33,6 @@
 #include <glib.h>
 #include <iostream>
 #include <libsoup/soup.h>
 #include <glib.h>
 #include <iostream>
 #include <libsoup/soup.h>
-#include <wtf/CurrentTime.h>
 
 using namespace WebCore;
 
 
 using namespace WebCore;
 
index 937ec86..8fff385 100644 (file)
@@ -1,3 +1,15 @@
+2018-03-04  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [WTF] Move currentCPUTime and sleep(Seconds) to CPUTime.h and Seconds.h respectively
+        https://bugs.webkit.org/show_bug.cgi?id=183312
+
+        Reviewed by Mark Lam.
+
+        Remove wtf/CurrentTime.h include pragma.
+
+        * WebView/WebFrame.mm:
+        * WebView/WebPDFView.mm:
+
 2018-03-04  Tim Horton  <timothy_horton@apple.com>
 
         Make !ENABLE(DATA_DETECTION) iOS build actually succeed
 2018-03-04  Tim Horton  <timothy_horton@apple.com>
 
         Make !ENABLE(DATA_DETECTION) iOS build actually succeed
index 150e49d..c2c48d2 100644 (file)
 #import <WebCore/ThreadCheck.h>
 #import <WebCore/VisibleUnits.h>
 #import <WebCore/markup.h>
 #import <WebCore/ThreadCheck.h>
 #import <WebCore/VisibleUnits.h>
 #import <WebCore/markup.h>
-#import <wtf/CurrentTime.h>
 
 #if PLATFORM(IOS)
 #import "WebMailDelegate.h"
 
 #if PLATFORM(IOS)
 #import "WebMailDelegate.h"
index 0b7e1f6..f45360c 100644 (file)
@@ -65,7 +65,6 @@
 #import <WebCore/URL.h>
 #import <WebCore/WebNSAttributedStringExtras.h>
 #import <wtf/Assertions.h>
 #import <WebCore/URL.h>
 #import <WebCore/WebNSAttributedStringExtras.h>
 #import <wtf/Assertions.h>
-#import <wtf/CurrentTime.h>
 
 #if USE(APPLE_INTERNAL_SDK)
 #import <ApplicationServices/ApplicationServicesPriv.h>
 
 #if USE(APPLE_INTERNAL_SDK)
 #import <ApplicationServices/ApplicationServicesPriv.h>
index 58080e9..eddca4c 100644 (file)
@@ -1,3 +1,16 @@
+2018-03-04  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [WTF] Move currentCPUTime and sleep(Seconds) to CPUTime.h and Seconds.h respectively
+        https://bugs.webkit.org/show_bug.cgi?id=183312
+
+        Reviewed by Mark Lam.
+
+        Remove wtf/CurrentTime.h include pragma.
+
+        * WebDownload.cpp:
+        * WebDownloadCFNet.cpp:
+        * WebDropSource.cpp:
+
 2018-03-01  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         Remove monotonicallyIncreasingTime
 2018-03-01  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         Remove monotonicallyIncreasingTime
index f1c7765..af7952a 100644 (file)
@@ -44,7 +44,6 @@
 #include <WebCore/ResourceHandle.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/ResourceResponse.h>
 #include <WebCore/ResourceHandle.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/ResourceResponse.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/StdLibExtras.h>
 
 using namespace WebCore;
 #include <wtf/StdLibExtras.h>
 
 using namespace WebCore;
index 8e71979..c565830 100644 (file)
@@ -51,7 +51,6 @@
 #include <WebCore/ResourceHandle.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/ResourceResponse.h>
 #include <WebCore/ResourceHandle.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/ResourceResponse.h>
-#include <wtf/CurrentTime.h>
 
 using namespace WebCore;
 
 
 using namespace WebCore;
 
index 215e71f..06cebfa 100644 (file)
@@ -35,7 +35,6 @@
 #include <WebCore/MainFrame.h>
 #include <WebCore/Page.h>
 #include <WebCore/PlatformMouseEvent.h>
 #include <WebCore/MainFrame.h>
 #include <WebCore/Page.h>
 #include <WebCore/PlatformMouseEvent.h>
-#include <wtf/CurrentTime.h>
 
 #include <Windows.h>
 
 
 #include <Windows.h>
 
index 942eb9d..d7fdd70 100644 (file)
@@ -1,3 +1,25 @@
+2018-03-04  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [WTF] Move currentCPUTime and sleep(Seconds) to CPUTime.h and Seconds.h respectively
+        https://bugs.webkit.org/show_bug.cgi?id=183312
+
+        Reviewed by Mark Lam.
+
+        Remove wtf/CurrentTime.h include pragma.
+
+        * DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp:
+        * DumpRenderTree/TestNetscapePlugIn/Tests/EvaluateJSWithinNPP_New.cpp:
+        * DumpRenderTree/TestNetscapePlugIn/Tests/InvokeDestroysPluginWithinNPP_New.cpp:
+        * DumpRenderTree/TestNetscapePlugIn/Tests/SlowNPPNew.cpp:
+        * TestWebKitAPI/Tests/WTF/Condition.cpp:
+        * TestWebKitAPI/Tests/WTF/Signals.cpp:
+        * TestWebKitAPI/Tests/WTF/ThreadGroup.cpp:
+        * TestWebKitAPI/Tests/WTF/WorkQueue.cpp:
+        * TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm:
+        * TestWebKitAPI/Tests/ios/DataInteractionTests.mm:
+        * TestWebKitAPI/jsconly/PlatformUtilitiesJSCOnly.cpp:
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+
 2018-03-04  Tim Horton  <timothy_horton@apple.com>
 
         Make !ENABLE(DATA_DETECTION) iOS build actually succeed
 2018-03-04  Tim Horton  <timothy_horton@apple.com>
 
         Make !ENABLE(DATA_DETECTION) iOS build actually succeed
index 3322aa3..ac9f0b7 100644 (file)
@@ -28,9 +28,9 @@
 #include "PluginObject.h"
 #include <assert.h>
 #include <string.h>
 #include "PluginObject.h"
 #include <assert.h>
 #include <string.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/Platform.h>
 #include <wtf/ExportMacros.h>
 #include <wtf/Platform.h>
 #include <wtf/ExportMacros.h>
+#include <wtf/Seconds.h>
 
 #if defined(XP_UNIX) || defined(ANDROID)
 #include <unistd.h>
 
 #if defined(XP_UNIX) || defined(ANDROID)
 #include <unistd.h>
index a142456..f8be799 100644 (file)
@@ -26,7 +26,7 @@
 #include "PluginTest.h"
 
 #include "PluginObject.h"
 #include "PluginTest.h"
 
 #include "PluginObject.h"
-#include <wtf/CurrentTime.h>
+#include <wtf/Seconds.h>
 
 using namespace std;
 
 
 using namespace std;
 
index 9fa9cfc..c5d2f94 100644 (file)
@@ -26,7 +26,7 @@
 #include "PluginTest.h"
 
 #include "PluginObject.h"
 #include "PluginTest.h"
 
 #include "PluginObject.h"
-#include <wtf/CurrentTime.h>
+#include <wtf/Seconds.h>
 
 using namespace std;
 
 
 using namespace std;
 
index f9004b5..8c80d55 100644 (file)
@@ -26,7 +26,6 @@
 #include "PluginTest.h"
 
 #include <string.h>
 #include "PluginTest.h"
 
 #include <string.h>
-#include <wtf/CurrentTime.h>
 
 using namespace std;
 
 
 using namespace std;
 
index 4e8d680..0a329c2 100644 (file)
@@ -27,7 +27,6 @@
 #include <mutex>
 #include <thread>
 #include <wtf/Condition.h>
 #include <mutex>
 #include <thread>
 #include <wtf/Condition.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/DataLog.h>
 #include <wtf/Deque.h>
 #include <wtf/Lock.h>
 #include <wtf/DataLog.h>
 #include <wtf/Deque.h>
 #include <wtf/Lock.h>
index 321d782..4b9e834 100644 (file)
@@ -26,7 +26,6 @@
 #include "config.h"
 
 #include <type_traits>
 #include "config.h"
 
 #include <type_traits>
-#include <wtf/CurrentTime.h>
 #include <wtf/DataLog.h>
 #include <wtf/Threading.h>
 #include <wtf/threads/Signals.h>
 #include <wtf/DataLog.h>
 #include <wtf/Threading.h>
 #include <wtf/threads/Signals.h>
index dae8ec2..291a3f0 100644 (file)
@@ -26,7 +26,6 @@
 #include "config.h"
 
 #include <wtf/Condition.h>
 #include "config.h"
 
 #include <wtf/Condition.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/ThreadGroup.h>
 #include <wtf/Vector.h>
 
 #include <wtf/ThreadGroup.h>
 #include <wtf/Vector.h>
 
index fae5a83..5cf1671 100644 (file)
@@ -27,7 +27,6 @@
 
 #include "Test.h"
 #include <wtf/Condition.h>
 
 #include "Test.h"
 #include <wtf/Condition.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/Lock.h>
 #include <wtf/Vector.h>
 #include <wtf/WorkQueue.h>
 #include <wtf/Lock.h>
 #include <wtf/Vector.h>
 #include <wtf/WorkQueue.h>
index 19a8430..d4d2205 100644 (file)
@@ -41,7 +41,6 @@
 #import <WebKit/WKViewPrivate.h>
 #import <WebKit/WKWebViewConfigurationPrivate.h>
 #import <WebKit/WKWebViewPrivate.h>
 #import <WebKit/WKViewPrivate.h>
 #import <WebKit/WKWebViewConfigurationPrivate.h>
 #import <WebKit/WKWebViewPrivate.h>
-#import <wtf/CurrentTime.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/mac/AppKitCompatibilityDeclarations.h>
 
 #import <wtf/RetainPtr.h>
 #import <wtf/mac/AppKitCompatibilityDeclarations.h>
 
index d197f1d..b9d9711 100644 (file)
@@ -40,7 +40,7 @@
 #import <WebKit/WKWebViewConfigurationPrivate.h>
 #import <WebKit/WebItemProviderPasteboard.h>
 #import <WebKit/_WKProcessPoolConfiguration.h>
 #import <WebKit/WKWebViewConfigurationPrivate.h>
 #import <WebKit/WebItemProviderPasteboard.h>
 #import <WebKit/_WKProcessPoolConfiguration.h>
-#import <wtf/CurrentTime.h>
+#import <wtf/Seconds.h>
 
 typedef void (^FileLoadCompletionBlock)(NSURL *, BOOL, NSError *);
 typedef void (^DataLoadCompletionBlock)(NSData *, NSError *);
 
 typedef void (^FileLoadCompletionBlock)(NSURL *, BOOL, NSError *);
 typedef void (^DataLoadCompletionBlock)(NSData *, NSError *);
index f78e88e..cd3ec02 100644 (file)
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "PlatformUtilities.h"
 
 #include "config.h"
 #include "PlatformUtilities.h"
 
-#include <wtf/CurrentTime.h>
 #include <wtf/RunLoop.h>
 
 #if USE(GLIB_EVENT_LOOP)
 #include <wtf/RunLoop.h>
 
 #if USE(GLIB_EVENT_LOOP)
index aed6e4c..441af96 100644 (file)
@@ -49,7 +49,6 @@
 #include <WebKit/WKRetainPtr.h>
 #include <WebKit/WKSerializedScriptValue.h>
 #include <WebKit/WebKit2_C.h>
 #include <WebKit/WKRetainPtr.h>
 #include <WebKit/WKSerializedScriptValue.h>
 #include <WebKit/WebKit2_C.h>
-#include <wtf/CurrentTime.h>
 #include <wtf/HashMap.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/CString.h>
 #include <wtf/HashMap.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/CString.h>