Skip to content

E
engine

sxychenjing / engine
与 Fork 源项目一致

从无法访问的项目Fork

通知 3
Star 0
Fork 0
E
engine

体验新版 GitCode，发现更多精彩内容 >>

提交 6df700c6 编写于 作者: A Adam Barth
浏览文件
操作

Remove HTML entity crazy 

This CL removes the bulk of the old HTML entity machinery. We don't need this
anymore.

R=eseidel@chromium.org

Review URL: https://codereview.chromium.org/680173002
上级 710a7171
展开全部 隐藏空白更改
内联 并排
Showing with 0 addition and 2752 deletion
engine/core/BUILD.gn
浏览文件 @ 6df700c6
......@@ -93,9 +93,6 @@ source_set("core_generated") {
sources += bindings_core_generated_aggregate_files
sources += [
# Generated from HTMLEntityNames.in
"$sky_core_output_dir/HTMLEntityTable.cpp",
# Generated from CSSTokenizer-in.cpp
"$sky_core_output_dir/CSSTokenizer.cpp",
......@@ -191,7 +188,6 @@ group("make_core_generated") {
":make_core_generated_event_factory",
":make_core_generated_html_element_lookup_trie",
":make_core_generated_html_element_type_helpers",
":make_core_generated_html_entity_table",
":make_core_generated_make_parser",
":make_core_generated_make_token_matcher",
":make_core_generated_make_token_matcher_for_viewport",
......@@ -450,22 +446,6 @@ make_token_matcher("make_core_generated_make_token_matcher_for_viewport") {
# One-off scripts --------------------------------------------------------------
action("make_core_generated_html_entity_table") {
script = "html/parser/create-html-entity-table"
inputs = [
"html/parser/HTMLEntityNames.in",
]
outputs = [
"$sky_core_output_dir/HTMLEntityTable.cpp",
]
args = [ "-o" ] + rebase_path(outputs, root_build_dir)
args += rebase_path(inputs, root_build_dir)
deps = make_core_generated_deps
}
action("make_core_generated_media_query_tokenizer_codepoints") {
script = "../build/scripts/make_mediaquery_tokenizer_codepoints.py"
......
engine/core/core.gni
浏览文件 @ 6df700c6
......@@ -940,9 +940,6 @@ sky_core_files = [
"html/parser/HTMLElementStack.h",
"html/parser/HTMLEntityParser.cpp",
"html/parser/HTMLEntityParser.h",
"html/parser/HTMLEntitySearch.cpp",
"html/parser/HTMLEntitySearch.h",
"html/parser/HTMLEntityTable.h",
"html/parser/HTMLInputStream.h",
"html/parser/HTMLParserIdioms.cpp",
"html/parser/HTMLParserScheduler.cpp",
......
engine/core/html/parser/HTMLEntityNames.in 已删除 100644 → 0
浏览文件 @ 710a7171
此差异已折叠。
engine/core/html/parser/HTMLEntitySearch.cpp 已删除 100644 → 0
浏览文件 @ 710a7171
/*
* Copyright (C) 2010 Google, Inc. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "config.h"
#include "core/html/parser/HTMLEntitySearch.h"
#include "core/html/parser/HTMLEntityTable.h"
namespace blink {
static const HTMLEntityTableEntry* halfway(const HTMLEntityTableEntry* left, const HTMLEntityTableEntry* right)
{
return &left[(right - left) / 2];
}
HTMLEntitySearch::HTMLEntitySearch()
: m_currentLength(0)
, m_mostRecentMatch(0)
, m_first(HTMLEntityTable::firstEntry())
, m_last(HTMLEntityTable::lastEntry())
{
}
HTMLEntitySearch::CompareResult HTMLEntitySearch::compare(const HTMLEntityTableEntry* entry, UChar nextCharacter) const
{
if (entry->length < m_currentLength + 1)
return Before;
const LChar* entityString = HTMLEntityTable::entityString(*entry);
UChar entryNextCharacter = entityString[m_currentLength];
if (entryNextCharacter == nextCharacter)
return Prefix;
return entryNextCharacter < nextCharacter ? Before : After;
}
const HTMLEntityTableEntry* HTMLEntitySearch::findFirst(UChar nextCharacter) const
{
const HTMLEntityTableEntry* left = m_first;
const HTMLEntityTableEntry* right = m_last;
if (left == right)
return left;
CompareResult result = compare(left, nextCharacter);
if (result == Prefix)
return left;
if (result == After)
return right;
while (left + 1 < right) {
const HTMLEntityTableEntry* probe = halfway(left, right);
result = compare(probe, nextCharacter);
if (result == Before)
left = probe;
else {
ASSERT(result == After || result == Prefix);
right = probe;
}
}
ASSERT(left + 1 == right);
return right;
}
const HTMLEntityTableEntry* HTMLEntitySearch::findLast(UChar nextCharacter) const
{
const HTMLEntityTableEntry* left = m_first;
const HTMLEntityTableEntry* right = m_last;
if (left == right)
return right;
CompareResult result = compare(right, nextCharacter);
if (result == Prefix)
return right;
if (result == Before)
return left;
while (left + 1 < right) {
const HTMLEntityTableEntry* probe = halfway(left, right);
result = compare(probe, nextCharacter);
if (result == After)
right = probe;
else {
ASSERT(result == Before || result == Prefix);
left = probe;
}
}
ASSERT(left + 1 == right);
return left;
}
void HTMLEntitySearch::advance(UChar nextCharacter)
{
ASSERT(isEntityPrefix());
if (!m_currentLength) {
m_first = HTMLEntityTable::firstEntryStartingWith(nextCharacter);
m_last = HTMLEntityTable::lastEntryStartingWith(nextCharacter);
if (!m_first || !m_last)
return fail();
} else {
m_first = findFirst(nextCharacter);
m_last = findLast(nextCharacter);
if (m_first == m_last && compare(m_first, nextCharacter) != Prefix)
return fail();
}
++m_currentLength;
if (m_first->length != m_currentLength) {
return;
}
m_mostRecentMatch = m_first;
}
}
engine/core/html/parser/HTMLEntitySearch.h 已删除 100644 → 0
浏览文件 @ 710a7171
/*
* Copyright (C) 2010 Google, Inc. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef HTMLEntitySearch_h
#define HTMLEntitySearch_h
#include "wtf/text/WTFString.h"
namespace blink {
struct HTMLEntityTableEntry;
class HTMLEntitySearch {
public:
HTMLEntitySearch();
void advance(UChar);
bool isEntityPrefix() const { return !!m_first; }
int currentLength() const { return m_currentLength; }
const HTMLEntityTableEntry* mostRecentMatch() const { return m_mostRecentMatch; }
private:
enum CompareResult {
Before,
Prefix,
After,
};
CompareResult compare(const HTMLEntityTableEntry*, UChar) const;
const HTMLEntityTableEntry* findFirst(UChar) const;
const HTMLEntityTableEntry* findLast(UChar) const;
void fail()
{
m_first = 0;
m_last = 0;
}
int m_currentLength;
const HTMLEntityTableEntry* m_mostRecentMatch;
const HTMLEntityTableEntry* m_first;
const HTMLEntityTableEntry* m_last;
};
}
#endif
engine/core/html/parser/HTMLEntityTable.h 已删除 100644 → 0
浏览文件 @ 710a7171
/*
* Copyright (C) 2010 Google, Inc. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef HTMLEntityTable_h
#define HTMLEntityTable_h
#include "wtf/text/WTFString.h"
namespace blink {
// Member order to optimize packing. There will be thousands of these objects.
struct HTMLEntityTableEntry {
LChar lastCharacter() const;
UChar32 firstValue;
UChar secondValue; // UChar since double char sequences only use BMP chars.
short entityOffset;
short length;
};
class HTMLEntityTable {
public:
static const HTMLEntityTableEntry* firstEntry();
static const HTMLEntityTableEntry* lastEntry();
static const HTMLEntityTableEntry* firstEntryStartingWith(UChar);
static const HTMLEntityTableEntry* lastEntryStartingWith(UChar);
static const LChar* entityString(const HTMLEntityTableEntry&);
};
}
#endif
engine/core/html/parser/create-html-entity-table 已删除 100755 → 0
浏览文件 @ 710a7171
#!/usr/bin/env python
# Copyright (c) 2010 Google Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""This python script creates the raw data that is our entity
database. The representation is one string database containing all
strings we could need, and then a mapping from offset+length -> entity
data. That is compact, easy to use and efficient."""
import csv
import os.path
import string
import sys
ENTITY = 0
VALUE = 1
def convert_value_to_int(value):
if not value:
return "0";
assert(value[0] == "U")
assert(value[1] == "+")
return "0x" + value[2:]
def offset_table_entry(offset):
return " &staticEntityTable[%s]," % offset
program_name = os.path.basename(__file__)
if len(sys.argv) < 4 or sys.argv[1] != "-o":
# Python 3, change to: print("Usage: %s -o OUTPUT_FILE INPUT_FILE" % program_name, file=sys.stderr)
sys.stderr.write("Usage: %s -o OUTPUT_FILE INPUT_FILE\n" % program_name)
exit(1)
output_path = sys.argv[2]
input_path = sys.argv[3]
with open(input_path) as html_entity_names_file:
entries = list(csv.reader(html_entity_names_file))
entries.sort(key = lambda entry: entry[ENTITY])
entity_count = len(entries)
output_file = open(output_path, "w")
output_file.write("""/*
* Copyright (C) 2010 Google, Inc. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
// THIS FILE IS GENERATED BY core/html/parser/create-html-entity-table
// DO NOT EDIT (unless you are a ninja)!
#include "config.h"
#include "core/html/parser/HTMLEntityTable.h"
namespace blink {
namespace {
""")
assert len(entries) > 0, "Code assumes a non-empty entity array."
def check_ascii(entity_string):
for c in entity_string:
code = ord(c)
assert 0 <= code <= 127, (c + " is not ASCII. Need to change type " +
"of storage from LChar to UChar to support " +
"this entity.")
output_file.write("static const LChar staticEntityStringStorage[] = {\n")
output_file.write("'")
all_data = ""
entity_offset = 0
first_output = True
saved_by_reusing = 0
for entry in entries:
check_ascii(entry[ENTITY])
# Reuse substrings from earlier entries. This saves 1-2000
# characters, but it's O(n^2) and not very smart. The optimal
# solution has to solve the "Shortest Common Superstring" problem
# and that is NP-Complete or worse.
#
# This would be even more efficient if we didn't store the
# semi-colon in the array but as a bit in the entry.
entity = entry[ENTITY]
already_existing_offset = all_data.find(entity)
if already_existing_offset != -1:
# Reusing space.
this_offset = already_existing_offset
saved_by_reusing += len(entity)
else:
if not first_output:
output_file.write(",\n'")
first_output = False
# Try the end of the string and see if we can reuse that to
# fit the start of the new entity.
data_to_add = entity
this_offset = entity_offset
for truncated_len in range(len(entity) - 1, 0, -1):
if all_data.endswith(entity[:truncated_len]):
data_to_add = entity[truncated_len:]
this_offset = entity_offset - truncated_len
saved_by_reusing += truncated_len
break
output_file.write("', '".join(data_to_add))
all_data += data_to_add
output_file.write("'")
entity_offset += len(data_to_add)
assert len(entry) == 2, "We will use slot [2] in the list for the offset."
assert this_offset < 32768 # Stored in a 16 bit short.
entry.append(this_offset)
output_file.write("};\n")
index = {}
for offset, entry in enumerate(entries):
starting_letter = entry[ENTITY][0]
if starting_letter not in index:
index[starting_letter] = offset
output_file.write("""
static const HTMLEntityTableEntry staticEntityTable[%s] = {\n""" % entity_count)
for entry in entries:
values = entry[VALUE].split(' ')
assert len(values) <= 2, values
output_file.write(' { %s, %s, %s, %s }, // &%s\n' % (
convert_value_to_int(values[0]),
convert_value_to_int(values[1] if len(values) >= 2 else ""),
entry[2],
len(entry[ENTITY]),
entry[ENTITY],
))
output_file.write("""};
""")
output_file.write("""
}
""")
output_file.write("static const short uppercaseOffset[] = {\n")
for letter in string.ascii_uppercase:
output_file.write("%d,\n" % index[letter])
output_file.write("%d\n" % index['a'])
output_file.write("""};
static const short lowercaseOffset[] = {\n""")
for letter in string.ascii_lowercase:
output_file.write("%d,\n" % index[letter])
output_file.write("%d\n" % entity_count)
output_file.write("""};
const LChar* HTMLEntityTable::entityString(const HTMLEntityTableEntry& entry)
{
return staticEntityStringStorage + entry.entityOffset;
}
LChar HTMLEntityTableEntry::lastCharacter() const
{
return HTMLEntityTable::entityString(*this)[length - 1];
}
const HTMLEntityTableEntry* HTMLEntityTable::firstEntryStartingWith(UChar c)
{
if (c >= 'A' && c <= 'Z')
return &staticEntityTable[uppercaseOffset[c - 'A']];
if (c >= 'a' && c <= 'z')
return &staticEntityTable[lowercaseOffset[c - 'a']];
return 0;
}
const HTMLEntityTableEntry* HTMLEntityTable::lastEntryStartingWith(UChar c)
{
if (c >= 'A' && c <= 'Z')
return &staticEntityTable[uppercaseOffset[c - 'A' + 1]] - 1;
if (c >= 'a' && c <= 'z')
return &staticEntityTable[lowercaseOffset[c - 'a' + 1]] - 1;
return 0;
}
const HTMLEntityTableEntry* HTMLEntityTable::firstEntry()
{
return &staticEntityTable[0];
}
const HTMLEntityTableEntry* HTMLEntityTable::lastEntry()
{
return &staticEntityTable[%s - 1];
}
}
""" % entity_count)
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或