Title: [142480] trunk/Source/WebCore
- Revision
- 142480
- Author
- e...@webkit.org
- Date
- 2013-02-11 08:52:27 -0800 (Mon, 11 Feb 2013)
Log Message
Remove AttributeBase now that NEW_XML is gone
https://bugs.webkit.org/show_bug.cgi?id=109408
Reviewed by Adam Barth.
Just deleting code. HTMLToken::Attribute is now just
the real class and not a typedef.
* html/parser/CompactHTMLToken.cpp:
(WebCore::CompactHTMLToken::CompactHTMLToken):
* html/parser/HTMLTokenizer.cpp:
(WebCore::AtomicHTMLToken::nameForAttribute):
* xml/parser/MarkupTokenBase.h:
(WebCore):
(MarkupTokenBase):
(Attribute):
(Range):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (142479 => 142480)
--- trunk/Source/WebCore/ChangeLog 2013-02-11 16:24:09 UTC (rev 142479)
+++ trunk/Source/WebCore/ChangeLog 2013-02-11 16:52:27 UTC (rev 142480)
@@ -1,5 +1,25 @@
2013-02-11 Eric Seidel <e...@webkit.org>
+ Remove AttributeBase now that NEW_XML is gone
+ https://bugs.webkit.org/show_bug.cgi?id=109408
+
+ Reviewed by Adam Barth.
+
+ Just deleting code. HTMLToken::Attribute is now just
+ the real class and not a typedef.
+
+ * html/parser/CompactHTMLToken.cpp:
+ (WebCore::CompactHTMLToken::CompactHTMLToken):
+ * html/parser/HTMLTokenizer.cpp:
+ (WebCore::AtomicHTMLToken::nameForAttribute):
+ * xml/parser/MarkupTokenBase.h:
+ (WebCore):
+ (MarkupTokenBase):
+ (Attribute):
+ (Range):
+
+2013-02-11 Eric Seidel <e...@webkit.org>
+
Rename PreloadTask to StartTagScanner to match its purpose
https://bugs.webkit.org/show_bug.cgi?id=109406
Modified: trunk/Source/WebCore/html/parser/CompactHTMLToken.cpp (142479 => 142480)
--- trunk/Source/WebCore/html/parser/CompactHTMLToken.cpp 2013-02-11 16:24:09 UTC (rev 142479)
+++ trunk/Source/WebCore/html/parser/CompactHTMLToken.cpp 2013-02-11 16:52:27 UTC (rev 142480)
@@ -68,7 +68,7 @@
break;
case HTMLTokenTypes::StartTag:
m_attributes.reserveInitialCapacity(token->attributes().size());
- for (Vector<AttributeBase>::const_iterator it = token->attributes().begin(); it != token->attributes().end(); ++it)
+ for (Vector<HTMLToken::Attribute>::const_iterator it = token->attributes().begin(); it != token->attributes().end(); ++it)
m_attributes.append(CompactAttribute(String(it->m_name.data(), it->m_name.size()), String(it->m_value.data(), it->m_value.size())));
// Fall through!
case HTMLTokenTypes::EndTag:
Modified: trunk/Source/WebCore/html/parser/HTMLTokenizer.cpp (142479 => 142480)
--- trunk/Source/WebCore/html/parser/HTMLTokenizer.cpp 2013-02-11 16:24:09 UTC (rev 142479)
+++ trunk/Source/WebCore/html/parser/HTMLTokenizer.cpp 2013-02-11 16:52:27 UTC (rev 142480)
@@ -49,7 +49,7 @@
// This has to go in a .cpp file, as the linker doesn't like it being included more than once.
// We don't have an HTMLToken.cpp though, so this is the next best place.
-QualifiedName AtomicHTMLToken::nameForAttribute(const AttributeBase& attribute) const
+QualifiedName AtomicHTMLToken::nameForAttribute(const HTMLToken::Attribute& attribute) const
{
return QualifiedName(nullAtom, AtomicString(attribute.m_name.data(), attribute.m_name.size()), nullAtom);
}
Modified: trunk/Source/WebCore/xml/parser/MarkupTokenBase.h (142479 => 142480)
--- trunk/Source/WebCore/xml/parser/MarkupTokenBase.h 2013-02-11 16:24:09 UTC (rev 142479)
+++ trunk/Source/WebCore/xml/parser/MarkupTokenBase.h 2013-02-11 16:52:27 UTC (rev 142480)
@@ -45,28 +45,27 @@
return 0;
}
-class AttributeBase {
-public:
- class Range {
- public:
- int m_start;
- int m_end;
- };
-
- Range m_nameRange;
- Range m_valueRange;
- WTF::Vector<UChar, 32> m_name;
- WTF::Vector<UChar, 32> m_value;
-};
-
-template<typename TypeSet, typename AttributeType = AttributeBase>
+template<typename TypeSet>
class MarkupTokenBase {
WTF_MAKE_NONCOPYABLE(MarkupTokenBase);
WTF_MAKE_FAST_ALLOCATED;
public:
typedef TypeSet Type;
- typedef AttributeType Attribute;
+ class Attribute {
+ public:
+ class Range {
+ public:
+ int m_start;
+ int m_end;
+ };
+
+ Range m_nameRange;
+ Range m_valueRange;
+ WTF::Vector<UChar, 32> m_name;
+ WTF::Vector<UChar, 32> m_value;
+ };
+
typedef WTF::Vector<Attribute, 10> AttributeList;
typedef WTF::Vector<UChar, 1024> DataVector;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
