WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Patch
bug-202804-20201011134644.patch (text/plain), 6.29 KB, created by
Rob Buis
on 2020-10-11 04:46:46 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Rob Buis
Created:
2020-10-11 04:46:46 PDT
Size:
6.29 KB
patch
obsolete
>Subversion Revision: 268317 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index f2b82a358aa14727b81a3150ed558867639eb4ac..0757c0dba3f179dbe3d7b117a9f9369f356726db 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,24 @@ >+2020-10-11 Rob Buis <rbuis@igalia.com> >+ >+ Various test-cases from Gecko assert with ASSERTION FAILED: tagName == mmultiscriptsTag or ASSERTION FAILED: tagName == mrootTag >+ https://bugs.webkit.org/show_bug.cgi?id=202804 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Both rootTypeOf and scriptTypeOf were expecting the qualified name >+ to have no prefix, however it is possible in xhtml that prefixes are >+ set, as seen in the Gecko test cases. Failing to detect the qname >+ would hit an ASSERT in both cases. So use QualifiedName.matches >+ which ignores prefixes. >+ >+ Tests: mathml/scripts-with-prefixes.xhtml >+ mathml/square-roots-with-prefixes.xhtml >+ >+ * mathml/MathMLRootElement.cpp: >+ (WebCore::rootTypeOf): >+ * mathml/MathMLScriptsElement.cpp: >+ (WebCore::scriptTypeOf): >+ > 2020-10-09 Yusuke Suzuki <ysuzuki@apple.com> > > [JSC] Assert Operation and HostFunction are in JITOperationsList >diff --git a/Source/WebCore/mathml/MathMLRootElement.cpp b/Source/WebCore/mathml/MathMLRootElement.cpp >index 8437f40d0ebac5e3f95acc031c2d97259c8c5251..769718a839e26f7a34c1fe612faa5b43efa62805 100644 >--- a/Source/WebCore/mathml/MathMLRootElement.cpp >+++ b/Source/WebCore/mathml/MathMLRootElement.cpp >@@ -40,9 +40,9 @@ using namespace MathMLNames; > > static RootType rootTypeOf(const QualifiedName& tagName) > { >- if (tagName == msqrtTag) >+ if (tagName.matches(msqrtTag)) > return RootType::SquareRoot; >- ASSERT(tagName == mrootTag); >+ ASSERT(tagName.matches(mrootTag)); > return RootType::RootWithIndex; > } > >diff --git a/Source/WebCore/mathml/MathMLScriptsElement.cpp b/Source/WebCore/mathml/MathMLScriptsElement.cpp >index d8cbb22546b7f5c1faafeb18b48fdce06b5d45cb..32fa4bbf5bd43b615afd9d6febed77426fe7f3a5 100644 >--- a/Source/WebCore/mathml/MathMLScriptsElement.cpp >+++ b/Source/WebCore/mathml/MathMLScriptsElement.cpp >@@ -40,19 +40,19 @@ using namespace MathMLNames; > > static MathMLScriptsElement::ScriptType scriptTypeOf(const QualifiedName& tagName) > { >- if (tagName == msubTag) >+ if (tagName.matches(msubTag)) > return MathMLScriptsElement::ScriptType::Sub; >- if (tagName == msupTag) >+ if (tagName.matches(msupTag)) > return MathMLScriptsElement::ScriptType::Super; >- if (tagName == msubsupTag) >+ if (tagName.matches(msubsupTag)) > return MathMLScriptsElement::ScriptType::SubSup; >- if (tagName == munderTag) >+ if (tagName.matches(munderTag)) > return MathMLScriptsElement::ScriptType::Under; >- if (tagName == moverTag) >+ if (tagName.matches(moverTag)) > return MathMLScriptsElement::ScriptType::Over; >- if (tagName == munderoverTag) >+ if (tagName.matches(munderoverTag)) > return MathMLScriptsElement::ScriptType::UnderOver; >- ASSERT(tagName == mmultiscriptsTag); >+ ASSERT(tagName.matches(mmultiscriptsTag)); > return MathMLScriptsElement::ScriptType::Multiscripts; > } > >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index 41f21c42b93033c6eb9ef9c2268cc926a9a2067d..b7668ba10a0fb3c2c82cb1e33c51313d8d4d16f3 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,17 @@ >+2020-10-11 Rob Buis <rbuis@igalia.com> >+ >+ Various test-cases from Gecko assert with ASSERTION FAILED: tagName == mmultiscriptsTag or ASSERTION FAILED: tagName == mrootTag >+ https://bugs.webkit.org/show_bug.cgi?id=202804 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Reduce Gecko test crashes into two tests. >+ >+ * mathml/scripts-with-prefixes-expected.txt: Added. >+ * mathml/scripts-with-prefixes.xhtml: Added. >+ * mathml/square-roots-with-prefixes-expected.txt: Added. >+ * mathml/square-roots-with-prefixes.xhtml: Added. >+ > 2020-10-10 Oriol Brufau <obrufau@igalia.com> > > Fix mac expectations for text-selection.html >diff --git a/LayoutTests/mathml/scripts-with-prefixes-expected.txt b/LayoutTests/mathml/scripts-with-prefixes-expected.txt >new file mode 100644 >index 0000000000000000000000000000000000000000..0163abc9e4aaa80e758bae75219f43fa55cea177 >--- /dev/null >+++ b/LayoutTests/mathml/scripts-with-prefixes-expected.txt >@@ -0,0 +1,2 @@ >+This test passes if it does not crash. >+ >diff --git a/LayoutTests/mathml/scripts-with-prefixes.xhtml b/LayoutTests/mathml/scripts-with-prefixes.xhtml >new file mode 100644 >index 0000000000000000000000000000000000000000..67b51449fa88ea982c0aef1b271f7985fb723fd0 >--- /dev/null >+++ b/LayoutTests/mathml/scripts-with-prefixes.xhtml >@@ -0,0 +1,20 @@ >+<?xml version="1.0" encoding="UTF-8"?> >+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:m="http://www.w3.org/1998/Math/MathML" xml:lang="en"> >+<head> >+<script> >+ if (window.testRunner) >+ testRunner.dumpAsText(); >+</script> >+</head> >+<body> >+<math xmlns="http://www.w3.org/1998/Math/MathML"> >+ <mtext>This test passes if it does not crash.</mtext> >+ <m:msub/> >+ <m:msup/> >+ <m:msubsup/> >+ <m:mover/> >+ <m:munder/> >+ <m:munderover/> >+</math> >+</body> >+</html> >diff --git a/LayoutTests/mathml/square-roots-with-prefixes-expected.txt b/LayoutTests/mathml/square-roots-with-prefixes-expected.txt >new file mode 100644 >index 0000000000000000000000000000000000000000..0163abc9e4aaa80e758bae75219f43fa55cea177 >--- /dev/null >+++ b/LayoutTests/mathml/square-roots-with-prefixes-expected.txt >@@ -0,0 +1,2 @@ >+This test passes if it does not crash. >+ >diff --git a/LayoutTests/mathml/square-roots-with-prefixes.xhtml b/LayoutTests/mathml/square-roots-with-prefixes.xhtml >new file mode 100644 >index 0000000000000000000000000000000000000000..ff7d8876fcfb90859784a1e2713c56f0a14ec4b7 >--- /dev/null >+++ b/LayoutTests/mathml/square-roots-with-prefixes.xhtml >@@ -0,0 +1,16 @@ >+<?xml version="1.0" encoding="UTF-8"?> >+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:m="http://www.w3.org/1998/Math/MathML" xml:lang="en"> >+<head> >+<script> >+ if (window.testRunner) >+ testRunner.dumpAsText(); >+</script> >+</head> >+<body> >+<math xmlns="http://www.w3.org/1998/Math/MathML"> >+ <mtext>This test passes if it does not crash.</mtext> >+ <m:mroot/> >+ <m:msqrt/> >+</math> >+</body> >+</html>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 202804
:
411048
|
411052
|
411056