Changeset 144801 in webkit

Timestamp:

Mar 5, 2013 12:44:37 PM (11 years ago)

Author:

tonyg@chromium.org

Message:

CompactHTMLToken does not need an XSSInfo pointer
​https://bugs.webkit.org/show_bug.cgi?id=111423

Reviewed by Eric Seidel.

The CompactHTMLToken should remain as small as possible because it is copied. This shrinks the size by one pointer
by moving a relatively uncommon attribute out to its own Vector.

No new tests because no new functionality.

• html/parser/BackgroundHTMLParser.cpp:

(WebCore::checkThatXSSInfosAreSafeToSendToAnotherThread):
(WebCore):
(WebCore::BackgroundHTMLParser::pumpTokenizer):
(WebCore::BackgroundHTMLParser::sendTokensToMainThread):

• html/parser/BackgroundHTMLParser.h:

(BackgroundHTMLParser):

• html/parser/CompactHTMLToken.cpp:

(SameSizeAsCompactHTMLToken):
(WebCore::CompactHTMLToken::isSafeToSendToAnotherThread):

• html/parser/CompactHTMLToken.h:

(WebCore):
(CompactHTMLToken):

• html/parser/HTMLDocumentParser.cpp:

(WebCore::HTMLDocumentParser::processParsedChunkFromBackgroundParser):

• html/parser/HTMLDocumentParser.h:

(ParsedChunk):

• html/parser/XSSAuditorDelegate.h:

(XSSInfo):
(WebCore):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/parser/BackgroundHTMLParser.cpp (modified) (4 diffs)
• html/parser/BackgroundHTMLParser.h (modified) (2 diffs)
• html/parser/CompactHTMLToken.cpp (modified) (3 diffs)
• html/parser/CompactHTMLToken.h (modified) (5 diffs)
• html/parser/HTMLDocumentParser.cpp (modified) (1 diff)
• html/parser/HTMLDocumentParser.h (modified) (1 diff)
• html/parser/XSSAuditorDelegate.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-05  Tony Gentilcore  <tonyg@chromium.org>
+
+        CompactHTMLToken does not need an XSSInfo pointer
+        https://bugs.webkit.org/show_bug.cgi?id=111423
+
+        Reviewed by Eric Seidel.
+
+        The CompactHTMLToken should remain as small as possible because it is copied. This shrinks the size by one pointer
+        by moving a relatively uncommon attribute out to its own Vector.
+
+        No new tests because no new functionality.
+
+        * html/parser/BackgroundHTMLParser.cpp:
+        (WebCore::checkThatXSSInfosAreSafeToSendToAnotherThread):
+        (WebCore):
+        (WebCore::BackgroundHTMLParser::pumpTokenizer):
+        (WebCore::BackgroundHTMLParser::sendTokensToMainThread):
+        * html/parser/BackgroundHTMLParser.h:
+        (BackgroundHTMLParser):
+        * html/parser/CompactHTMLToken.cpp:
+        (SameSizeAsCompactHTMLToken):
+        (WebCore::CompactHTMLToken::isSafeToSendToAnotherThread):
+        * html/parser/CompactHTMLToken.h:
+        (WebCore):
+        (CompactHTMLToken):
+        * html/parser/HTMLDocumentParser.cpp:
+        (WebCore::HTMLDocumentParser::processParsedChunkFromBackgroundParser):
+        * html/parser/HTMLDocumentParser.h:
+        (ParsedChunk):
+        * html/parser/XSSAuditorDelegate.h:
+        (XSSInfo):
+        (WebCore):
+
 2013-03-05  Anders Carlsson  <andersca@apple.com>
 

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

@@ -58 +58 @@
     for (size_t i = 0; i < preloads.size(); ++i)
         ASSERT(preloads[i]->isSafeToSendToAnotherThread());
+}
+
+static void checkThatXSSInfosAreSafeToSendToAnotherThread(const XSSInfoStream& xssInfos)
+{
+    for (size_t i = 0; i < xssInfos.size(); ++i)
+        ASSERT(xssInfos[i]->isSafeToSendToAnotherThread());
 }
 
@@ -248 +254 @@
 
         {
-            OwnPtr<XSSInfo> xssInfo = m_xssAuditor->filterToken(FilterTokenRequest(*m_token, m_sourceTracker, m_tokenizer->shouldAllowCDATA()));
+            TextPosition position = TextPosition(m_input.current().currentLine(), m_input.current().currentColumn());
+
+            if (OwnPtr<XSSInfo> xssInfo = m_xssAuditor->filterToken(FilterTokenRequest(*m_token, m_sourceTracker, m_tokenizer->shouldAllowCDATA()))) {
+                xssInfo->m_textPosition = position;
+                m_pendingXSSInfos.append(xssInfo.release());
+            }
+
             CompactHTMLToken token(m_token.get(), TextPosition(m_input.current().currentLine(), m_input.current().currentColumn()));
-
-            if (xssInfo)
-                token.setXSSInfo(xssInfo.release());
 
             m_preloadScanner->scan(token, m_pendingPreloads);
@@ -276 +285 @@
     checkThatTokensAreSafeToSendToAnotherThread(m_pendingTokens.get());
     checkThatPreloadsAreSafeToSendToAnotherThread(m_pendingPreloads);
+    checkThatXSSInfosAreSafeToSendToAnotherThread(m_pendingXSSInfos);
 #endif
 
@@ -281 +291 @@
     chunk->tokens = m_pendingTokens.release();
     chunk->preloads.swap(m_pendingPreloads);
+    chunk->xssInfos.swap(m_pendingXSSInfos);
     chunk->tokenizerState = m_tokenizer->state();
     chunk->inputCheckpoint = m_input.createCheckpoint();

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

@@ -36 +36 @@
 #include "HTMLToken.h"
 #include "HTMLTokenizer.h"
+#include "XSSAuditorDelegate.h"
 #include <wtf/PassOwnPtr.h>
 #include <wtf/RefPtr.h>
@@ -106 +107 @@
     OwnPtr<CompactHTMLTokenStream> m_pendingTokens;
     PreloadRequestStream m_pendingPreloads;
+    XSSInfoStream m_pendingXSSInfos;
 
     OwnPtr<XSSAuditor> m_xssAuditor;

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

@@ -42 +42 @@
     Vector<Attribute> vector;
     TextPosition textPosition;
-    OwnPtr<XSSInfo> xssInfo;
 };
 
