Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Side by Side Diff: third_party/WebKit/WebCore/html/HTMLTokenizer.cpp

Issue 20076: WebKit merge 40500:40539 [WebKit side] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 Copyright (C) 1997 Martin Jones (mjones@kde.org) 2 Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 (C) 1997 Torben Weis (weis@kde.org) 3 (C) 1997 Torben Weis (weis@kde.org)
4 (C) 1998 Waldo Bastian (bastian@kde.org) 4 (C) 1998 Waldo Bastian (bastian@kde.org)
5 (C) 1999 Lars Knoll (knoll@kde.org) 5 (C) 1999 Lars Knoll (knoll@kde.org)
6 (C) 1999 Antti Koivisto (koivisto@kde.org) 6 (C) 1999 Antti Koivisto (koivisto@kde.org)
7 (C) 2001 Dirk Mueller (mueller@kde.org) 7 (C) 2001 Dirk Mueller (mueller@kde.org)
8 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reser ved. 8 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reser ved.
9 Copyright (C) 2005, 2006 Alexey Proskuryakov (ap@nypop.com) 9 Copyright (C) 2005, 2006 Alexey Proskuryakov (ap@nypop.com)
10 10
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 return true; 133 return true;
134 } 134 }
135 135
136 inline void Token::addAttribute(AtomicString& attrName, const AtomicString& attr ibuteValue, bool viewSourceMode) 136 inline void Token::addAttribute(AtomicString& attrName, const AtomicString& attr ibuteValue, bool viewSourceMode)
137 { 137 {
138 if (!attrName.isEmpty()) { 138 if (!attrName.isEmpty()) {
139 ASSERT(!attrName.contains('/')); 139 ASSERT(!attrName.contains('/'));
140 RefPtr<MappedAttribute> a = MappedAttribute::create(attrName, attributeV alue); 140 RefPtr<MappedAttribute> a = MappedAttribute::create(attrName, attributeV alue);
141 if (!attrs) { 141 if (!attrs) {
142 attrs = NamedMappedAttrMap::create(); 142 attrs = NamedMappedAttrMap::create();
143 attrs->reserveCapacity(10); 143 attrs->reserveInitialCapacity(10);
144 } 144 }
145 attrs->insertAttribute(a.release(), viewSourceMode); 145 attrs->insertAttribute(a.release(), viewSourceMode);
146 } 146 }
147 147
148 attrName = emptyAtom; 148 attrName = emptyAtom;
149 } 149 }
150 150
151 // ---------------------------------------------------------------------------- 151 // ----------------------------------------------------------------------------
152 152
153 HTMLTokenizer::HTMLTokenizer(HTMLDocument* doc, bool reportErrors) 153 HTMLTokenizer::HTMLTokenizer(HTMLDocument* doc, bool reportErrors)
(...skipping 1882 matching lines...) Expand 10 before | Expand all | Expand 10 after
2036 2036
2037 UChar decodeNamedEntity(const char* name) 2037 UChar decodeNamedEntity(const char* name)
2038 { 2038 {
2039 const Entity* e = findEntity(name, strlen(name)); 2039 const Entity* e = findEntity(name, strlen(name));
2040 return e ? e->code : 0; 2040 return e ? e->code : 0;
2041 } 2041 }
2042 2042
2043 } 2043 }
2044 2044
2045 2045
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/history/HistoryItem.cpp ('k') | third_party/WebKit/WebCore/loader/DocumentLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698