<!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>[202198] trunk/Source/WebCore</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/202198">202198</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-06-18 04:46:16 -0700 (Sat, 18 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use time literals in WebCore
https://bugs.webkit.org/show_bug.cgi?id=158905
Reviewed by Andreas Kling.
std::chrono::milliseconds(1) -> 1ms etc.
* dom/Document.cpp:
(WebCore::Document::minimumLayoutDelay):
(WebCore::Document::elapsedTime):
* fileapi/FileReader.cpp:
(WebCore::FileReader::create):
* inspector/InspectorOverlay.cpp:
(WebCore::InspectorOverlay::showPaintRect):
* loader/CrossOriginPreflightResultCache.cpp:
(WebCore::CrossOriginPreflightResultCache::CrossOriginPreflightResultCache):
* loader/ProgressTracker.cpp:
(WebCore::ProgressTracker::progressStarted):
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::freshnessLifetime):
* page/ChromeClient.h:
* page/DOMTimer.cpp:
(WebCore::DOMTimer::intervalClampedToMinimum):
(WebCore::DOMTimer::alignedFireTime):
* page/DOMTimer.h:
* page/FrameView.cpp:
(WebCore::FrameView::scrollPositionChanged):
* page/ResourceUsageThread.cpp:
(WebCore::ResourceUsageThread::threadBody):
* page/Settings.cpp:
(WebCore::Settings::Settings):
* page/mac/ServicesOverlayController.mm:
(WebCore::ServicesOverlayController::remainingTimeUntilHighlightShouldBeShown):
* platform/graphics/FontCache.cpp:
(WebCore::FontCache::fontForFamily):
* platform/network/CacheValidation.cpp:
(WebCore::computeCurrentAge):
(WebCore::computeFreshnessLifetimeForHTTPFamily):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiFileReadercpp">trunk/Source/WebCore/fileapi/FileReader.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderCrossOriginPreflightResultCachecpp">trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderProgressTrackercpp">trunk/Source/WebCore/loader/ProgressTracker.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebCorepageDOMTimercpp">trunk/Source/WebCore/page/DOMTimer.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMTimerh">trunk/Source/WebCore/page/DOMTimer.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageResourceUsageThreadcpp">trunk/Source/WebCore/page/ResourceUsageThread.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepagemacServicesOverlayControllermm">trunk/Source/WebCore/page/mac/ServicesOverlayController.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCachecpp">trunk/Source/WebCore/platform/graphics/FontCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkCacheValidationcpp">trunk/Source/WebCore/platform/network/CacheValidation.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202197 => 202198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-18 05:53:28 UTC (rev 202197)
+++ trunk/Source/WebCore/ChangeLog 2016-06-18 11:46:16 UTC (rev 202198)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2016-06-18 Antti Koivisto <antti@apple.com>
+
+ Use time literals in WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=158905
+
+ Reviewed by Andreas Kling.
+
+ std::chrono::milliseconds(1) -> 1ms etc.
+
+ * dom/Document.cpp:
+ (WebCore::Document::minimumLayoutDelay):
+ (WebCore::Document::elapsedTime):
+ * fileapi/FileReader.cpp:
+ (WebCore::FileReader::create):
+ * inspector/InspectorOverlay.cpp:
+ (WebCore::InspectorOverlay::showPaintRect):
+ * loader/CrossOriginPreflightResultCache.cpp:
+ (WebCore::CrossOriginPreflightResultCache::CrossOriginPreflightResultCache):
+ * loader/ProgressTracker.cpp:
+ (WebCore::ProgressTracker::progressStarted):
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::freshnessLifetime):
+ * page/ChromeClient.h:
+ * page/DOMTimer.cpp:
+ (WebCore::DOMTimer::intervalClampedToMinimum):
+ (WebCore::DOMTimer::alignedFireTime):
+ * page/DOMTimer.h:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::scrollPositionChanged):
+ * page/ResourceUsageThread.cpp:
+ (WebCore::ResourceUsageThread::threadBody):
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ * page/mac/ServicesOverlayController.mm:
+ (WebCore::ServicesOverlayController::remainingTimeUntilHighlightShouldBeShown):
+ * platform/graphics/FontCache.cpp:
+ (WebCore::FontCache::fontForFamily):
+ * platform/network/CacheValidation.cpp:
+ (WebCore::computeCurrentAge):
+ (WebCore::computeFreshnessLifetimeForHTTPFamily):
+
</ins><span class="cx"> 2016-06-17 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> :indeterminate pseudo-class should match radios whose group has no checked radio
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (202197 => 202198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-06-18 05:53:28 UTC (rev 202197)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-06-18 11:46:16 UTC (rev 202198)
</span><span class="lines">@@ -2849,13 +2849,13 @@
</span><span class="cx"> std::chrono::milliseconds Document::minimumLayoutDelay()
</span><span class="cx"> {
</span><span class="cx"> if (m_overMinimumLayoutThreshold)
</span><del>- return std::chrono::milliseconds(0);
</del><ins>+ return 0ms;
</ins><span class="cx">
</span><del>- std::chrono::milliseconds elapsed = elapsedTime();
</del><ins>+ auto elapsed = elapsedTime();
</ins><span class="cx"> m_overMinimumLayoutThreshold = elapsed > settings()->layoutInterval();
</span><span class="cx">
</span><span class="cx"> // We'll want to schedule the timer to fire at the minimum layout threshold.
</span><del>- return std::max(std::chrono::milliseconds(0), settings()->layoutInterval() - elapsed);
</del><ins>+ return std::max(0ms, settings()->layoutInterval() - elapsed);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::chrono::milliseconds Document::elapsedTime() const
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileReadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/FileReader.cpp (202197 => 202198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileReader.cpp 2016-06-18 05:53:28 UTC (rev 202197)
+++ trunk/Source/WebCore/fileapi/FileReader.cpp 2016-06-18 11:46:16 UTC (rev 202198)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static const auto progressNotificationInterval = std::chrono::milliseconds(50);
</del><ins>+static const auto progressNotificationInterval = 50ms;
</ins><span class="cx">
</span><span class="cx"> Ref<FileReader> FileReader::create(ScriptExecutionContext& context)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (202197 => 202198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2016-06-18 05:53:28 UTC (rev 202197)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2016-06-18 11:46:16 UTC (rev 202198)
</span><span class="lines">@@ -505,7 +505,7 @@
</span><span class="cx">
</span><span class="cx"> IntRect rootRect = m_page.mainFrame().view()->contentsToRootView(enclosingIntRect(rect));
</span><span class="cx">
</span><del>- const std::chrono::milliseconds removeDelay = std::chrono::milliseconds(250);
</del><ins>+ const auto removeDelay = 250ms;
</ins><span class="cx">
</span><span class="cx"> std::chrono::steady_clock::time_point removeTime = std::chrono::steady_clock::now() + removeDelay;
</span><span class="cx"> m_paintRects.append(TimeRectPair(removeTime, rootRect));
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderCrossOriginPreflightResultCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp (202197 => 202198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp 2016-06-18 05:53:28 UTC (rev 202197)
+++ trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp 2016-06-18 11:46:16 UTC (rev 202198)
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // These values are at the discretion of the user agent.
</span><del>-static const auto defaultPreflightCacheTimeout = std::chrono::seconds(5);
-static const auto maxPreflightCacheTimeout = std::chrono::seconds(600); // Should be short enough to minimize the risk of using a poisoned cache after switching to a secure network.
</del><ins>+static const auto defaultPreflightCacheTimeout = 5s;
+static const auto maxPreflightCacheTimeout = 600s; // Should be short enough to minimize the risk of using a poisoned cache after switching to a secure network.
</ins><span class="cx">
</span><span class="cx"> CrossOriginPreflightResultCache::CrossOriginPreflightResultCache()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderProgressTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ProgressTracker.cpp (202197 => 202198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ProgressTracker.cpp 2016-06-18 05:53:28 UTC (rev 202197)
+++ trunk/Source/WebCore/loader/ProgressTracker.cpp 2016-06-18 11:46:16 UTC (rev 202198)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> // How many bytes are required between heartbeats to consider it progress.
</span><span class="cx"> static const unsigned minumumBytesPerHeartbeatForProgress = 1024;
</span><span class="cx">
</span><del>-static const std::chrono::milliseconds progressNotificationTimeInterval = std::chrono::milliseconds(200);
</del><ins>+static const auto progressNotificationTimeInterval = 200ms;
</ins><span class="cx">
</span><span class="cx"> struct ProgressItem {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(ProgressItem); WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> bool isMainFrame = !m_originatingProgressFrame->tree().parent();
</span><span class="cx"> auto elapsedTimeSinceMainLoadComplete = std::chrono::steady_clock::now() - m_mainLoadCompletionTime;
</span><span class="cx">
</span><del>- static const auto subframePartOfMainLoadThreshold = std::chrono::seconds(1);
</del><ins>+ static const auto subframePartOfMainLoadThreshold = 1s;
</ins><span class="cx"> m_isMainLoad = isMainFrame || elapsedTimeSinceMainLoadComplete < subframePartOfMainLoadThreshold;
</span><span class="cx">
</span><span class="cx"> m_client.progressStarted(*m_originatingProgressFrame);
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (202197 => 202198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-06-18 05:53:28 UTC (rev 202197)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-06-18 11:46:16 UTC (rev 202198)
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx"> // FIXME: We should not cache subresources either, but when we tried this
</span><span class="cx"> // it caused performance and flakiness issues in our test infrastructure.
</span><span class="cx"> if (m_type == MainResource || SchemeRegistry::shouldAlwaysRevalidateURLScheme(protocol))
</span><del>- return std::chrono::microseconds::zero();
</del><ins>+ return 0us;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return std::chrono::microseconds::max();
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (202197 => 202198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2016-06-18 05:53:28 UTC (rev 202197)
+++ trunk/Source/WebCore/page/ChromeClient.h 2016-06-18 11:46:16 UTC (rev 202198)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> virtual void didPreventDefaultForEvent() = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual std::chrono::milliseconds eventThrottlingDelay() { return std::chrono::milliseconds::zero(); };
</del><ins>+ virtual std::chrono::milliseconds eventThrottlingDelay() { return 0ms; };
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual void didReceiveMobileDocType(bool) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMTimer.cpp (202197 => 202198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMTimer.cpp 2016-06-18 05:53:28 UTC (rev 202197)
+++ trunk/Source/WebCore/page/DOMTimer.cpp 2016-06-18 11:46:16 UTC (rev 202198)
</span><span class="lines">@@ -52,8 +52,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static const std::chrono::milliseconds maxIntervalForUserGestureForwarding = std::chrono::milliseconds(1000); // One second matches Gecko.
-static const std::chrono::milliseconds minIntervalForNonUserObservableChangeTimers = std::chrono::milliseconds(1000); // Empirically determined to maximize battery life.
</del><ins>+static const auto maxIntervalForUserGestureForwarding = 1000ms; // One second matches Gecko.
+static const auto minIntervalForNonUserObservableChangeTimers = 1000ms; // Empirically determined to maximize battery life.
</ins><span class="cx"> static const int maxTimerNestingLevel = 5;
</span><span class="cx">
</span><span class="cx"> class DOMTimerFireState {
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx"> ASSERT(scriptExecutionContext());
</span><span class="cx"> ASSERT(m_nestingLevel <= maxTimerNestingLevel);
</span><span class="cx">
</span><del>- auto interval = std::max(std::chrono::milliseconds(1), m_originalInterval);
</del><ins>+ auto interval = std::max(1ms, m_originalInterval);
</ins><span class="cx">
</span><span class="cx"> // Only apply throttling to repeating timers.
</span><span class="cx"> if (m_nestingLevel < maxTimerNestingLevel)
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx"> Optional<std::chrono::milliseconds> DOMTimer::alignedFireTime(std::chrono::milliseconds fireTime) const
</span><span class="cx"> {
</span><span class="cx"> auto alignmentInterval = scriptExecutionContext()->timerAlignmentInterval(m_nestingLevel >= maxTimerNestingLevel);
</span><del>- if (alignmentInterval == std::chrono::milliseconds::zero())
</del><ins>+ if (alignmentInterval == 0ms)
</ins><span class="cx"> return Nullopt;
</span><span class="cx">
</span><span class="cx"> static const double randomizedProportion = randomNumber();
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMTimer.h (202197 => 202198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMTimer.h 2016-06-18 05:53:28 UTC (rev 202197)
+++ trunk/Source/WebCore/page/DOMTimer.h 2016-06-18 11:46:16 UTC (rev 202198)
</span><span class="lines">@@ -46,9 +46,9 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~DOMTimer();
</span><span class="cx">
</span><del>- static std::chrono::milliseconds defaultMinimumInterval() { return std::chrono::milliseconds(4); }
- static std::chrono::milliseconds defaultAlignmentInterval() { return std::chrono::milliseconds::zero(); }
- static std::chrono::milliseconds hiddenPageAlignmentInterval() { return std::chrono::milliseconds(1000); }
</del><ins>+ static std::chrono::milliseconds defaultMinimumInterval() { return 4ms; }
+ static std::chrono::milliseconds defaultAlignmentInterval() { return 0ms; }
+ static std::chrono::milliseconds hiddenPageAlignmentInterval() { return 1000ms; }
</ins><span class="cx">
</span><span class="cx"> // Creates a new timer owned by specified ScriptExecutionContext, starts it
</span><span class="cx"> // and returns its Id.
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (202197 => 202198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2016-06-18 05:53:28 UTC (rev 202197)
+++ trunk/Source/WebCore/page/FrameView.cpp 2016-06-18 11:46:16 UTC (rev 202198)
</span><span class="lines">@@ -2222,9 +2222,9 @@
</span><span class="cx"> void FrameView::scrollPositionChanged(const ScrollPosition& oldPosition, const ScrollPosition& newPosition)
</span><span class="cx"> {
</span><span class="cx"> Page* page = frame().page();
</span><del>- auto throttlingDelay = page ? page->chrome().client().eventThrottlingDelay() : std::chrono::milliseconds::zero();
</del><ins>+ auto throttlingDelay = page ? page->chrome().client().eventThrottlingDelay() : 0ms;
</ins><span class="cx">
</span><del>- if (throttlingDelay == std::chrono::milliseconds::zero()) {
</del><ins>+ if (throttlingDelay == 0ms) {
</ins><span class="cx"> m_delayedScrollEventTimer.stop();
</span><span class="cx"> sendScrollEvent();
</span><span class="cx"> } else if (!m_delayedScrollEventTimer.isActive())
</span></span></pre></div>
<a id="trunkSourceWebCorepageResourceUsageThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ResourceUsageThread.cpp (202197 => 202198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ResourceUsageThread.cpp 2016-06-18 05:53:28 UTC (rev 202197)
+++ trunk/Source/WebCore/page/ResourceUsageThread.cpp 2016-06-18 11:46:16 UTC (rev 202198)
</span><span class="lines">@@ -119,8 +119,8 @@
</span><span class="cx"> platformThreadBody(m_vm, data);
</span><span class="cx"> notifyObservers(WTFMove(data));
</span><span class="cx">
</span><del>- auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - start);
- auto difference = std::chrono::milliseconds(500) - duration;
</del><ins>+ auto duration = std::chrono::system_clock::now() - start;
+ auto difference = 500ms - duration;
</ins><span class="cx"> std::this_thread::sleep_for(difference);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (202197 => 202198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp 2016-06-18 05:53:28 UTC (rev 202197)
+++ trunk/Source/WebCore/page/Settings.cpp 2016-06-18 11:46:16 UTC (rev 202198)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> // This amount of time must have elapsed before we will even consider scheduling a layout without a delay.
</span><span class="cx"> // FIXME: For faster machines this value can really be lowered to 200. 250 is adequate, but a little high
</span><span class="cx"> // for dual G5s. :)
</span><del>-static const auto layoutScheduleThreshold = std::chrono::milliseconds(250);
</del><ins>+static const auto layoutScheduleThreshold = 250ms;
</ins><span class="cx">
</span><span class="cx"> Settings::Settings(Page* page)
</span><span class="cx"> : m_page(nullptr)
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacServicesOverlayControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/ServicesOverlayController.mm (202197 => 202198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2016-06-18 05:53:28 UTC (rev 202197)
+++ trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2016-06-18 11:46:16 UTC (rev 202198)
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx"> std::chrono::milliseconds ServicesOverlayController::remainingTimeUntilHighlightShouldBeShown(Highlight* highlight) const
</span><span class="cx"> {
</span><span class="cx"> if (!highlight)
</span><del>- return std::chrono::milliseconds::zero();
</del><ins>+ return 0ms;
</ins><span class="cx">
</span><span class="cx"> auto minimumTimeUntilHighlightShouldBeShown = 200ms;
</span><span class="cx"> Page* page = m_mainFrame.page();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.cpp (202197 => 202198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.cpp 2016-06-18 05:53:28 UTC (rev 202197)
+++ trunk/Source/WebCore/platform/graphics/FontCache.cpp 2016-06-18 11:46:16 UTC (rev 202198)
</span><span class="lines">@@ -327,7 +327,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(std::chrono::milliseconds::zero());
</del><ins>+ m_purgeTimer.startOneShot(0ms);
</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="trunkSourceWebCoreplatformnetworkCacheValidationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/CacheValidation.cpp (202197 => 202198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/CacheValidation.cpp 2016-06-18 05:53:28 UTC (rev 202197)
+++ trunk/Source/WebCore/platform/network/CacheValidation.cpp 2016-06-18 11:46:16 UTC (rev 202198)
</span><span class="lines">@@ -103,8 +103,8 @@
</span><span class="cx"> // http://tools.ietf.org/html/rfc7234#section-4.2.3
</span><span class="cx"> // No compensation for latency as that is not terribly important in practice.
</span><span class="cx"> auto dateValue = response.date();
</span><del>- auto apparentAge = dateValue ? std::max(microseconds::zero(), duration_cast<microseconds>(responseTime - dateValue.value())) : microseconds::zero();
- auto ageValue = response.age().valueOr(microseconds::zero());
</del><ins>+ auto apparentAge = dateValue ? std::max(0us, duration_cast<microseconds>(responseTime - *dateValue)) : 0us;
+ auto ageValue = response.age().valueOr(0us);
</ins><span class="cx"> auto correctedInitialAge = std::max(apparentAge, ageValue);
</span><span class="cx"> auto residentTime = duration_cast<microseconds>(system_clock::now() - responseTime);
</span><span class="cx"> return correctedInitialAge + residentTime;
</span><span class="lines">@@ -119,26 +119,25 @@
</span><span class="cx"> // http://tools.ietf.org/html/rfc7234#section-4.2.1
</span><span class="cx"> auto maxAge = response.cacheControlMaxAge();
</span><span class="cx"> if (maxAge)
</span><del>- return maxAge.value();
- auto expires = response.expires();
</del><ins>+ return *maxAge;
+
</ins><span class="cx"> auto date = response.date();
</span><del>- auto dateValue = date ? date.value() : responseTime;
- if (expires)
- return duration_cast<microseconds>(expires.value() - dateValue);
</del><ins>+ auto effectiveDate = date.valueOr(responseTime);
+ if (auto expires = response.expires())
+ return duration_cast<microseconds>(*expires - effectiveDate);
</ins><span class="cx">
</span><span class="cx"> // Implicit lifetime.
</span><span class="cx"> switch (response.httpStatusCode()) {
</span><span class="cx"> case 301: // Moved Permanently
</span><span class="cx"> case 410: // Gone
</span><span class="cx"> // These are semantically permanent and so get long implicit lifetime.
</span><del>- return hours(365 * 24);
</del><ins>+ return 365 * 24h;
</ins><span class="cx"> default:
</span><span class="cx"> // Heuristic Freshness:
</span><span class="cx"> // http://tools.ietf.org/html/rfc7234#section-4.2.2
</span><del>- auto lastModified = response.lastModified();
- if (lastModified)
- return duration_cast<microseconds>((dateValue - lastModified.value()) * 0.1);
- return microseconds::zero();
</del><ins>+ if (auto lastModified = response.lastModified())
+ return duration_cast<microseconds>((effectiveDate - *lastModified) * 0.1);
+ return 0us;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>