Changeset 229209 in webkit for trunk/Source/JavaScriptCore/testRegExp.cpp

Timestamp:

Mar 4, 2018, 6:33:55 PM (7 years ago)

Author:

Yusuke Suzuki

Message:

[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.

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:

File:

• trunk/Source/JavaScriptCore/testRegExp.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/testRegExp.cpp

@@ -22 +22 @@
 #include "RegExp.h"
 
-#include <wtf/CurrentTime.h>
 #include "InitializeThreading.h"
 #include "JSCInlines.h"