Changeset 273396 in webkit

Timestamp:

Feb 24, 2021, 9:10:31 AM (5 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r273220. rdar://problem/74623537

[Paint Timing] Return early from contentful paint check when no contentful pixels/characters at all
​https://bugs.webkit.org/show_bug.cgi?id=222245

Reviewed by Simon Fraser.

Bail from recursive contenful-paint check if there are no pixels/text characters in the entire document.

Covered by existing tests, an optimization only.

• dom/Document.cpp: (WebCore::Document::enqueuePaintTimingEntryIfNeeded):
• page/FrameView.cpp: (WebCore::FrameView::hasContenfulDescendants const):
• page/FrameView.h:

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@273220 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-611-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• page/FrameView.h (modified) (1 diff)

branches/safari-611-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-23  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r273220. rdar://problem/74623537
+
+    [Paint Timing] Return early from contentful paint check when no contentful pixels/characters at all
+    https://bugs.webkit.org/show_bug.cgi?id=222245
+    
+    Reviewed by Simon Fraser.
+    
+    Bail from recursive contenful-paint check if there are no pixels/text characters in the entire document.
+    
+    Covered by existing tests, an optimization only.
+    
+    * dom/Document.cpp:
+    (WebCore::Document::enqueuePaintTimingEntryIfNeeded):
+    * page/FrameView.cpp:
+    (WebCore::FrameView::hasContenfulDescendants const):
+    * page/FrameView.h:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273220 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-02-21  Noam Rosenthal  <noam@webkit.org>
+
+            [Paint Timing] Return early from contentful paint check when no contentful pixels/characters at all
+            https://bugs.webkit.org/show_bug.cgi?id=222245
+
+            Reviewed by Simon Fraser.
+
+            Bail from recursive contenful-paint check if there are no pixels/text characters in the entire document.
+
+            Covered by existing tests, an optimization only.
+
+            * dom/Document.cpp:
+            (WebCore::Document::enqueuePaintTimingEntryIfNeeded):
+            * page/FrameView.cpp:
+            (WebCore::FrameView::hasContenfulDescendants const):
+            * page/FrameView.h:
+
 2021-02-23  Alan Coon  <alancoon@apple.com>
 

branches/safari-611-branch/Source/WebCore/dom/Document.cpp

@@ -3274 +3274 @@
         return;
 
+    if (!view()->hasContenfulDescendants())
+        return;
+
     if (!ContentfulPaintChecker::qualifiesForContentfulPaint(*view()))
         return;

branches/safari-611-branch/Source/WebCore/page/FrameView.cpp

@@ -4606 +4606 @@
 }
 
+bool FrameView::hasContenfulDescendants() const
+{
+    return m_visuallyNonEmptyCharacterCount || m_visuallyNonEmptyPixelCount;
+}
+
 bool FrameView::isViewForDocumentInFrame() const
 {

branches/safari-611-branch/Source/WebCore/page/FrameView.h

@@ -414 +414 @@
     void incrementVisuallyNonEmptyPixelCount(const IntSize&);
     bool isVisuallyNonEmpty() const { return m_contentQualifiesAsVisuallyNonEmpty; }
+    bool hasContenfulDescendants() const;
     void checkAndDispatchDidReachVisuallyNonEmptyState();