Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions LayoutTests/html5lib/generated/run-tests25-data-expected.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1 @@
../resources/tests25.dat:
8

Test 8 of 20 in ../resources/tests25.dat failed. Input:
<!DOCTYPE html><body><command>A
Got:
| <!DOCTYPE html>
| <html>
| <head>
| <body>
| <command>
| "A"
Expected:
| <!DOCTYPE html>
| <html>
| <head>
| <body>
| <command>
| "A"
../resources/tests25.dat: PASS
20 changes: 1 addition & 19 deletions LayoutTests/html5lib/generated/run-tests25-write-expected.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1 @@
../resources/tests25.dat:
8

Test 8 of 20 in ../resources/tests25.dat failed. Input:
<!DOCTYPE html><body><command>A
Got:
| <!DOCTYPE html>
| <html>
| <head>
| <body>
| <command>
| "A"
Expected:
| <!DOCTYPE html>
| <html>
| <head>
| <body>
| <command>
| "A"
../resources/tests25.dat: PASS
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ PASS html5lib_tests25.html 421ad19f7854b9c8e28a0595a8dd20d6bfcd5376
PASS html5lib_tests25.html 7e8234523fbf67d37ab60f593e1fc3ac67706651
PASS html5lib_tests25.html c705ceb6fb37865e6965641ea80137baf44176b6
PASS html5lib_tests25.html 277da0c4c937f3852d8a7cacf4e4b426a30b3dda
FAIL html5lib_tests25.html de4aa726e09215ba9c50b97d257e6c6b880107f1 assert_equals: expected "#document\n| <!DOCTYPE html>\n| <html>\n| <head>\n| <body>\n| <command>\n| \"A\"" but got "#document\n| <!DOCTYPE html>\n| <html>\n| <head>\n| <body>\n| <command>\n| \"A\""
PASS html5lib_tests25.html de4aa726e09215ba9c50b97d257e6c6b880107f1
PASS html5lib_tests25.html 578e08f11628dc9841f3eb21c016e1e28cec0304
PASS html5lib_tests25.html a6e5387b48c4d0399a802215f7fa206bd0d3b492
PASS html5lib_tests25.html d56d47bc9d9c7472fb1706bdecda1bbd165dcf91
Expand All @@ -27,27 +27,4 @@ PASS html5lib_tests25.html 73fc7c062b68d4f89579683dbb7f1eaef4ec27f1
PASS html5lib_tests25.html 057bc2d868d2f365cb2c0b4d07c231d2fa2b23b7
PASS html5lib_tests25.html 7f684d19be362ec9aa4fe7ecbba4ff3fc9730a43
PASS html5lib_tests25.html d79f9119d02447226cc2d151044e6cffc5409e81
de4aa726e09215ba9c50b97d257e6c6b880107f1

Input

<!DOCTYPE html><body><command>A
Expected

#document
| <!DOCTYPE html>
| <html>
| <head>
| <body>
| <command>
| "A"
Actual

#document
| <!DOCTYPE html>
| <html>
| <head>
| <body>
| <command>
| "A"

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ PASS html5lib_tests25.html 421ad19f7854b9c8e28a0595a8dd20d6bfcd5376
PASS html5lib_tests25.html 7e8234523fbf67d37ab60f593e1fc3ac67706651
PASS html5lib_tests25.html c705ceb6fb37865e6965641ea80137baf44176b6
PASS html5lib_tests25.html 277da0c4c937f3852d8a7cacf4e4b426a30b3dda
FAIL html5lib_tests25.html de4aa726e09215ba9c50b97d257e6c6b880107f1 assert_equals: expected "#document\n| <!DOCTYPE html>\n| <html>\n| <head>\n| <body>\n| <command>\n| \"A\"" but got "#document\n| <!DOCTYPE html>\n| <html>\n| <head>\n| <body>\n| <command>\n| \"A\""
PASS html5lib_tests25.html de4aa726e09215ba9c50b97d257e6c6b880107f1
PASS html5lib_tests25.html 578e08f11628dc9841f3eb21c016e1e28cec0304
PASS html5lib_tests25.html a6e5387b48c4d0399a802215f7fa206bd0d3b492
PASS html5lib_tests25.html d56d47bc9d9c7472fb1706bdecda1bbd165dcf91
Expand All @@ -27,27 +27,4 @@ PASS html5lib_tests25.html 73fc7c062b68d4f89579683dbb7f1eaef4ec27f1
PASS html5lib_tests25.html 057bc2d868d2f365cb2c0b4d07c231d2fa2b23b7
PASS html5lib_tests25.html 7f684d19be362ec9aa4fe7ecbba4ff3fc9730a43
PASS html5lib_tests25.html d79f9119d02447226cc2d151044e6cffc5409e81
de4aa726e09215ba9c50b97d257e6c6b880107f1

Input

<!DOCTYPE html><body><command>A
Expected

#document
| <!DOCTYPE html>
| <html>
| <head>
| <body>
| <command>
| "A"
Actual

