Attachment 360193 Details for Bug 193843 – Rebase on trunk

[patch] Rebase on trunk

bug-193843-20190125170125.patch (text/plain), 2.65 KB, created by Wenson Hsieh on 2019-01-25 17:01:25 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2019-01-25 17:01:25 PST

Size: 2.65 KB

patch

obsolete

>Subversion Revision: 240525
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 4e47655e31b9fe6e36350e22a0d46dd49bc1476f..4f2c36ee496b17300201e63b3ecfd1d002d12211 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,22 @@
>+2019-01-25  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Document::updateMainArticleElementAfterLayout() should be a no-op when no client depends on knowing the main article element
>+        https://bugs.webkit.org/show_bug.cgi?id=193843
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * dom/Document.cpp:
>+        (WebCore::Document::updateMainArticleElementAfterLayout):
>+
>+        This function currently does a bit of wasted work after every layout, on clients that don't listen to the
>+        "significant rendered text" layout milestone and therefore don't need to guess the main article element. Simply
>+        don't bother keeping the main article element up to date in this scenario by bailing from
>+        FrameView::updateHasReachedSignificantRenderedTextThreshold if the client doesn't care about the significant
>+        rendered text milestone.
>+
>+        * page/FrameView.cpp:
>+        (WebCore::FrameView::updateHasReachedSignificantRenderedTextThreshold):
>+
> 2019-01-25  Keith Rollin  <krollin@apple.com>
> 
>         Update Xcode projects with "Check .xcfilelists" build phase
>diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
>index 5db71f516f6f88d7421149b19527f4e7ad8c1759..ad33faf9d125d7679d7142c285a4993f435ce06b 100644
>--- a/Source/WebCore/dom/Document.cpp
>+++ b/Source/WebCore/dom/Document.cpp
>@@ -8373,6 +8373,8 @@ void Document::unregisterArticleElement(Element& article)
> 
> void Document::updateMainArticleElementAfterLayout()
> {
>+    ASSERT(page() && page()->requestedLayoutMilestones().contains(DidRenderSignificantAmountOfText));
>+
>     // If there are too many article elements on the page, don't consider any one of them to be "main content".
>     const unsigned maxNumberOfArticlesBeforeIgnoringMainContentArticle = 10;
> 
>diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
>index c93b04eb6a943bc62474ea4fe59b52bd54ed9a5d..4a8ef53bb3b9f36aa03055b631cb9b7a6779bc85 100644
>--- a/Source/WebCore/page/FrameView.cpp
>+++ b/Source/WebCore/page/FrameView.cpp
>@@ -4418,6 +4418,10 @@ void FrameView::updateHasReachedSignificantRenderedTextThreshold()
>     if (m_hasReachedSignificantRenderedTextThreshold)
>         return;
> 
>+    auto* page = frame().page();
>+    if (!page || !page->requestedLayoutMilestones().contains(DidRenderSignificantAmountOfText))
>+        return;
>+
>     auto* document = frame().document();
>     if (!document)
>         return;

Actions: View | Formatted Diff | Diff

Attachments on bug 193843: 360183 | 360184 | 360193