Title: [268235] branches/safari-610.2.11.1-branch/Source/WebCore
Revision
268235
Author
repst...@apple.com
Date
2020-10-08 17:26:13 -0700 (Thu, 08 Oct 2020)

Log Message

Apply patch. rdar://problem/69594474

Modified Paths


Diff

Modified: branches/safari-610.2.11.1-branch/Source/WebCore/page/Page.cpp (268234 => 268235)


--- branches/safari-610.2.11.1-branch/Source/WebCore/page/Page.cpp	2020-10-09 00:24:42 UTC (rev 268234)
+++ branches/safari-610.2.11.1-branch/Source/WebCore/page/Page.cpp	2020-10-09 00:26:13 UTC (rev 268235)
@@ -1437,6 +1437,7 @@
         return;
     }
 
+    SetForScope<bool> change(m_inUpdateRendering, true);
     m_lastRenderingUpdateTimestamp = MonotonicTime::now();
 
     bool isSVGImagePage = chrome().client().isSVGImageChromeClient();
@@ -1443,8 +1444,6 @@
     if (!isSVGImagePage)
         tracePoint(RenderingUpdateStart);
 
-    SetForScope<bool> change(m_inUpdateRendering, true);
-
     layoutIfNeeded();
 
 #if ENABLE(ASYNC_SCROLLING)

Modified: branches/safari-610.2.11.1-branch/Source/WebCore/rendering/PaintFrequencyTracker.h (268234 => 268235)


--- branches/safari-610.2.11.1-branch/Source/WebCore/rendering/PaintFrequencyTracker.h	2020-10-09 00:24:42 UTC (rev 268234)
+++ branches/safari-610.2.11.1-branch/Source/WebCore/rendering/PaintFrequencyTracker.h	2020-10-09 00:26:13 UTC (rev 268235)
@@ -85,23 +85,19 @@
 class SinglePaintFrequencyTracking {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    SinglePaintFrequencyTracking(PaintFrequencyTracker& paintFrequencyTracker, MonotonicTime timestamp, bool track = true)
+    SinglePaintFrequencyTracking(PaintFrequencyTracker& paintFrequencyTracker, MonotonicTime timestamp)
         : m_paintFrequencyTracker(paintFrequencyTracker)
-        , m_track(track)
     {
-        if (m_track)
-            m_paintFrequencyTracker.begin(timestamp);
+        m_paintFrequencyTracker.begin(timestamp ? timestamp : MonotonicTime::now());
     }
 
     ~SinglePaintFrequencyTracking()
     {
-        if (m_track)
-            m_paintFrequencyTracker.end();
+        m_paintFrequencyTracker.end();
     }
 
 private:
     PaintFrequencyTracker& m_paintFrequencyTracker;
-    bool m_track;
 };
 
 }

Modified: branches/safari-610.2.11.1-branch/Source/WebCore/rendering/RenderLayer.cpp (268234 => 268235)


--- branches/safari-610.2.11.1-branch/Source/WebCore/rendering/RenderLayer.cpp	2020-10-09 00:24:42 UTC (rev 268234)
+++ branches/safari-610.2.11.1-branch/Source/WebCore/rendering/RenderLayer.cpp	2020-10-09 00:26:13 UTC (rev 268235)
@@ -4635,7 +4635,7 @@
     bool selectionAndBackgroundsOnly = paintingInfo.paintBehavior.contains(PaintBehavior::SelectionAndBackgroundsOnly);
     bool selectionOnly = paintingInfo.paintBehavior.contains(PaintBehavior::SelectionOnly);
 
-    SinglePaintFrequencyTracking singlePaintFrequencyTracking(m_paintFrequencyTracker, page().chrome().client().timestampForPaintFrequencyTracking(), shouldPaintContent && !context.performingPaintInvalidation());
+    SinglePaintFrequencyTracking singlePaintFrequencyTracking(m_paintFrequencyTracker, page().lastRenderingUpdateTimestamp());
 
     LayerFragments layerFragments;
     RenderObject* subtreePaintRootForRenderer = nullptr;
@@ -7034,7 +7034,7 @@
 
 void RenderLayer::simulateFrequentPaint()
 {
-    SinglePaintFrequencyTracking { m_paintFrequencyTracker, page().chrome().client().timestampForPaintFrequencyTracking() };
+    SinglePaintFrequencyTracking { m_paintFrequencyTracker, page().lastRenderingUpdateTimestamp() };
 }
 
 #if !LOG_DISABLED
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to