#document
| <!DOCTYPE html>
| <html>
| <head>
| <body>
| <command>
| "A"

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ PASS html5lib_tests25.html 421ad19f7854b9c8e28a0595a8dd20d6bfcd5376
PASS html5lib_tests25.html 7e8234523fbf67d37ab60f593e1fc3ac67706651
PASS html5lib_tests25.html c705ceb6fb37865e6965641ea80137baf44176b6
PASS html5lib_tests25.html 277da0c4c937f3852d8a7cacf4e4b426a30b3dda
FAIL html5lib_tests25.html de4aa726e09215ba9c50b97d257e6c6b880107f1 assert_equals: expected "#document\n| <!DOCTYPE html>\n| <html>\n| <head>\n| <body>\n| <command>\n| \"A\"" but got "#document\n| <!DOCTYPE html>\n| <html>\n| <head>\n| <body>\n| <command>\n| \"A\""
PASS html5lib_tests25.html de4aa726e09215ba9c50b97d257e6c6b880107f1
PASS html5lib_tests25.html 578e08f11628dc9841f3eb21c016e1e28cec0304
PASS html5lib_tests25.html a6e5387b48c4d0399a802215f7fa206bd0d3b492
PASS html5lib_tests25.html d56d47bc9d9c7472fb1706bdecda1bbd165dcf91
Expand All @@ -27,27 +27,4 @@ PASS html5lib_tests25.html 73fc7c062b68d4f89579683dbb7f1eaef4ec27f1
PASS html5lib_tests25.html 057bc2d868d2f365cb2c0b4d07c231d2fa2b23b7
PASS html5lib_tests25.html 7f684d19be362ec9aa4fe7ecbba4ff3fc9730a43
PASS html5lib_tests25.html d79f9119d02447226cc2d151044e6cffc5409e81
de4aa726e09215ba9c50b97d257e6c6b880107f1

Input

<!DOCTYPE html><body><command>A
Expected

#document
| <!DOCTYPE html>
| <html>
| <head>
| <body>
| <command>
| "A"
Actual

#document
| <!DOCTYPE html>
| <html>
| <head>
| <body>
| <command>
| "A"