@@ -90 +89 @@
 }
 
-CompactHTMLToken::CompactHTMLToken(const CompactHTMLToken& other)
-    : m_type(other.m_type)
-    , m_selfClosing(other.m_selfClosing)
-    , m_isAll8BitData(other.m_isAll8BitData)
-    , m_doctypeForcesQuirks(other.m_doctypeForcesQuirks)
-    , m_data(other.m_data)
-    , m_attributes(other.m_attributes)
-    , m_textPosition(other.m_textPosition)
-{
-    if (other.m_xssInfo)
-        m_xssInfo = adoptPtr(new XSSInfo(*other.m_xssInfo));
-}
-
 const CompactHTMLToken::Attribute* CompactHTMLToken::getAttributeItem(const QualifiedName& name) const
 {
@@ -120 +106 @@
             return false;
     }
-    if (m_xssInfo && !m_xssInfo->isSafeToSendToAnotherThread())
-        return false;
     return m_data.isSafeToSendToAnotherThread();
-}
-
-XSSInfo* CompactHTMLToken::xssInfo() const
-{
-    return m_xssInfo.get();
-}
-
-void CompactHTMLToken::setXSSInfo(PassOwnPtr<XSSInfo> xssInfo)
-{
-    m_xssInfo = xssInfo;
 }
 

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

@@ -41 +41 @@
 
 class QualifiedName;
-class XSSInfo;
 
 class CompactHTMLToken {
@@ -57 +56 @@
 
     CompactHTMLToken(const HTMLToken*, const TextPosition&);
-    CompactHTMLToken(const CompactHTMLToken&);
 
     bool isSafeToSendToAnotherThread() const;
@@ -74 +72 @@
     const String& systemIdentifier() const { return m_attributes[0].value; }
     bool doctypeForcesQuirks() const { return m_doctypeForcesQuirks; }
-    XSSInfo* xssInfo() const;
-    void setXSSInfo(PassOwnPtr<XSSInfo>);
 
 private:
@@ -86 +82 @@
     Vector<Attribute> m_attributes;
     TextPosition m_textPosition;
-    OwnPtr<XSSInfo> m_xssInfo;
 };
 
@@ -93 +88 @@
 }
 
-namespace WTF {
-// This is required for a struct with OwnPtr. We know CompactHTMLToken is simple enough that
-// initializing to 0 and moving with memcpy (and then not destructing the original) will work.
-template<> struct VectorTraits<WebCore::CompactHTMLToken> : SimpleClassVectorTraits { };
-}
-
 #endif // ENABLE(THREADED_HTML_PARSER)
 

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

@@ -394 +394 @@
     OwnPtr<CompactHTMLTokenStream> tokens = m_currentChunk->tokens.release();
 
+    for (XSSInfoStream::const_iterator it = m_currentChunk->xssInfos.begin(); it != m_currentChunk->xssInfos.end(); ++it) {
+        m_textPosition = (*it)->m_textPosition;
+        m_xssAuditorDelegate.didBlockScript(**it); 
+        if (isStopped())
+            break;
+    }
+
     for (Vector<CompactHTMLToken>::const_iterator it = tokens->begin(); it != tokens->end(); ++it) {
         ASSERT(!isWaitingForScripts());
 
         m_textPosition = it->textPosition();
-
-        if (XSSInfo* xssInfo = it->xssInfo())
-            m_xssAuditorDelegate.didBlockScript(*xssInfo);
 
         constructTreeFromCompactHTMLToken(*it);

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

@@ -90 +90 @@
         OwnPtr<CompactHTMLTokenStream> tokens;
         PreloadRequestStream preloads;
+        XSSInfoStream xssInfos;
         HTMLTokenizer::State tokenizerState;
         HTMLInputCheckpoint inputCheckpoint;

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

@@ -28 +28 @@
 
 #include "KURL.h"
+#include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
+#include <wtf/Vector.h>
+#include <wtf/text/TextPosition.h>
 #include <wtf/text/WTFString.h>
 
@@ -48 +51 @@
     String m_originalHTTPBody;
     bool m_didBlockEntirePage;
+    TextPosition m_textPosition;
 
 private:
@@ -70 +74 @@
 };
 
+typedef Vector<OwnPtr<XSSInfo> > XSSInfoStream;
+
 }