Changeset 202198 in webkit

Timestamp:

Jun 18, 2016, 4:46:16 AM (9 years ago)

Author:

Antti Koivisto

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• fileapi/FileReader.cpp (modified) (1 diff)
• inspector/InspectorOverlay.cpp (modified) (1 diff)
• loader/CrossOriginPreflightResultCache.cpp (modified) (1 diff)
• loader/ProgressTracker.cpp (modified) (2 diffs)
• loader/cache/CachedResource.cpp (modified) (1 diff)
• page/ChromeClient.h (modified) (1 diff)
• page/DOMTimer.cpp (modified) (3 diffs)
• page/DOMTimer.h (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• page/ResourceUsageThread.cpp (modified) (1 diff)
• page/Settings.cpp (modified) (1 diff)
• page/mac/ServicesOverlayController.mm (modified) (1 diff)
• platform/graphics/FontCache.cpp (modified) (1 diff)
• platform/network/CacheValidation.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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):
+
 2016-06-17  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -2850 +2850 @@
 {
     if (m_overMinimumLayoutThreshold)
-        return std::chrono::milliseconds(0);
+        return 0ms;
     
-    std::chrono::milliseconds elapsed = elapsedTime();
+    auto elapsed = elapsedTime();
     m_overMinimumLayoutThreshold = elapsed > settings()->layoutInterval();
 
     // We'll want to schedule the timer to fire at the minimum layout threshold.
-    return std::max(std::chrono::milliseconds(0), settings()->layoutInterval() - elapsed);
+    return std::max(0ms, settings()->layoutInterval() - elapsed);
 }
 

trunk/Source/WebCore/fileapi/FileReader.cpp

