Attachment 360160 Details for Bug 193842 – Patch

[patch] Patch

bug-193842-20190125135813.patch (text/plain), 7.41 KB, created by zalan on 2019-01-25 13:58:19 PST

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-01-25 13:58:19 PST

Size: 7.41 KB

patch

obsolete

>Subversion Revision: 240497
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 949d6d16b9cf66150ddc066b09ef79582a598047..88d866969d4f32aebb5b42657f87139e405cf672 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2019-01-25  Zalan Bujtas  <zalan@apple.com>
>+
>+        Remove FrameView::m_significantRenderedTextMilestonePending
>+        https://bugs.webkit.org/show_bug.cgi?id=193842
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        WIP.
>+
>+        * page/FrameView.cpp:
>+        (WebCore::FrameView::resetLayoutMilestones):
>+        (WebCore::FrameView::incrementVisuallyNonEmptyCharacterCount):
>+        (WebCore::FrameView::hasReachedSignificantRenderedTextThreashold):
>+        (WebCore::FrameView::qualifiesAsSignificantRenderedText const):
>+        (WebCore::FrameView::fireLayoutRelatedMilestonesIfNeeded):
>+        (WebCore::FrameView::updateSignificantRenderedTextMilestoneIfNeeded): Deleted.
>+        * page/FrameView.h:
>+
> 2019-01-25  Zalan Bujtas  <zalan@apple.com>
> 
>         Remove FrameView::m_firstVisuallyNonEmptyLayoutCallbackPending
>diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
>index 4e37baa5c9ed4311f42ff40ac43cb2bb4991f026..9d0fa6c8365a0a6e98cf70e480b90a3227ffb451 100644
>--- a/Source/WebCore/page/FrameView.cpp
>+++ b/Source/WebCore/page/FrameView.cpp
>@@ -293,7 +293,7 @@ void FrameView::resetLayoutMilestones()
> {
>     m_firstLayoutCallbackPending = false;
>     m_isVisuallyNonEmpty = false;
>-    m_significantRenderedTextMilestonePending = true;
>+    m_hasReachedSignificantRenderedTextThreshold = false;
>     m_renderedSignificantAmountOfText = false;
>     m_visuallyNonEmptyCharacterCount = 0;
>     m_visuallyNonEmptyPixelCount = 0;
>@@ -3307,8 +3307,7 @@ void FrameView::performPostLayoutTasks()
> {
>     // FIXME: We should not run any JavaScript code in this function.
>     LOG(Layout, "FrameView %p performPostLayoutTasks", this);
>-
>-    frame().document()->updateMainArticleElementAfterLayout();
>+    updateHasReachedSignificantRenderedTextThreshold();
>     frame().selection().updateAppearanceAfterLayout();
> 
>     flushPostLayoutTasksQueue();
>@@ -4387,11 +4386,9 @@ void FrameView::updateLayoutAndStyleIfNeededRecursive()
> 
> void FrameView::incrementVisuallyNonEmptyCharacterCount(const String& inlineText)
> {
>-    if (m_visuallyNonEmptyCharacterCount > visualCharacterThreshold && m_renderedSignificantAmountOfText)
>+    if (m_visuallyNonEmptyCharacterCount > visualCharacterThreshold && m_hasReachedSignificantRenderedTextThreshold)
>         return;
> 
>-    ++m_textRendererCountForVisuallyNonEmptyCharacters;
>-
>     auto nonWhitespaceLength = [](auto& inlineText) {
>         auto length = inlineText.length();
>         for (unsigned i = 0; i < inlineText.length(); ++i) {
>@@ -4402,9 +4399,7 @@ void FrameView::incrementVisuallyNonEmptyCharacterCount(const String& inlineText
>         return length;
>     };
>     m_visuallyNonEmptyCharacterCount += nonWhitespaceLength(inlineText);
>-
>-    if (!m_renderedSignificantAmountOfText)
>-        updateSignificantRenderedTextMilestoneIfNeeded();
>+    ++m_textRendererCountForVisuallyNonEmptyCharacters;
> }
> 
> static bool elementOverflowRectIsLargerThanThreshold(const Element& element)
>@@ -4490,29 +4485,40 @@ bool FrameView::qualifiesAsVisuallyNonEmpty() const
>     return false;
> }
> 
>-void FrameView::updateSignificantRenderedTextMilestoneIfNeeded()
>+void FrameView::updateHasReachedSignificantRenderedTextThreshold()
> {
>-    if (m_renderedSignificantAmountOfText)
>-        return;
>-
>-    auto* document = frame().document();
>-    if (!document || document->styleScope().hasPendingSheetsBeforeBody())
>+    if (m_hasReachedSignificantRenderedTextThreshold)
>         return;
> 
>-    auto* documentElement = document->documentElement();
>-    if (!documentElement || !elementOverflowRectIsLargerThanThreshold(*documentElement))
>+    auto* document = frame().document(); 
>+    if (!document)
>         return;
> 
>-    auto characterThreshold = document->hasMainArticleElement() ? mainArticleSignificantRenderedTextCharacterThreshold : defaultSignificantRenderedTextCharacterThreshold;
>-    auto meanLength = document->hasMainArticleElement() ? mainArticleSignificantRenderedTextMeanLength : defaultSignificantRenderedTextMeanLength;
>-
>+    document->updateMainArticleElementAfterLayout();
>+    auto hasMainArticleElement = document->hasMainArticleElement();
>+    auto characterThreshold = hasMainArticleElement ? mainArticleSignificantRenderedTextCharacterThreshold : defaultSignificantRenderedTextCharacterThreshold;
>     if (m_visuallyNonEmptyCharacterCount < characterThreshold)
>         return;
> 
>+    auto meanLength = hasMainArticleElement ? mainArticleSignificantRenderedTextMeanLength : defaultSignificantRenderedTextMeanLength;
>     if (!m_textRendererCountForVisuallyNonEmptyCharacters || m_visuallyNonEmptyCharacterCount / static_cast<float>(m_textRendererCountForVisuallyNonEmptyCharacters) < meanLength)
>         return;
> 
>-    m_renderedSignificantAmountOfText = true;
>+    m_hasReachedSignificantRenderedTextThreshold = true;
>+}
>+
>+bool FrameView::qualifiesAsSignificantRenderedText() const
>+{
>+    ASSERT(!m_renderedSignificantAmountOfText);
>+    auto* document = frame().document();
>+    if (!document || document->styleScope().hasPendingSheetsBeforeBody())
>+        return false;
>+
>+    auto* documentElement = document->documentElement();
>+    if (!documentElement || !elementOverflowRectIsLargerThanThreshold(*documentElement))
>+        return false;
>+
>+    return m_hasReachedSignificantRenderedTextThreshold;
> }
> 
> bool FrameView::isViewForDocumentInFrame() const
>@@ -5136,7 +5142,6 @@ void FrameView::fireLayoutRelatedMilestonesIfNeeded()
>         if (frame().isMainFrame())
>             page->startCountingRelevantRepaintedObjects();
>     }
>-    updateSignificantRenderedTextMilestoneIfNeeded();
> 
>     if (!m_isVisuallyNonEmpty && qualifiesAsVisuallyNonEmpty()) {
>         m_isVisuallyNonEmpty = true;
>@@ -5145,8 +5150,8 @@ void FrameView::fireLayoutRelatedMilestonesIfNeeded()
>             milestonesAchieved.add(DidFirstVisuallyNonEmptyLayout);
>     }
> 
>-    if (m_renderedSignificantAmountOfText && m_significantRenderedTextMilestonePending) {
>-        m_significantRenderedTextMilestonePending = false;
>+    if (!m_renderedSignificantAmountOfText && qualifiesAsSignificantRenderedText()) {
>+        m_renderedSignificantAmountOfText = true;
>         if (requestedMilestones & DidRenderSignificantAmountOfText)
>             milestonesAchieved.add(DidRenderSignificantAmountOfText);
>     }
>diff --git a/Source/WebCore/page/FrameView.h b/Source/WebCore/page/FrameView.h
>index e89bd8e97b2b786c558852583e684944ed64a4c4..1b2fe100b5c7e5e9a41bd1bed18b101978ef6950 100644
>--- a/Source/WebCore/page/FrameView.h
>+++ b/Source/WebCore/page/FrameView.h
>@@ -793,6 +793,9 @@ private:
>     void markRootOrBodyRendererDirty() const;
> 
>     bool qualifiesAsVisuallyNonEmpty() const;
>+    bool qualifiesAsSignificantRenderedText() const;
>+    void updateHasReachedSignificantRenderedTextThreshold();
>+
>     bool isViewForDocumentInFrame() const;
> 
>     AXObjectCache* axObjectCache() const;
>@@ -883,8 +886,8 @@ private:
>     unsigned m_visuallyNonEmptyPixelCount { 0 };
> 
>     unsigned m_textRendererCountForVisuallyNonEmptyCharacters { 0 };
>-    bool m_renderedSignificantAmountOfText;
>-    bool m_significantRenderedTextMilestonePending;
>+    bool m_renderedSignificantAmountOfText { false };
>+    bool m_hasReachedSignificantRenderedTextThreshold { false };
> 
>     bool m_needsDeferredScrollbarsUpdate { false };
>

Actions: View | Formatted Diff | Diff

Attachments on bug 193842: 360152 | 360160 | 360164