Changeset 272622 in webkit

Timestamp:

Feb 9, 2021 4:38:15 PM (18 months ago)

Author:

rniwa@webkit.org

Message:

Reduce the overhead of HTMLDocumentParser in innerHTML setter
​https://bugs.webkit.org/show_bug.cgi?id=221596

Reviewed by Simon Fraser.

This patch reduces the overhead of HTMLDocumentParser for innerHTML.
This appears to be ~0.5% Speedometer progression.

No new tests since there should be no observable behavior differences.

• dom/ScriptableDocumentParser.h:

(WebCore::ScriptableDocumentParser:isWaitingForScripts): Removed since this abstract
virtual function is only used in HTMLDocumentParser.

• html/FTPDirectoryDocument.cpp:

(WebCore::FTPDirectoryDocument::isWaitingForScripts): Removed. There are no scripts
in ftp directory document but there is no need to override it here.

• html/parser/HTMLDocumentParser.cpp:

(WebCore::HTMLDocumentParser::pumpTokenizer): Exit early when we're parsing a fragment
to avoid accessing the scheduler, preloader, and document loader for various things
since they're all irrelevant for fragment parsing.
(WebCore::HTMLDocumentParser::isWaitingForScripts const): Return false immediately when
parsing a document fragment as a fast path.

• html/parser/HTMLDocumentParser.h:
• xml/parser/XMLDocumentParser.cpp:

(WebCore::XMLDocumentParser::isWaitingForScripts const): Removed. Unused.

• xml/parser/XMLDocumentParser.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ScriptableDocumentParser.h (modified) (1 diff)
• html/FTPDirectoryDocument.cpp (modified) (1 diff)
• html/parser/HTMLDocumentParser.cpp (modified) (2 diffs)
• html/parser/HTMLDocumentParser.h (modified) (1 diff)
• xml/parser/XMLDocumentParser.cpp (modified) (1 diff)
• xml/parser/XMLDocumentParser.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-09  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reduce the overhead of HTMLDocumentParser in innerHTML setter
+        https://bugs.webkit.org/show_bug.cgi?id=221596
+
+        Reviewed by Simon Fraser.
+
+        This patch reduces the overhead of HTMLDocumentParser for innerHTML.
+        This appears to be ~0.5% Speedometer progression.
+
+        No new tests since there should be no observable behavior differences.
+
+        * dom/ScriptableDocumentParser.h:
+        (WebCore::ScriptableDocumentParser:isWaitingForScripts): Removed since this abstract
+        virtual function is only used in HTMLDocumentParser.
+        * html/FTPDirectoryDocument.cpp:
+        (WebCore::FTPDirectoryDocument::isWaitingForScripts): Removed. There are no scripts
+        in ftp directory document but there is no need to override it here.
+        * html/parser/HTMLDocumentParser.cpp:
+        (WebCore::HTMLDocumentParser::pumpTokenizer): Exit early when we're parsing a fragment
+        to avoid accessing the scheduler, preloader, and document loader for various things
+        since they're all irrelevant for fragment parsing.
+        (WebCore::HTMLDocumentParser::isWaitingForScripts const): Return false immediately when
+        parsing a document fragment as a fast path.
+        * html/parser/HTMLDocumentParser.h:
+        * xml/parser/XMLDocumentParser.cpp:
+        (WebCore::XMLDocumentParser::isWaitingForScripts const): Removed. Unused.
+        * xml/parser/XMLDocumentParser.h:
+
 2021-02-09  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/dom/ScriptableDocumentParser.h

@@ -39 +39 @@
     virtual bool isExecutingScript() const { return false; }
 
-    virtual bool isWaitingForScripts() const = 0;
-
     virtual TextPosition textPosition() const = 0;
 

trunk/Source/WebCore/html/FTPDirectoryDocument.cpp

@@ -62 +62 @@
     void finish() override;
 
-    // FIXME: Why do we need this?
-    bool isWaitingForScripts() const override { return false; }
-
     void checkBuffer(int len = 10)
     {

trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp

@@ -327 +327 @@
     ASSERT(refCount() >= 1);
 
-    if (isStopped())
+    if (isStopped() || isParsingFragment())
         return;
 
@@ -516 +516 @@
 bool HTMLDocumentParser::isWaitingForScripts() const
 {
+    if (isParsingFragment()) {
+        // HTMLTreeBuilder may have a parser blocking script element but we ignore them during fragment parsing.
+        ASSERT(!m_scriptRunner || !m_scriptRunner->hasParserBlockingScript());
+        return false;
+    }
     // When the TreeBuilder encounters a </script> tag, it returns to the HTMLDocumentParser
     // where the script is transfered from the treebuilder to the script runner.

trunk/Source/WebCore/html/parser/HTMLDocumentParser.h

@@ -83 +83 @@
     void prepareToStopParsing() final;
     void stopParsing() final;
-    bool isWaitingForScripts() const override;
+    bool isWaitingForScripts() const;
     bool isExecutingScript() const final;
     bool hasScriptsWaitingForStylesheets() const final;

trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp

@@ -245 +245 @@
 }
 
-bool XMLDocumentParser::isWaitingForScripts() const
-{
-    return m_pendingScript;
-}
-
 void XMLDocumentParser::pauseParsing()
 {

trunk/Source/WebCore/xml/parser/XMLDocumentParser.h

@@ -95 +95 @@
     void append(RefPtr<StringImpl>&&) final;
     void finish() final;
-    bool isWaitingForScripts() const final;
     void stopParsing() final;
     void detach() final;