@@ -44 +44 @@
 namespace WebCore {
 
-static const auto progressNotificationInterval = std::chrono::milliseconds(50);
+static const auto progressNotificationInterval = 50ms;
 
 Ref<FileReader> FileReader::create(ScriptExecutionContext& context)

trunk/Source/WebCore/inspector/InspectorOverlay.cpp

@@ -506 +506 @@
     IntRect rootRect = m_page.mainFrame().view()->contentsToRootView(enclosingIntRect(rect));
 
-    const std::chrono::milliseconds removeDelay = std::chrono::milliseconds(250);
+    const auto removeDelay = 250ms;
 
     std::chrono::steady_clock::time_point removeTime = std::chrono::steady_clock::now() + removeDelay;

trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp

@@ -38 +38 @@
 
 // These values are at the discretion of the user agent.
-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.
+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.
 
 CrossOriginPreflightResultCache::CrossOriginPreflightResultCache()

trunk/Source/WebCore/loader/ProgressTracker.cpp

@@ -61 +61 @@
 static const unsigned minumumBytesPerHeartbeatForProgress = 1024;
 
-static const std::chrono::milliseconds progressNotificationTimeInterval = std::chrono::milliseconds(200);
+static const auto progressNotificationTimeInterval = 200ms;
 
 struct ProgressItem {
@@ -138 +138 @@
         auto elapsedTimeSinceMainLoadComplete = std::chrono::steady_clock::now() - m_mainLoadCompletionTime;
 
-        static const auto subframePartOfMainLoadThreshold = std::chrono::seconds(1);
+        static const auto subframePartOfMainLoadThreshold = 1s;
         m_isMainLoad = isMainFrame || elapsedTimeSinceMainLoadComplete < subframePartOfMainLoadThreshold;
 

trunk/Source/WebCore/loader/cache/CachedResource.cpp

@@ -393 +393 @@
             // it caused performance and flakiness issues in our test infrastructure.
             if (m_type == MainResource || SchemeRegistry::shouldAlwaysRevalidateURLScheme(protocol))
-                return std::chrono::microseconds::zero();
+                return 0us;
         }
 

trunk/Source/WebCore/page/ChromeClient.h

@@ -240 +240 @@
 #endif
 
-    virtual std::chrono::milliseconds eventThrottlingDelay() { return std::chrono::milliseconds::zero(); };
+    virtual std::chrono::milliseconds eventThrottlingDelay() { return 0ms; };
 
 #if PLATFORM(IOS)

trunk/Source/WebCore/page/DOMTimer.cpp

@@ -53 +53 @@
 namespace WebCore {
 
-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.
+static const auto maxIntervalForUserGestureForwarding = 1000ms; // One second matches Gecko.
+static const auto minIntervalForNonUserObservableChangeTimers = 1000ms; // Empirically determined to maximize battery life.
 static const int maxTimerNestingLevel = 5;
 
@@ -407 +407 @@
     ASSERT(m_nestingLevel <= maxTimerNestingLevel);
 
-    auto interval = std::max(std::chrono::milliseconds(1), m_originalInterval);
+    auto interval = std::max(1ms, m_originalInterval);
 
     // Only apply throttling to repeating timers.
@@ -423 +423 @@
 {
     auto alignmentInterval = scriptExecutionContext()->timerAlignmentInterval(m_nestingLevel >= maxTimerNestingLevel);
-    if (alignmentInterval == std::chrono::milliseconds::zero())
+    if (alignmentInterval == 0ms)
         return Nullopt;
     

trunk/Source/WebCore/page/DOMTimer.h

@@ -47 +47 @@
     virtual ~DOMTimer();
 
-    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); }
+    static std::chrono::milliseconds defaultMinimumInterval() { return 4ms; }
+    static std::chrono::milliseconds defaultAlignmentInterval() { return 0ms; }
+    static std::chrono::milliseconds hiddenPageAlignmentInterval() { return 1000ms; }
 
     // Creates a new timer owned by specified ScriptExecutionContext, starts it

trunk/Source/WebCore/page/FrameView.cpp

@@ -2223 +2223 @@
 {
     Page* page = frame().page();
-    auto throttlingDelay = page ? page->chrome().client().eventThrottlingDelay() : std::chrono::milliseconds::zero();
-
-    if (throttlingDelay == std::chrono::milliseconds::zero()) {
+    auto throttlingDelay = page ? page->chrome().client().eventThrottlingDelay() : 0ms;
+
+    if (throttlingDelay == 0ms) {
         m_delayedScrollEventTimer.stop();
         sendScrollEvent();

trunk/Source/WebCore/page/ResourceUsageThread.cpp

@@ -120 +120 @@
         notifyObservers(WTFMove(data));
 
-        auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - start);
-        auto difference = std::chrono::milliseconds(500) - duration;
+        auto duration = std::chrono::system_clock::now() - start;
+        auto difference = 500ms - duration;
         std::this_thread::sleep_for(difference);
     }

trunk/Source/WebCore/page/Settings.cpp

@@ -176 +176 @@
 // FIXME: For faster machines this value can really be lowered to 200. 250 is adequate, but a little high
 // for dual G5s. :)
-static const auto layoutScheduleThreshold = std::chrono::milliseconds(250);
+static const auto layoutScheduleThreshold = 250ms;
 
 Settings::Settings(Page* page)

trunk/Source/WebCore/page/mac/ServicesOverlayController.mm

@@ -437 +437 @@
 {
     if (!highlight)
-        return std::chrono::milliseconds::zero();
+        return 0ms;
 
     auto minimumTimeUntilHighlightShouldBeShown = 200ms;

trunk/Source/WebCore/platform/graphics/FontCache.cpp

@@ -328 +328 @@
 {
     if (!m_purgeTimer.isActive())
-        m_purgeTimer.startOneShot(std::chrono::milliseconds::zero());
+        m_purgeTimer.startOneShot(0ms);
 
     FontPlatformData* platformData = getCachedFontPlatformData(fontDescription, family, fontFaceFeatures, fontFaceVariantSettings, checkingAlternateName);

trunk/Source/WebCore/platform/network/CacheValidation.cpp

@@ -104 +104 @@
     // No compensation for latency as that is not terribly important in practice.
     auto dateValue = response.date();
-    auto apparentAge = dateValue ? std::max(microseconds::zero(), duration_cast<microseconds>(responseTime - dateValue.value())) : microseconds::zero();
-    auto ageValue = response.age().valueOr(microseconds::zero());
+    auto apparentAge = dateValue ? std::max(0us, duration_cast<microseconds>(responseTime - *dateValue)) : 0us;
+    auto ageValue = response.age().valueOr(0us);
     auto correctedInitialAge = std::max(apparentAge, ageValue);
     auto residentTime = duration_cast<microseconds>(system_clock::now() - responseTime);
@@ -120 +120 @@
     auto maxAge = response.cacheControlMaxAge();
     if (maxAge)
-        return maxAge.value();
-    auto expires = response.expires();
+        return *maxAge;
+
     auto date = response.date();
-    auto dateValue = date ? date.value() : responseTime;
-    if (expires)
-        return duration_cast<microseconds>(expires.value() - dateValue);
+    auto effectiveDate = date.valueOr(responseTime);
+    if (auto expires = response.expires())
+        return duration_cast<microseconds>(*expires - effectiveDate);
 
     // Implicit lifetime.
@@ -132 +132 @@
     case 410: // Gone
         // These are semantically permanent and so get long implicit lifetime.
-        return hours(365 * 24);
+        return 365 * 24h;
     default:
         // Heuristic Freshness:
         // http://tools.ietf.org/html/rfc7234#section-4.2.2
-        auto lastModified = response.lastModified();
-        if (lastModified)
-            return duration_cast<microseconds>((dateValue - lastModified.value()) * 0.1);
-        return microseconds::zero();
+        if (auto lastModified = response.lastModified())
+            return duration_cast<microseconds>((effectiveDate - *lastModified) * 0.1);
+        return 0us;
     }
 }