Changeset 154242 in webkit

Timestamp:

Aug 17, 2013 3:46:16 PM (11 years ago)

Author:

Antti Koivisto

Message:

<​https://webkit.org/b/119963> Use TextNodeTraversal for getting sheet text in StyleElement

Reviewed by Andreas Kling.

• dom/StyleElement.cpp:

(WebCore::StyleElement::process):

Use TextNodeTraversal::contentsAsString for the sheet text. The overflow check is removed as StringBuilder
(which is used by contentsAsString) does that itself. The behavior in case of overflow changes from empty
sheet to CRASH(). Thats what we do elsewhere in similar situations too (scripts for example). Continuing
with > 4GB of style sheet text nodes is probably not going to go well anyway.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/StyleElement.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-17  Antti Koivisto  <antti@apple.com>
+
+        <https://webkit.org/b/119963> Use TextNodeTraversal for getting sheet text in StyleElement
+
+        Reviewed by Andreas Kling.
+
+        * dom/StyleElement.cpp:
+        (WebCore::StyleElement::process):
+        
+            Use TextNodeTraversal::contentsAsString for the sheet text. The overflow check is removed as StringBuilder 
+            (which is used by contentsAsString) does that itself. The behavior in case of overflow changes from empty
+            sheet to CRASH(). Thats what we do elsewhere in similar situations too (scripts for example). Continuing
+            with > 4GB of style sheet text nodes is probably not going to go well anyway.
+
 2013-08-17  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/dom/StyleElement.cpp

@@ -31 +31 @@
 #include "ScriptableDocumentParser.h"
 #include "StyleSheetContents.h"
+#include "TextNodeTraversal.h"
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/TextPosition.h>
 
 namespace WebCore {
-
-static bool isValidStyleChild(Node* node)
-{
-    ASSERT(node);
-    Node::NodeType nodeType = node->nodeType();
-    return nodeType == Node::TEXT_NODE || nodeType == Node::CDATA_SECTION_NODE;
-}
 
 static bool isCSS(Element* element, const AtomicString& type)
@@ -111 +105 @@
 }
 
-void StyleElement::process(Element* e)
+void StyleElement::process(Element* element)
 {
-    if (!e || !e->inDocument())
+    if (!element || !element->inDocument())
         return;
 
-    unsigned resultLength = 0;
-    for (Node* c = e->firstChild(); c; c = c->nextSibling()) {
-        if (isValidStyleChild(c)) {
-            unsigned length = c->nodeValue().length();
-            if (length > std::numeric_limits<unsigned>::max() - resultLength) {
-                createSheet(e, m_startLineNumber, "");
-                return;
-            }
-            resultLength += length;
-        }
-    }
-    StringBuilder sheetText;
-    sheetText.reserveCapacity(resultLength);
+    String sheetText = TextNodeTraversal::contentsAsString(element);
 
-    for (Node* c = e->firstChild(); c; c = c->nextSibling()) {
-        if (isValidStyleChild(c)) {
-            sheetText.append(c->nodeValue());
-        }
-    }
-    ASSERT(sheetText.length() == resultLength);
-
-    createSheet(e, m_startLineNumber, sheetText.toString());
+    createSheet(element, m_startLineNumber, sheetText);
 }