<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[215152] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/215152">215152</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-04-08 16:19:16 -0700 (Sat, 08 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drop std::chrono support from Timer class
https://bugs.webkit.org/show_bug.cgi?id=170645
Reviewed by Sam Weinig.
Drop std::chrono support from Timer class now that we prefer using Seconds type.
Source/WebCore:
* css/CSSImageGeneratorValue.cpp:
* html/HTMLPlugInImageElement.cpp:
* html/canvas/WebGLRenderingContextBase.cpp:
* loader/cache/CachedResource.cpp:
(WebCore::deadDecodedDataDeletionIntervalForResourceType):
(WebCore::CachedResource::destroyDecodedDataIfNeeded):
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::MemoryCache):
* loader/cache/MemoryCache.h:
(WebCore::MemoryCache::setDeadDecodedDataDeletionInterval):
(WebCore::MemoryCache::deadDecodedDataDeletionInterval):
* page/PerformanceMonitor.cpp:
* page/SuspendableTimer.h:
* page/mac/ServicesOverlayController.h:
* page/mac/ServicesOverlayController.mm:
(WebCore::ServicesOverlayController::selectionRectsDidChange):
(WebCore::ServicesOverlayController::remainingTimeUntilHighlightShouldBeShown):
(WebCore::ServicesOverlayController::determineActiveHighlight):
(WebCore::ServicesOverlayController::mouseEvent):
* platform/Timer.h:
(WebCore::TimerBase::startRepeating):
(WebCore::TimerBase::startOneShot):
(WebCore::TimerBase::augmentFireInterval):
(WebCore::TimerBase::augmentRepeatInterval):
(WebCore::DeferrableOneShotTimer::DeferrableOneShotTimer):
* platform/graphics/FontCache.cpp:
(WebCore::FontCache::fontForFamily):
* platform/graphics/ca/TileController.cpp:
* platform/graphics/cg/IOSurfacePool.cpp:
* platform/graphics/cg/SubimageCacheWithTimer.cpp:
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::setTimeout):
(WebCore::XMLHttpRequest::createRequest):
* xml/XMLHttpRequest.h:
Source/WebKit/mac:
* WebView/WebView.mm:
(+[WebView _setCacheModel:]):
Source/WebKit/win:
* WebView.cpp:
(WebView::setCacheModel):
Source/WebKit2:
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::Throttle::Throttle):
(WebKit::NetworkLoad::didReceiveResponseNetworkSession):
* NetworkProcess/NetworkProcess.h:
(WebKit::NetworkProcess::loadThrottleLatency):
* NetworkProcess/NetworkProcessCreationParameters.cpp:
* NetworkProcess/NetworkProcessCreationParameters.h:
* NetworkProcess/NetworkResourceLoadParameters.h:
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::startNetworkLoad):
* NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
* NetworkProcess/cache/NetworkCacheStatistics.cpp:
* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::dispatchReadOperation):
(WebKit::NetworkCache::Storage::store):
* Shared/CacheModel.cpp:
(WebKit::calculateMemoryCacheSizes):
* Shared/CacheModel.h:
* Shared/mac/RemoteLayerBackingStoreCollection.mm:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeNetworkProcess):
* WebProcess/Network/WebLoaderStrategy.cpp:
(WebKit::maximumBufferingTime):
* WebProcess/Plugins/PluginView.cpp:
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
(WebKit::RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlushImmediately):
(WebKit::RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlush):
* WebProcess/WebProcess.cpp:
(WebKit::m_resourceLoadStatisticsStore):
(WebKit::WebProcess::setCacheModel):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageGeneratorValuecpp">trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementcpp">trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCachecpp">trunk/Source/WebCore/loader/cache/MemoryCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCacheh">trunk/Source/WebCore/loader/cache/MemoryCache.h</a></li>
<li><a href="#trunkSourceWebCorepagePerformanceMonitorcpp">trunk/Source/WebCore/page/PerformanceMonitor.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSuspendableTimerh">trunk/Source/WebCore/page/SuspendableTimer.h</a></li>
<li><a href="#trunkSourceWebCorepagemacServicesOverlayControllerh">trunk/Source/WebCore/page/mac/ServicesOverlayController.h</a></li>
<li><a href="#trunkSourceWebCorepagemacServicesOverlayControllermm">trunk/Source/WebCore/page/mac/ServicesOverlayController.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformTimerh">trunk/Source/WebCore/platform/Timer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCachecpp">trunk/Source/WebCore/platform/graphics/FontCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllercpp">trunk/Source/WebCore/platform/graphics/ca/TileController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgIOSurfacePoolcpp">trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgSubimageCacheWithTimercpp">trunk/Source/WebCore/platform/graphics/cg/SubimageCacheWithTimer.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequesth">trunk/Source/WebCore/xml/XMLHttpRequest.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadcpp">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessCreationParameterscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessCreationParametersh">trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadParametersh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagercpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticscpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCacheModelcpp">trunk/Source/WebKit2/Shared/CacheModel.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCacheModelh">trunk/Source/WebKit2/Shared/CacheModel.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerBackingStoreCollectionmm">trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebLoaderStrategycpp">trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/ChangeLog 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2017-04-08 Chris Dumez <cdumez@apple.com>
+
+ Drop std::chrono support from Timer class
+ https://bugs.webkit.org/show_bug.cgi?id=170645
+
+ Reviewed by Sam Weinig.
+
+ Drop std::chrono support from Timer class now that we prefer using Seconds type.
+
+ * css/CSSImageGeneratorValue.cpp:
+ * html/HTMLPlugInImageElement.cpp:
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ * loader/cache/CachedResource.cpp:
+ (WebCore::deadDecodedDataDeletionIntervalForResourceType):
+ (WebCore::CachedResource::destroyDecodedDataIfNeeded):
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::MemoryCache):
+ * loader/cache/MemoryCache.h:
+ (WebCore::MemoryCache::setDeadDecodedDataDeletionInterval):
+ (WebCore::MemoryCache::deadDecodedDataDeletionInterval):
+ * page/PerformanceMonitor.cpp:
+ * page/SuspendableTimer.h:
+ * page/mac/ServicesOverlayController.h:
+ * page/mac/ServicesOverlayController.mm:
+ (WebCore::ServicesOverlayController::selectionRectsDidChange):
+ (WebCore::ServicesOverlayController::remainingTimeUntilHighlightShouldBeShown):
+ (WebCore::ServicesOverlayController::determineActiveHighlight):
+ (WebCore::ServicesOverlayController::mouseEvent):
+ * platform/Timer.h:
+ (WebCore::TimerBase::startRepeating):
+ (WebCore::TimerBase::startOneShot):
+ (WebCore::TimerBase::augmentFireInterval):
+ (WebCore::TimerBase::augmentRepeatInterval):
+ (WebCore::DeferrableOneShotTimer::DeferrableOneShotTimer):
+ * platform/graphics/FontCache.cpp:
+ (WebCore::FontCache::fontForFamily):
+ * platform/graphics/ca/TileController.cpp:
+ * platform/graphics/cg/IOSurfacePool.cpp:
+ * platform/graphics/cg/SubimageCacheWithTimer.cpp:
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::setTimeout):
+ (WebCore::XMLHttpRequest::createRequest):
+ * xml/XMLHttpRequest.h:
+
</ins><span class="cx"> 2017-04-08 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Update CSSProperties.json with correct fill-and-stroke status, and other cleanup
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageGeneratorValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static const auto timeToKeepCachedGeneratedImages = std::chrono::seconds { 3 };
</del><ins>+static const Seconds timeToKeepCachedGeneratedImages { 3_s };
</ins><span class="cx">
</span><span class="cx"> class CSSImageGeneratorValue::CachedGeneratedImage {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -55,10 +55,10 @@
</span><span class="cx"> static const Seconds autostartSoonAfterUserGestureThreshold = 5_s;
</span><span class="cx">
</span><span class="cx"> // This delay should not exceed the snapshot delay in PluginView.cpp
</span><del>-static const auto simulatedMouseClickTimerDelay = std::chrono::milliseconds { 750 };
</del><ins>+static const Seconds simulatedMouseClickTimerDelay { 750_ms };
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-static const auto removeSnapshotTimerDelay = std::chrono::milliseconds { 1500 };
</del><ins>+static const Seconds removeSnapshotTimerDelay { 1500_ms };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static const String titleText(Page& page, const String& mimeType)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> const double secondsBetweenRestoreAttempts = 1.0;
</span><span class="cx"> const int maxGLErrorsAllowedToConsole = 256;
</span><del>-static const std::chrono::seconds checkContextLossHandlingDelay { 3 };
</del><ins>+static const Seconds checkContextLossHandlingDelay { 3_s };
</ins><span class="cx">
</span><span class="cx"> namespace {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -102,10 +102,10 @@
</span><span class="cx"> return ResourceLoadPriority::Low;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static std::chrono::milliseconds deadDecodedDataDeletionIntervalForResourceType(CachedResource::Type type)
</del><ins>+static Seconds deadDecodedDataDeletionIntervalForResourceType(CachedResource::Type type)
</ins><span class="cx"> {
</span><span class="cx"> if (type == CachedResource::Script)
</span><del>- return std::chrono::milliseconds { 0 };
</del><ins>+ return 0_s;
</ins><span class="cx">
</span><span class="cx"> return MemoryCache::singleton().deadDecodedDataDeletionInterval();
</span><span class="cx"> }
</span><span class="lines">@@ -537,7 +537,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_decodedSize)
</span><span class="cx"> return;
</span><del>- if (!MemoryCache::singleton().deadDecodedDataDeletionInterval().count())
</del><ins>+ if (!MemoryCache::singleton().deadDecodedDataDeletionInterval())
</ins><span class="cx"> return;
</span><span class="cx"> m_decodedDataDeletionTimer.restart();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -51,7 +51,6 @@
</span><span class="cx"> static const int cDefaultCacheCapacity = 8192 * 1024;
</span><span class="cx"> static const double cMinDelayBeforeLiveDecodedPrune = 1; // Seconds.
</span><span class="cx"> static const float cTargetPrunePercentage = .95f; // Percentage of capacity toward which we prune, to avoid immediately pruning again.
</span><del>-static const auto defaultDecodedDataDeletionInterval = std::chrono::seconds { 0 };
</del><span class="cx">
</span><span class="cx"> MemoryCache& MemoryCache::singleton()
</span><span class="cx"> {
</span><span class="lines">@@ -66,7 +65,6 @@
</span><span class="cx"> , m_capacity(cDefaultCacheCapacity)
</span><span class="cx"> , m_minDeadCapacity(0)
</span><span class="cx"> , m_maxDeadCapacity(cDefaultCacheCapacity)
</span><del>- , m_deadDecodedDataDeletionInterval(defaultDecodedDataDeletionInterval)
</del><span class="cx"> , m_liveSize(0)
</span><span class="cx"> , m_deadSize(0)
</span><span class="cx"> , m_pruneTimer(*this, &MemoryCache::prune)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.h (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.h 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.h 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -125,8 +125,8 @@
</span><span class="cx"> void pruneSoon();
</span><span class="cx"> unsigned size() const { return m_liveSize + m_deadSize; }
</span><span class="cx">
</span><del>- void setDeadDecodedDataDeletionInterval(std::chrono::milliseconds interval) { m_deadDecodedDataDeletionInterval = interval; }
- std::chrono::milliseconds deadDecodedDataDeletionInterval() const { return m_deadDecodedDataDeletionInterval; }
</del><ins>+ void setDeadDecodedDataDeletionInterval(Seconds interval) { m_deadDecodedDataDeletionInterval = interval; }
+ Seconds deadDecodedDataDeletionInterval() const { return m_deadDecodedDataDeletionInterval; }
</ins><span class="cx">
</span><span class="cx"> // Calls to put the cached resource into and out of LRU lists.
</span><span class="cx"> void insertInLRUList(CachedResource&);
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> unsigned m_capacity;
</span><span class="cx"> unsigned m_minDeadCapacity;
</span><span class="cx"> unsigned m_maxDeadCapacity;
</span><del>- std::chrono::milliseconds m_deadDecodedDataDeletionInterval;
</del><ins>+ Seconds m_deadDecodedDataDeletionInterval;
</ins><span class="cx">
</span><span class="cx"> unsigned m_liveSize; // The number of bytes currently consumed by "live" resources in the cache.
</span><span class="cx"> unsigned m_deadSize; // The number of bytes currently consumed by "dead" resources in the cache.
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceMonitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceMonitor.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceMonitor.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/page/PerformanceMonitor.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -41,14 +41,14 @@
</span><span class="cx">
</span><span class="cx"> #define RELEASE_LOG_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_IF(m_page.isAlwaysOnLoggingAllowed(), channel, "%p - PerformanceMonitor::" fmt, this, ##__VA_ARGS__)
</span><span class="cx">
</span><del>-static const std::chrono::seconds cpuUsageMeasurementDelay { 5 };
-static const std::chrono::seconds postLoadCPUUsageMeasurementDuration { 10 };
-static const std::chrono::minutes backgroundCPUUsageMeasurementDuration { 5 };
-static const std::chrono::minutes cpuUsageSamplingInterval { 10 };
</del><ins>+static const Seconds cpuUsageMeasurementDelay { 5_s };
+static const Seconds postLoadCPUUsageMeasurementDuration { 10_s };
+static const Seconds backgroundCPUUsageMeasurementDuration { 5_min };
+static const Seconds cpuUsageSamplingInterval { 10_min };
</ins><span class="cx">
</span><del>-static const std::chrono::seconds memoryUsageMeasurementDelay { 10 };
</del><ins>+static const Seconds memoryUsageMeasurementDelay { 10_s };
</ins><span class="cx">
</span><del>-static const std::chrono::minutes delayBeforeProcessMayBecomeInactive { 8 };
</del><ins>+static const Seconds delayBeforeProcessMayBecomeInactive { 8_min };
</ins><span class="cx">
</span><span class="cx"> static const double postPageLoadCPUUsageDomainReportingThreshold { 20.0 }; // Reporting pages using over 20% CPU is roughly equivalent to reporting the 10% worst pages.
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCorepageSuspendableTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SuspendableTimer.h (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SuspendableTimer.h 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/page/SuspendableTimer.h 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -55,17 +55,9 @@
</span><span class="cx"> void startRepeating(Seconds repeatInterval);
</span><span class="cx"> void startOneShot(Seconds interval);
</span><span class="cx">
</span><del>- // FIXME: Use the overloads taking Seconds instead and drop these.
- void startRepeating(std::chrono::milliseconds repeatInterval) { startRepeating(msToSeconds(repeatInterval)); }
- void startOneShot(std::chrono::milliseconds interval) { startOneShot(msToSeconds(interval)); }
-
</del><span class="cx"> void augmentFireInterval(Seconds delta);
</span><span class="cx"> void augmentRepeatInterval(Seconds delta);
</span><span class="cx">
</span><del>- // FIXME: Use the overloads taking Seconds instead and drop these.
- void augmentFireInterval(std::chrono::milliseconds delta) { augmentFireInterval(msToSeconds(delta)); }
- void augmentRepeatInterval(std::chrono::milliseconds delta) { augmentRepeatInterval(msToSeconds(delta)); }
-
</del><span class="cx"> using TimerBase::didChangeAlignmentInterval;
</span><span class="cx"> using TimerBase::operator new;
</span><span class="cx"> using TimerBase::operator delete;
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacServicesOverlayControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/ServicesOverlayController.h (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/ServicesOverlayController.h 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/page/mac/ServicesOverlayController.h 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "PageOverlay.h"
</span><span class="cx"> #include "Range.h"
</span><span class="cx"> #include "Timer.h"
</span><ins>+#include <wtf/MonotonicTime.h>
</ins><span class="cx">
</span><span class="cx"> typedef struct __DDHighlight *DDHighlightRef;
</span><span class="cx">
</span><span class="lines">@@ -122,7 +123,7 @@
</span><span class="cx"> bool hasRelevantSelectionServices();
</span><span class="cx">
</span><span class="cx"> bool mouseIsOverHighlight(Highlight&, bool& mouseIsOverButton) const;
</span><del>- std::chrono::milliseconds remainingTimeUntilHighlightShouldBeShown(Highlight*) const;
</del><ins>+ Seconds remainingTimeUntilHighlightShouldBeShown(Highlight*) const;
</ins><span class="cx"> void determineActiveHighlightTimerFired();
</span><span class="cx">
</span><span class="cx"> static bool highlightsAreEquivalent(const Highlight* a, const Highlight* b);
</span><span class="lines">@@ -151,9 +152,9 @@
</span><span class="cx">
</span><span class="cx"> Highlight::Type m_dirtyHighlightTypes { 0 };
</span><span class="cx">
</span><del>- std::chrono::steady_clock::time_point m_lastSelectionChangeTime;
- std::chrono::steady_clock::time_point m_nextActiveHighlightChangeTime;
- std::chrono::steady_clock::time_point m_lastMouseUpTime;
</del><ins>+ MonotonicTime m_lastSelectionChangeTime;
+ MonotonicTime m_nextActiveHighlightChangeTime;
+ MonotonicTime m_lastMouseUpTime;
</ins><span class="cx">
</span><span class="cx"> RefPtr<Highlight> m_currentMouseDownOnButtonHighlight;
</span><span class="cx"> IntPoint m_mousePosition;
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacServicesOverlayControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/ServicesOverlayController.mm (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -367,7 +367,7 @@
</span><span class="cx"> m_currentSelectionRects = rects;
</span><span class="cx"> m_isTextOnly = isTextOnly;
</span><span class="cx">
</span><del>- m_lastSelectionChangeTime = std::chrono::steady_clock::now();
</del><ins>+ m_lastSelectionChangeTime = MonotonicTime::now();
</ins><span class="cx">
</span><span class="cx"> compactRectsWithGapRects(m_currentSelectionRects, gapRects);
</span><span class="cx">
</span><span class="lines">@@ -432,15 +432,15 @@
</span><span class="cx"> return hovered;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::chrono::milliseconds ServicesOverlayController::remainingTimeUntilHighlightShouldBeShown(Highlight* highlight) const
</del><ins>+Seconds ServicesOverlayController::remainingTimeUntilHighlightShouldBeShown(Highlight* highlight) const
</ins><span class="cx"> {
</span><span class="cx"> if (!highlight)
</span><del>- return 0ms;
</del><ins>+ return 0_s;
</ins><span class="cx">
</span><del>- auto minimumTimeUntilHighlightShouldBeShown = 200ms;
</del><ins>+ Seconds minimumTimeUntilHighlightShouldBeShown = 200_ms;
</ins><span class="cx"> Page* page = m_mainFrame.page();
</span><span class="cx"> if (page && page->focusController().focusedOrMainFrame().selection().selection().isContentEditable())
</span><del>- minimumTimeUntilHighlightShouldBeShown = 1000ms;
</del><ins>+ minimumTimeUntilHighlightShouldBeShown = 1_s;
</ins><span class="cx">
</span><span class="cx"> bool mousePressed = m_mainFrame.eventHandler().mousePressed();
</span><span class="cx">
</span><span class="lines">@@ -448,15 +448,14 @@
</span><span class="cx"> // by virtue of being expanded to include the entire telephone number. However, we will still avoid highlighting
</span><span class="cx"> // telephone numbers while the mouse is down.
</span><span class="cx"> if (highlight->type() == Highlight::TelephoneNumberType)
</span><del>- return mousePressed ? minimumTimeUntilHighlightShouldBeShown : 0ms;
</del><ins>+ return mousePressed ? minimumTimeUntilHighlightShouldBeShown : 0_s;
</ins><span class="cx">
</span><del>- auto now = std::chrono::steady_clock::now();
- auto timeSinceLastSelectionChange = now - m_lastSelectionChangeTime;
- auto timeSinceHighlightBecameActive = now - m_nextActiveHighlightChangeTime;
- auto timeSinceLastMouseUp = mousePressed ? 0ms : now - m_lastMouseUpTime;
</del><ins>+ MonotonicTime now = MonotonicTime::now();
+ Seconds timeSinceLastSelectionChange = now - m_lastSelectionChangeTime;
+ Seconds timeSinceHighlightBecameActive = now - m_nextActiveHighlightChangeTime;
+ Seconds timeSinceLastMouseUp = mousePressed ? 0_s : now - m_lastMouseUpTime;
</ins><span class="cx">
</span><del>- auto remainingDelay = minimumTimeUntilHighlightShouldBeShown - std::min(std::min(timeSinceLastSelectionChange, timeSinceHighlightBecameActive), timeSinceLastMouseUp);
- return std::chrono::duration_cast<std::chrono::milliseconds>(remainingDelay);
</del><ins>+ return minimumTimeUntilHighlightShouldBeShown - std::min(std::min(timeSinceLastSelectionChange, timeSinceHighlightBecameActive), timeSinceLastMouseUp);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ServicesOverlayController::determineActiveHighlightTimerFired()
</span><span class="lines">@@ -717,7 +716,7 @@
</span><span class="cx"> // highlight, and only reset the active highlight hysteresis when that changes.
</span><span class="cx"> if (m_nextActiveHighlight != newActiveHighlight) {
</span><span class="cx"> m_nextActiveHighlight = newActiveHighlight;
</span><del>- m_nextActiveHighlightChangeTime = std::chrono::steady_clock::now();
</del><ins>+ m_nextActiveHighlightChangeTime = MonotonicTime::now();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_currentMouseDownOnButtonHighlight = nullptr;
</span><span class="lines">@@ -728,7 +727,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto remainingTimeUntilHighlightShouldBeShown = this->remainingTimeUntilHighlightShouldBeShown(newActiveHighlight.get());
</span><del>- if (remainingTimeUntilHighlightShouldBeShown > std::chrono::steady_clock::duration::zero()) {
</del><ins>+ if (remainingTimeUntilHighlightShouldBeShown > 0_s) {
</ins><span class="cx"> m_determineActiveHighlightTimer.startOneShot(remainingTimeUntilHighlightShouldBeShown);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -760,7 +759,7 @@
</span><span class="cx"> RefPtr<Highlight> mouseDownHighlight = m_currentMouseDownOnButtonHighlight;
</span><span class="cx"> m_currentMouseDownOnButtonHighlight = nullptr;
</span><span class="cx">
</span><del>- m_lastMouseUpTime = std::chrono::steady_clock::now();
</del><ins>+ m_lastMouseUpTime = MonotonicTime::now();
</ins><span class="cx">
</span><span class="cx"> if (mouseIsOverActiveHighlightButton && mouseDownHighlight) {
</span><span class="cx"> handleClick(m_mousePosition, *mouseDownHighlight);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Timer.h (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Timer.h 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/platform/Timer.h 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -48,10 +48,6 @@
</span><span class="cx"> class TimerBase {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(TimerBase);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><del>-protected:
- static inline double msToSeconds(std::chrono::milliseconds duration) { return duration.count() * 0.001; }
- static inline std::chrono::milliseconds secondsToMS(double duration) { return std::chrono::milliseconds((std::chrono::milliseconds::rep)(duration * 1000)); }
-
</del><span class="cx"> public:
</span><span class="cx"> WEBCORE_EXPORT TimerBase();
</span><span class="cx"> WEBCORE_EXPORT virtual ~TimerBase();
</span><span class="lines">@@ -60,11 +56,9 @@
</span><span class="cx"> WEBCORE_EXPORT void start(double nextFireInterval, double repeatInterval);
</span><span class="cx">
</span><span class="cx"> void startRepeating(double repeatInterval) { start(repeatInterval, repeatInterval); }
</span><del>- void startRepeating(std::chrono::milliseconds repeatInterval) { startRepeating(msToSeconds(repeatInterval)); }
</del><span class="cx"> void startRepeating(Seconds repeatInterval) { startRepeating(repeatInterval.value()); }
</span><span class="cx">
</span><span class="cx"> void startOneShot(double interval) { start(interval, 0); }
</span><del>- void startOneShot(std::chrono::milliseconds interval) { startOneShot(msToSeconds(interval)); }
</del><span class="cx"> void startOneShot(Seconds interval) { start(interval, 0_s); }
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void stop();
</span><span class="lines">@@ -75,11 +69,9 @@
</span><span class="cx"> Seconds repeatInterval() const { return m_repeatInterval; }
</span><span class="cx">
</span><span class="cx"> void augmentFireInterval(Seconds delta) { setNextFireTime(m_nextFireTime + delta); }
</span><del>- void augmentFireInterval(std::chrono::milliseconds delta) { augmentFireInterval(msToSeconds(delta)); }
</del><span class="cx"> void augmentFireInterval(double delta) { augmentFireInterval(Seconds { delta }); }
</span><span class="cx">
</span><span class="cx"> void augmentRepeatInterval(Seconds delta) { augmentFireInterval(delta); m_repeatInterval += delta; }
</span><del>- void augmentRepeatInterval(std::chrono::milliseconds delta) { augmentRepeatInterval(msToSeconds(delta)); }
</del><span class="cx"> void augmentRepeatInterval(double delta) { augmentRepeatInterval(Seconds { delta }); }
</span><span class="cx">
</span><span class="cx"> void didChangeAlignmentInterval();
</span><span class="lines">@@ -166,12 +158,12 @@
</span><span class="cx"> class DeferrableOneShotTimer : protected TimerBase {
</span><span class="cx"> public:
</span><span class="cx"> template<typename TimerFiredClass>
</span><del>- DeferrableOneShotTimer(TimerFiredClass& object, void (TimerFiredClass::*function)(), std::chrono::milliseconds delay)
</del><ins>+ DeferrableOneShotTimer(TimerFiredClass& object, void (TimerFiredClass::*function)(), Seconds delay)
</ins><span class="cx"> : DeferrableOneShotTimer(std::bind(function, &object), delay)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- DeferrableOneShotTimer(std::function<void ()> function, std::chrono::milliseconds delay)
</del><ins>+ DeferrableOneShotTimer(std::function<void ()> function, Seconds delay)
</ins><span class="cx"> : m_function(WTFMove(function))
</span><span class="cx"> , m_delay(delay)
</span><span class="cx"> , m_shouldRestartWhenTimerFires(false)
</span><span class="lines">@@ -213,7 +205,7 @@
</span><span class="cx">
</span><span class="cx"> std::function<void ()> m_function;
</span><span class="cx">
</span><del>- std::chrono::milliseconds m_delay;
</del><ins>+ Seconds m_delay;
</ins><span class="cx"> bool m_shouldRestartWhenTimerFires;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/platform/graphics/FontCache.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx"> RefPtr<Font> FontCache::fontForFamily(const FontDescription& fontDescription, const AtomicString& family, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, bool checkingAlternateName)
</span><span class="cx"> {
</span><span class="cx"> if (!m_purgeTimer.isActive())
</span><del>- m_purgeTimer.startOneShot(0ms);
</del><ins>+ m_purgeTimer.startOneShot(0_s);
</ins><span class="cx">
</span><span class="cx"> FontPlatformData* platformData = getCachedFontPlatformData(fontDescription, family, fontFaceFeatures, fontFaceVariantSettings, checkingAlternateName);
</span><span class="cx"> if (!platformData)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static const auto tileSizeUpdateDelay = std::chrono::milliseconds { 500 };
</del><ins>+static const Seconds tileSizeUpdateDelay { 500_ms };
</ins><span class="cx">
</span><span class="cx"> String TileController::tileGridContainerLayerName()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgIOSurfacePoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include <chrono>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><del>-const std::chrono::milliseconds collectionInterval = 500ms;
</del><ins>+static const Seconds collectionInterval { 500_ms };
</ins><span class="cx"> const std::chrono::seconds surfaceAgeBeforeMarkingPurgeable = 2s;
</span><span class="cx"> const size_t defaultMaximumBytesCached = 1024 * 1024 * 64;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgSubimageCacheWithTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/SubimageCacheWithTimer.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/SubimageCacheWithTimer.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/platform/graphics/cg/SubimageCacheWithTimer.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static const auto subimageCacheClearDelay = std::chrono::seconds { 1 };
</del><ins>+static const Seconds subimageCacheClearDelay { 1_s };
</ins><span class="cx"> static const int maxSubimageCacheSize = 300;
</span><span class="cx">
</span><span class="cx"> struct SubimageRequest {
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -245,8 +245,8 @@
</span><span class="cx"> return { };
</span><span class="cx">
</span><span class="cx"> // If timeout is zero, we should use the default network timeout. But we disabled it so let's mimic it with a 60 seconds timeout value.
</span><del>- std::chrono::duration<double> interval = std::chrono::milliseconds { m_timeoutMilliseconds ? m_timeoutMilliseconds : 60000 } - (std::chrono::steady_clock::now() - m_sendingTime);
- m_timeoutTimer.startOneShot(std::max(0.0, interval.count()));
</del><ins>+ Seconds interval = Seconds { m_timeoutMilliseconds ? m_timeoutMilliseconds / 1000. : 60. } - (MonotonicTime::now() - m_sendingTime);
+ m_timeoutTimer.startOneShot(std::max(interval, 0_s));
</ins><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -737,8 +737,8 @@
</span><span class="cx"> request.setTimeoutInterval(m_timeoutMilliseconds / 1000.0);
</span><span class="cx"> else {
</span><span class="cx"> request.setTimeoutInterval(std::numeric_limits<double>::infinity());
</span><del>- m_sendingTime = std::chrono::steady_clock::now();
- m_timeoutTimer.startOneShot(std::chrono::milliseconds { m_timeoutMilliseconds });
</del><ins>+ m_sendingTime = MonotonicTime::now();
+ m_timeoutTimer.startOneShot(Seconds { m_timeoutMilliseconds / 1000. });
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.h (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.h 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.h 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> void networkErrorTimerFired();
</span><span class="cx">
</span><span class="cx"> unsigned m_timeoutMilliseconds { 0 };
</span><del>- std::chrono::steady_clock::time_point m_sendingTime;
</del><ins>+ MonotonicTime m_sendingTime;
</ins><span class="cx"> Timer m_timeoutTimer;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-04-08 Chris Dumez <cdumez@apple.com>
+
+ Drop std::chrono support from Timer class
+ https://bugs.webkit.org/show_bug.cgi?id=170645
+
+ Reviewed by Sam Weinig.
+
+ Drop std::chrono support from Timer class now that we prefer using Seconds type.
+
+ * WebView/WebView.mm:
+ (+[WebView _setCacheModel:]):
+
</ins><span class="cx"> 2017-04-08 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> WebRTC tests gardening
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -8523,7 +8523,7 @@
</span><span class="cx"> unsigned cacheTotalCapacity = 0;
</span><span class="cx"> unsigned cacheMinDeadCapacity = 0;
</span><span class="cx"> unsigned cacheMaxDeadCapacity = 0;
</span><del>- auto deadDecodedDataDeletionInterval = std::chrono::seconds { 0 };
</del><ins>+ Seconds deadDecodedDataDeletionInterval;
</ins><span class="cx">
</span><span class="cx"> unsigned pageCacheSize = 0;
</span><span class="cx">
</span><span class="lines">@@ -8650,7 +8650,7 @@
</span><span class="cx"> // can prove that the overall system gain would justify the regression.
</span><span class="cx"> cacheMaxDeadCapacity = std::max<unsigned>(24, cacheMaxDeadCapacity);
</span><span class="cx">
</span><del>- deadDecodedDataDeletionInterval = std::chrono::seconds { 60 };
</del><ins>+ deadDecodedDataDeletionInterval = 60_s;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (memSize >= 1024)
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit/win/ChangeLog 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-04-08 Chris Dumez <cdumez@apple.com>
+
+ Drop std::chrono support from Timer class
+ https://bugs.webkit.org/show_bug.cgi?id=170645
+
+ Reviewed by Sam Weinig.
+
+ Drop std::chrono support from Timer class now that we prefer using Seconds type.
+
+ * WebView.cpp:
+ (WebView::setCacheModel):
+
</ins><span class="cx"> 2017-03-31 Fujii Hironori <Hironori.Fujii@sony.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] WebCore::PlatformDisplay::terminateEGLDisplay causes a crash in libGLESv2.dll while processing atexit
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit/win/WebView.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -525,7 +525,7 @@
</span><span class="cx"> unsigned cacheTotalCapacity = 0;
</span><span class="cx"> unsigned cacheMinDeadCapacity = 0;
</span><span class="cx"> unsigned cacheMaxDeadCapacity = 0;
</span><del>- auto deadDecodedDataDeletionInterval = std::chrono::seconds { 0 };
</del><ins>+ Seconds deadDecodedDataDeletionInterval;
</ins><span class="cx">
</span><span class="cx"> unsigned pageCacheSize = 0;
</span><span class="cx">
</span><span class="lines">@@ -637,7 +637,7 @@
</span><span class="cx"> // can prove that the overall system gain would justify the regression.
</span><span class="cx"> cacheMaxDeadCapacity = max(24u, cacheMaxDeadCapacity);
</span><span class="cx">
</span><del>- deadDecodedDataDeletionInterval = std::chrono::seconds { 60 };
</del><ins>+ deadDecodedDataDeletionInterval = 60_s;
</ins><span class="cx">
</span><span class="cx"> // Memory cache capacity (in bytes)
</span><span class="cx"> // (These values are small because WebCore does most caching itself.)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -1,5 +1,45 @@
</span><span class="cx"> 2017-04-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Drop std::chrono support from Timer class
+ https://bugs.webkit.org/show_bug.cgi?id=170645
+
+ Reviewed by Sam Weinig.
+
+ Drop std::chrono support from Timer class now that we prefer using Seconds type.
+
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::Throttle::Throttle):
+ (WebKit::NetworkLoad::didReceiveResponseNetworkSession):
+ * NetworkProcess/NetworkProcess.h:
+ (WebKit::NetworkProcess::loadThrottleLatency):
+ * NetworkProcess/NetworkProcessCreationParameters.cpp:
+ * NetworkProcess/NetworkProcessCreationParameters.h:
+ * NetworkProcess/NetworkResourceLoadParameters.h:
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::startNetworkLoad):
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
+ * NetworkProcess/cache/NetworkCacheStatistics.cpp:
+ * NetworkProcess/cache/NetworkCacheStorage.cpp:
+ (WebKit::NetworkCache::Storage::dispatchReadOperation):
+ (WebKit::NetworkCache::Storage::store):
+ * Shared/CacheModel.cpp:
+ (WebKit::calculateMemoryCacheSizes):
+ * Shared/CacheModel.h:
+ * Shared/mac/RemoteLayerBackingStoreCollection.mm:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::maximumBufferingTime):
+ * WebProcess/Plugins/PluginView.cpp:
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+ (WebKit::RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlushImmediately):
+ (WebKit::RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlush):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::m_resourceLoadStatisticsStore):
+ (WebKit::WebProcess::setCacheModel):
+
+2017-04-08 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Unreviewed attempt to fix GTK build after r215138.
</span><span class="cx">
</span><span class="cx"> * UIProcess/API/gtk/WebKitUIClient.cpp:
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><ins>+#include <wtf/Seconds.h>
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include "NetworkDataTaskCocoa.h"
</span><span class="lines">@@ -54,7 +55,7 @@
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx">
</span><span class="cx"> struct NetworkLoad::Throttle {
</span><del>- Throttle(NetworkLoad& load, std::chrono::milliseconds delay, ResourceResponse&& response, ResponseCompletionHandler&& handler)
</del><ins>+ Throttle(NetworkLoad& load, Seconds delay, ResourceResponse&& response, ResponseCompletionHandler&& handler)
</ins><span class="cx"> : timer(load, &NetworkLoad::throttleDelayCompleted)
</span><span class="cx"> , response(WTFMove(response))
</span><span class="cx"> , responseCompletionHandler(WTFMove(handler))
</span><span class="lines">@@ -378,7 +379,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto delay = NetworkProcess::singleton().loadThrottleLatency();
</span><del>- if (delay > 0ms) {
</del><ins>+ if (delay > 0_s) {
</ins><span class="cx"> m_throttle = std::make_unique<Throttle>(*this, delay, WTFMove(response), WTFMove(completionHandler));
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> void shouldPartitionCookiesForTopPrivatelyOwnedDomains(const Vector<String>& domainsToRemove, const Vector<String>& domainsToAdd);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- std::chrono::milliseconds loadThrottleLatency() const { return m_loadThrottleLatency; }
</del><ins>+ Seconds loadThrottleLatency() const { return m_loadThrottleLatency; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> NetworkProcess();
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> bool m_suppressMemoryPressureHandler { false };
</span><span class="cx"> bool m_diskCacheIsDisabledForTesting;
</span><span class="cx"> bool m_canHandleHTTPSServerTrustEvaluation;
</span><del>- std::chrono::milliseconds m_loadThrottleLatency;
</del><ins>+ Seconds m_loadThrottleLatency;
</ins><span class="cx">
</span><span class="cx"> typedef HashMap<const char*, std::unique_ptr<NetworkProcessSupplement>, PtrHash<const char*>> NetworkProcessSupplementMap;
</span><span class="cx"> NetworkProcessSupplementMap m_supplements;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -27,15 +27,12 @@
</span><span class="cx"> #include "NetworkProcessCreationParameters.h"
</span><span class="cx">
</span><span class="cx"> #include "ArgumentCoders.h"
</span><ins>+#include "WebCoreArgumentCoders.h"
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include "ArgumentCodersCF.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(SOUP)
-#include "WebCoreArgumentCoders.h"
-#endif
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> NetworkProcessCreationParameters::NetworkProcessCreationParameters()
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> bool shouldSuppressMemoryPressureHandler { false };
</span><span class="cx"> bool shouldUseTestingNetworkSession { false };
</span><del>- std::chrono::milliseconds loadThrottleLatency { 0ms };
</del><ins>+ Seconds loadThrottleLatency;
</ins><span class="cx">
</span><span class="cx"> Vector<String> urlSchemesRegisteredForCustomProtocols;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.h (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.h 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.h 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include <WebCore/ResourceLoaderOptions.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><ins>+#include <wtf/Seconds.h>
</ins><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx"> class Decoder;
</span><span class="lines">@@ -50,7 +51,7 @@
</span><span class="cx"> ResourceLoadIdentifier identifier { 0 };
</span><span class="cx"> Vector<RefPtr<SandboxExtension>> requestBodySandboxExtensions; // Created automatically for the sender.
</span><span class="cx"> RefPtr<SandboxExtension> resourceSandboxExtension; // Created automatically for the sender.
</span><del>- std::chrono::milliseconds maximumBufferingTime { 0ms };
</del><ins>+ Seconds maximumBufferingTime;
</ins><span class="cx"> Vector<String> derivedCachedDataTypesToRetrieve;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx">
</span><span class="cx"> consumeSandboxExtensions();
</span><span class="cx">
</span><del>- if (isSynchronous() || m_parameters.maximumBufferingTime > 0ms)
</del><ins>+ if (isSynchronous() || m_parameters.maximumBufferingTime > 0_s)
</ins><span class="cx"> m_bufferedData = SharedBuffer::create();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><ins>+#include <wtf/Seconds.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -46,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-static const auto preloadedEntryLifetime = 10s;
</del><ins>+static const Seconds preloadedEntryLifetime { 10_s };
</ins><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> static HashCountedSet<String>& allSpeculativeLoadingDiagnosticMessages()
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -39,12 +39,13 @@
</span><span class="cx"> #include <WebCore/SQLiteStatement.h>
</span><span class="cx"> #include <WebCore/SQLiteTransaction.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><ins>+#include <wtf/Seconds.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> namespace NetworkCache {
</span><span class="cx">
</span><span class="cx"> static const char* StatisticsDatabaseName = "WebKitCacheStatistics.db";
</span><del>-static const std::chrono::milliseconds mininumWriteInterval = std::chrono::milliseconds(10000);
</del><ins>+static const Seconds mininumWriteInterval { 10_s };
</ins><span class="cx">
</span><span class="cx"> static bool executeSQLCommand(WebCore::SQLiteDatabase& database, const String& sql)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -577,7 +577,7 @@
</span><span class="cx"> // Avoid randomness during testing.
</span><span class="cx"> if (m_mode != Mode::Testing) {
</span><span class="cx"> // I/O pressure may make disk operations slow. If they start taking very long time we rather go to network.
</span><del>- const auto readTimeout = 1500ms;
</del><ins>+ const Seconds readTimeout = 1500_ms;
</ins><span class="cx"> m_readOperationTimeoutTimer.startOneShot(readTimeout);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -800,7 +800,7 @@
</span><span class="cx">
</span><span class="cx"> // Delay the start of writes a bit to avoid affecting early page load.
</span><span class="cx"> // Completing writes will dispatch more writes without delay.
</span><del>- static const auto initialWriteDelay = 1s;
</del><ins>+ static const Seconds initialWriteDelay = 1_s;
</ins><span class="cx"> m_writeOperationDispatchTimer.startOneShot(initialWriteDelay);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCacheModelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CacheModel.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CacheModel.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/Shared/CacheModel.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -28,11 +28,12 @@
</span><span class="cx">
</span><span class="cx"> #include <algorithm>
</span><span class="cx"> #include <wtf/RAMSize.h>
</span><ins>+#include <wtf/Seconds.h>
</ins><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-void calculateMemoryCacheSizes(CacheModel cacheModel, unsigned& cacheTotalCapacity, unsigned& cacheMinDeadCapacity, unsigned& cacheMaxDeadCapacity, std::chrono::seconds& deadDecodedDataDeletionInterval, unsigned& pageCacheCapacity)
</del><ins>+void calculateMemoryCacheSizes(CacheModel cacheModel, unsigned& cacheTotalCapacity, unsigned& cacheMinDeadCapacity, unsigned& cacheMaxDeadCapacity, Seconds& deadDecodedDataDeletionInterval, unsigned& pageCacheCapacity)
</ins><span class="cx"> {
</span><span class="cx"> uint64_t memorySize = ramSize() / MB;
</span><span class="cx">
</span><span class="lines">@@ -109,7 +110,7 @@
</span><span class="cx"> // can prove that the overall system gain would justify the regression.
</span><span class="cx"> cacheMaxDeadCapacity = std::max(24u, cacheMaxDeadCapacity);
</span><span class="cx">
</span><del>- deadDecodedDataDeletionInterval = std::chrono::seconds { 60 };
</del><ins>+ deadDecodedDataDeletionInterval = 60_s;
</ins><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCacheModelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CacheModel.h (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CacheModel.h 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/Shared/CacheModel.h 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -23,11 +23,10 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef CacheModel_h
-#define CacheModel_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><del>-#include <chrono>
</del><span class="cx"> #include <stdint.h>
</span><ins>+#include <wtf/Seconds.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -37,9 +36,7 @@
</span><span class="cx"> CacheModelPrimaryWebBrowser
</span><span class="cx"> };
</span><span class="cx">
</span><del>-void calculateMemoryCacheSizes(CacheModel, unsigned& cacheTotalCapacity, unsigned& cacheMinDeadCapacity, unsigned& cacheMaxDeadCapacity, std::chrono::seconds& deadDecodedDataDeletionInterval, unsigned& pageCacheCapacity);
</del><ins>+void calculateMemoryCacheSizes(CacheModel, unsigned& cacheTotalCapacity, unsigned& cacheMinDeadCapacity, unsigned& cacheMaxDeadCapacity, Seconds& deadDecodedDataDeletionInterval, unsigned& pageCacheCapacity);
</ins><span class="cx"> void calculateURLCacheSizes(CacheModel, uint64_t diskFreeSize, unsigned& urlCacheMemoryCapacity, uint64_t& urlCacheDiskCapacity);
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // CacheModel_h
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerBackingStoreCollectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> const std::chrono::seconds volatileBackingStoreAgeThreshold = 1s;
</span><span class="cx"> const std::chrono::milliseconds volatileSecondaryBackingStoreAgeThreshold = 200ms;
</span><del>-const std::chrono::milliseconds volatilityTimerInterval = 200ms;
</del><ins>+const Seconds volatilityTimerInterval = 200_ms;
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> parameters.shouldSuppressMemoryPressureHandler = [defaults boolForKey:WebKitSuppressMemoryPressureHandlerDefaultsKey];
</span><del>- parameters.loadThrottleLatency = std::chrono::milliseconds([defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey]);
</del><ins>+ parameters.loadThrottleLatency = Seconds { [defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey] / 1000. };
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
</span><span class="cx"> RetainPtr<CFDataRef> cookieStorageData = adoptCF(CFHTTPCookieStorageCreateIdentifyingData(kCFAllocatorDefault, [[NSHTTPCookieStorage sharedHTTPCookieStorage] _cookieStorage]));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebLoaderStrategycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -99,10 +99,10 @@
</span><span class="cx"> return loader;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static std::chrono::milliseconds maximumBufferingTime(CachedResource* resource)
</del><ins>+static Seconds maximumBufferingTime(CachedResource* resource)
</ins><span class="cx"> {
</span><span class="cx"> if (!resource)
</span><del>- return 0ms;
</del><ins>+ return 0_s;
</ins><span class="cx">
</span><span class="cx"> switch (resource->type()) {
</span><span class="cx"> case CachedResource::CSSStyleSheet:
</span><span class="lines">@@ -111,9 +111,9 @@
</span><span class="cx"> case CachedResource::SVGFontResource:
</span><span class="cx"> #endif
</span><span class="cx"> case CachedResource::FontResource:
</span><del>- return std::chrono::milliseconds::max();
</del><ins>+ return Seconds::infinity();
</ins><span class="cx"> case CachedResource::ImageResource:
</span><del>- return 500ms;
</del><ins>+ return 500_ms;
</ins><span class="cx"> case CachedResource::MediaResource:
</span><span class="cx"> case CachedResource::MainResource:
</span><span class="cx"> case CachedResource::RawResource:
</span><span class="lines">@@ -128,11 +128,11 @@
</span><span class="cx"> #if ENABLE(XSLT)
</span><span class="cx"> case CachedResource::XSLStyleSheet:
</span><span class="cx"> #endif
</span><del>- return 0ms;
</del><ins>+ return 0_s;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return 0ms;
</del><ins>+ return 0_s;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResource* resource, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> // This simulated mouse click delay in HTMLPlugInImageElement.cpp should generally be the same or shorter than this delay.
</span><del>-static const auto pluginSnapshotTimerDelay = std::chrono::milliseconds { 1100 };
</del><ins>+static const Seconds pluginSnapshotTimerDelay { 1100_ms };
</ins><span class="cx">
</span><span class="cx"> class PluginView::URLRequest : public RefCounted<URLRequest> {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlushImmediately()
</span><span class="cx"> {
</span><del>- m_layerFlushTimer.startOneShot(0ms);
</del><ins>+ m_layerFlushTimer.startOneShot(0_s);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlush()
</span><span class="lines">@@ -304,9 +304,9 @@
</span><span class="cx"> if (m_layerFlushTimer.isActive())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- const auto initialFlushDelay = 500ms;
- const auto flushDelay = 1500ms;
- auto throttleDelay = m_isThrottlingLayerFlushes ? (m_isInitialThrottledLayerFlush ? initialFlushDelay : flushDelay) : 0ms;
</del><ins>+ const Seconds initialFlushDelay = 500_ms;
+ const Seconds flushDelay = 1500_ms;
+ Seconds throttleDelay = m_isThrottlingLayerFlushes ? (m_isInitialThrottledLayerFlush ? initialFlushDelay : flushDelay) : 0_s;
</ins><span class="cx"> m_isInitialThrottledLayerFlush = false;
</span><span class="cx">
</span><span class="cx"> m_layerFlushTimer.startOneShot(throttleDelay);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (215151 => 215152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2017-04-08 23:03:16 UTC (rev 215151)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2017-04-08 23:19:16 UTC (rev 215152)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> m_resourceLoadStatisticsStore->setNotificationCallback([this] {
</span><span class="cx"> if (m_statisticsChangedTimer.isActive())
</span><span class="cx"> return;
</span><del>- m_statisticsChangedTimer.startOneShot(std::chrono::seconds(5));
</del><ins>+ m_statisticsChangedTimer.startOneShot(5_s);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -540,7 +540,7 @@
</span><span class="cx"> unsigned cacheTotalCapacity = 0;
</span><span class="cx"> unsigned cacheMinDeadCapacity = 0;
</span><span class="cx"> unsigned cacheMaxDeadCapacity = 0;
</span><del>- auto deadDecodedDataDeletionInterval = std::chrono::seconds { 0 };
</del><ins>+ Seconds deadDecodedDataDeletionInterval;
</ins><span class="cx"> unsigned pageCacheSize = 0;
</span><span class="cx"> calculateMemoryCacheSizes(cacheModel, cacheTotalCapacity, cacheMinDeadCapacity, cacheMaxDeadCapacity, deadDecodedDataDeletionInterval, pageCacheSize);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>