1 change: 0 additions & 1 deletion Source/WebCore/WebCore.order
Original file line number Diff line number Diff line change
Expand Up @@ -29536,7 +29536,6 @@ __ZN7WebCore9HTMLNames7citeTagE
__ZN7WebCore9HTMLNames7codeTagE
__ZN7WebCore9HTMLNames6colTagE
__ZN7WebCore9HTMLNames11colgroupTagE
__ZN7WebCore9HTMLNames10commandTagE
__ZN7WebCore9HTMLNames10contentTagE
__ZN7WebCore9HTMLNames11datalistTagE
__ZN7WebCore9HTMLNames5ddTagE
Expand Down
3 changes: 1 addition & 2 deletions Source/WebCore/WebCoreMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,7 @@ endfunction()
function(GENERATE_DOM_NAME_ENUM _enum)
add_custom_command(
OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/${_enum}.cpp ${WebCore_DERIVED_SOURCES_DIR}/${_enum}.h
MAIN_DEPENDENCY ${WEBCORE_DIR}/html/HTMLTagNames.in ${WEBCORE_DIR}/svg/svgtags.in ${WEBCORE_DIR}/mathml/mathtags.in ${WEBCORE_DIR}/html/HTMLAttributeNames.in ${WEBCORE_DIR}/mathml/mathatrs.in ${WEBCORE_DIR}/svg/svgattrs.in ${WEBCORE_DIR}/svg/xlinkattrs.in ${WEBCORE_DIR}/xml/xmlattrs.in ${WEBCORE_DIR}/xml/xmlnsattrs.in
DEPENDS ${MAKE_NAMES_DEPENDENCIES} ${WEBCORE_DIR}/dom/make_names.pl ${SCRIPTS_BINDINGS}
DEPENDS ${WEBCORE_DIR}/html/HTMLTagNames.in ${WEBCORE_DIR}/svg/svgtags.in ${WEBCORE_DIR}/mathml/mathtags.in ${WEBCORE_DIR}/html/HTMLAttributeNames.in ${WEBCORE_DIR}/mathml/mathattrs.in ${WEBCORE_DIR}/svg/svgattrs.in ${WEBCORE_DIR}/svg/xlinkattrs.in ${WEBCORE_DIR}/xml/xmlattrs.in ${WEBCORE_DIR}/xml/xmlnsattrs.in ${MAKE_NAMES_DEPENDENCIES} ${WEBCORE_DIR}/dom/make_names.pl ${SCRIPTS_BINDINGS}
COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/dom/make_names.pl --outputDir ${WebCore_DERIVED_SOURCES_DIR} --enum ${_enum} --elements ${WEBCORE_DIR}/html/HTMLTagNames.in --elements ${WEBCORE_DIR}/svg/svgtags.in --elements ${WEBCORE_DIR}/mathml/mathtags.in --attrs ${WEBCORE_DIR}/html/HTMLAttributeNames.in --attrs ${WEBCORE_DIR}/mathml/mathattrs.in --attrs ${WEBCORE_DIR}/svg/svgattrs.in --attrs ${WEBCORE_DIR}/svg/xlinkattrs.in --attrs ${WEBCORE_DIR}/xml/xmlattrs.in --attrs ${WEBCORE_DIR}/xml/xmlnsattrs.in
VERBATIM)
endfunction()
15 changes: 7 additions & 8 deletions Source/WebCore/html/HTMLObjectElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ void HTMLObjectElement::parametersForPlugin(Vector<AtomString>& paramNames, Vect
{
HashSet<StringImpl*, ASCIICaseInsensitiveHash> uniqueParamNames;
String urlParameter;

// Scan the PARAM children and store their name/value pairs.
// Get the URL and type from the params if we don't already have them.
for (auto& param : childrenOfType<HTMLParamElement>(*this)) {
Expand All @@ -179,7 +179,7 @@ void HTMLObjectElement::parametersForPlugin(Vector<AtomString>& paramNames, Vect
serviceType = serviceType.left(pos);
}
}

// When OBJECT is used for an applet via Sun's Java plugin, the CODEBASE attribute in the tag
// points to the Java plugin itself (an ActiveX component) while the actual applet CODEBASE is
// in a PARAM tag. See <http://java.sun.com/products/plugin/1.2/docs/tags.html>. This means
Expand All @@ -190,7 +190,7 @@ void HTMLObjectElement::parametersForPlugin(Vector<AtomString>& paramNames, Vect
codebase = "codebase"_s;
uniqueParamNames.add(codebase.impl()); // pretend we found it in a PARAM already
}

// Turn the attributes of the <object> element into arrays, but don't override <param> values.
if (hasAttributes()) {
for (const Attribute& attribute : attributesIterator()) {
Expand All @@ -201,9 +201,9 @@ void HTMLObjectElement::parametersForPlugin(Vector<AtomString>& paramNames, Vect
}
}
}

mapDataParamToSrc(paramNames, paramValues);

// HTML5 says that an object resource's URL is specified by the object's data
// attribute, not by a param element. However, for compatibility, allow the
// resource's URL to be given by a param named "src", "movie", "code" or "url"
Expand Down Expand Up @@ -335,7 +335,7 @@ void HTMLObjectElement::renderFallbackContent()
{
if (m_useFallbackContent)
return;

if (!isConnected())
return;

Expand Down Expand Up @@ -369,7 +369,6 @@ static inline bool preventsParentObjectFromExposure(const Element& child)
// have decided, over the years, to treat as children that do not prevent object
// names from being exposed.
if (tag == bgsoundTag
|| tag == commandTag
|| tag == detailsTag
|| tag == figcaptionTag
|| tag == figureTag
Expand Down Expand Up @@ -448,7 +447,7 @@ bool HTMLObjectElement::containsJavaApplet() const
if (child.hasTagName(appletTag))
return true;
}

return false;
}

Expand Down
3 changes: 1 addition & 2 deletions Source/WebCore/html/HTMLTagNames.in
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ cite interfaceName=HTMLElement
code interfaceName=HTMLElement
col interfaceName=HTMLTableColElement
colgroup interfaceName=HTMLTableColElement
command interfaceName=HTMLUnknownElement
data
datalist interfaceName=HTMLDataListElement, conditional=DATALIST_ELEMENT, settingsConditional=dataListElementEnabled
dd interfaceName=HTMLElement
Expand Down Expand Up @@ -115,7 +114,7 @@ samp interfaceName=HTMLElement
script constructorNeedsCreatedByParser
section interfaceName=HTMLElement
select constructorNeedsFormElement
slot
slot
small interfaceName=HTMLElement
source
span
Expand Down
5 changes: 2 additions & 3 deletions Source/WebCore/html/parser/HTMLStackItem.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* 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.
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#pragma once
Expand Down Expand Up @@ -146,7 +146,7 @@ inline bool isNumberedHeaderElement(const HTMLStackItem& item)
}
}

// http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#special
// https://html.spec.whatwg.org/multipage/parsing.html#special
inline bool isSpecialNode(const HTMLStackItem& item)
{
using namespace ElementNames;
Expand All @@ -171,7 +171,6 @@ inline bool isSpecialNode(const HTMLStackItem& item)
case HTML::center:
case HTML::col:
case HTML::colgroup:
case HTML::command:
case HTML::dd:
case HTML::details:
case HTML::dir:
Expand Down
2 changes: 0 additions & 2 deletions Source/WebCore/html/parser/HTMLTreeBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,6 @@ void HTMLTreeBuilder::processStartTagForInBody(AtomHTMLToken&& token)
case TagName::base:
case TagName::basefont:
case TagName::bgsound:
case TagName::command:
case TagName::link:
case TagName::meta:
case TagName::noframes:
Expand Down Expand Up @@ -2765,7 +2764,6 @@ bool HTMLTreeBuilder::processStartTagForInHead(AtomHTMLToken&& token)
case TagName::base:
case TagName::basefont:
case TagName::bgsound:
case TagName::command:
case TagName::link:
case TagName::meta:
m_tree.insertSelfClosingHTMLElement(WTFMove(token));
Expand Down