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

Side by Side Diff: Source/core/html/parser/HTMLIdentifier.cpp

Issue 74513003: Moved text decoding to the parser thread (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@parserthread_step25
Patch Set: Removed AtomicString from HTMLMetaCharsetParser Created 7 years 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google, Inc. All Rights Reserved. 2 * Copyright (C) 2013 Google, Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/html/parser/HTMLIdentifier.h" 27 #include "core/html/parser/HTMLIdentifier.h"
28 28
29 #include "HTMLNames.h" 29 #include "HTMLNames.h"
30 #include "core/html/parser/HTMLParserIdioms.h"
30 #include "wtf/HashMap.h" 31 #include "wtf/HashMap.h"
31 #include "wtf/MainThread.h" 32 #include "wtf/MainThread.h"
32 #include "wtf/text/StringHash.h" 33 #include "wtf/text/StringHash.h"
33 34
34 namespace WebCore { 35 namespace WebCore {
35 36
36 using namespace HTMLNames; 37 using namespace HTMLNames;
37 38
38 typedef HashMap<unsigned, StringImpl*, AlreadyHashed> IdentifierTable; 39 typedef HashMap<unsigned, StringImpl*, AlreadyHashed> IdentifierTable;
39 40
40 unsigned HTMLIdentifier::maxNameLength = 0; 41 unsigned HTMLIdentifier::maxNameLength = 0;
41 42
42 static IdentifierTable& identifierTable() 43 static IdentifierTable& identifierTable()
43 { 44 {
44 DEFINE_STATIC_LOCAL(IdentifierTable, table, ()); 45 DEFINE_STATIC_LOCAL(IdentifierTable, table, ());
45 ASSERT(isMainThread() || !table.isEmpty()); 46 ASSERT(isMainThread() || !table.isEmpty());
46 return table; 47 return table;
47 } 48 }
48 49
50 bool HTMLIdentifier::operator==(const QualifiedName& b) const
51 {
52 return threadSafeMatch(*this, b);
53 }
54
55 bool HTMLIdentifier::operator!=(const QualifiedName& b) const
56 {
57 return !(*this == b);
58 }
59
49 #ifndef NDEBUG 60 #ifndef NDEBUG
50 bool HTMLIdentifier::isKnown(const StringImpl* string) 61 bool HTMLIdentifier::isKnown(const StringImpl* string)
51 { 62 {
52 const IdentifierTable& table = identifierTable(); 63 const IdentifierTable& table = identifierTable();
53 return table.contains(string->hash()); 64 return table.contains(string->hash());
54 } 65 }
55 #endif 66 #endif
56 67
57 StringImpl* HTMLIdentifier::findIfKnown(const UChar* characters, unsigned length ) 68 StringImpl* HTMLIdentifier::findIfKnown(const UChar* characters, unsigned length )
58 { 69 {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 if (isInitialized) 123 if (isInitialized)
113 return; 124 return;
114 isInitialized = true; 125 isInitialized = true;
115 126
116 // FIXME: We should atomize small whitespace (\n, \n\n, etc.) 127 // FIXME: We should atomize small whitespace (\n, \n\n, etc.)
117 addNames(getHTMLTags(), HTMLTagsCount); 128 addNames(getHTMLTags(), HTMLTagsCount);
118 addNames(getHTMLAttrs(), HTMLAttrsCount); 129 addNames(getHTMLAttrs(), HTMLAttrsCount);
119 } 130 }
120 131
121 } 132 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698