Changeset 148964 in webkit

Timestamp:

Apr 23, 2013 7:54:29 AM (11 years ago)

Author:

akling@apple.com

Message:

XSSAuditor performance regression due to threaded parser changes.
<​http://webkit.org/b/115037>
<rdar://problem/13716069>

Reviewed by Anders Carlsson.

From Blink r148792 by <​abarth@chromium.org>:

The refactoring we did for the threaded parser introduced a performance
regression in innerHTML because we'd boot up the XSSAuditor for fragment
parsing. This CL returns to our earlier behavior of not booting up the
XSSAuditor when parsing fragments.

• html/parser/HTMLDocumentParser.cpp:

(WebCore::HTMLDocumentParser::HTMLDocumentParser):

• html/parser/XSSAuditor.cpp:

(WebCore::XSSAuditor::initForFragment):

• html/parser/XSSAuditor.h:

(XSSAuditor):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/parser/HTMLDocumentParser.cpp (modified) (1 diff)
• html/parser/XSSAuditor.cpp (modified) (1 diff)
• html/parser/XSSAuditor.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-23  Andreas Kling  <akling@apple.com>
+
+        XSSAuditor performance regression due to threaded parser changes.
+        <http://webkit.org/b/115037>
+        <rdar://problem/13716069>
+
+        Reviewed by Anders Carlsson.
+
+        From Blink r148792 by <abarth@chromium.org>:
+
+        The refactoring we did for the threaded parser introduced a performance
+        regression in innerHTML because we'd boot up the XSSAuditor for fragment
+        parsing. This CL returns to our earlier behavior of not booting up the
+        XSSAuditor when parsing fragments.
+
+        * html/parser/HTMLDocumentParser.cpp:
+        (WebCore::HTMLDocumentParser::HTMLDocumentParser):
+        * html/parser/XSSAuditor.cpp:
+        (WebCore::XSSAuditor::initForFragment):
+        * html/parser/XSSAuditor.h:
+        (XSSAuditor):
+
 2013-04-23  Andreas Kling  <akling@apple.com>
 

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

@@ -119 +119 @@
     bool reportErrors = false; // For now document fragment parsing never reports errors.
     m_tokenizer->setState(tokenizerStateForContextElement(contextElement, reportErrors, m_options));
+    m_xssAuditor.initForFragment();
 }
 

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

@@ -226 +226 @@
     // Although tempting to call init() at this point, the various objects
     // we want to reference might not all have been constructed yet.
+}
+
+void XSSAuditor::initForFragment()
+{
+    ASSERT(isMainThread());
+    ASSERT(m_state == Uninitialized);
+    m_state = Initialized;
+    // When parsing a fragment, we don't enable the XSS auditor because it's
+    // too much overhead.
+    ASSERT(!m_isEnabled);
 }
 

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

@@ -60 +60 @@
 
     void init(Document*, XSSAuditorDelegate*);
+    void initForFragment();
+
     PassOwnPtr<XSSInfo> filterToken(const FilterTokenRequest&);
     bool isSafeToSendToAnotherThread() const;