Title: [222721] trunk/Source/WebCore
- Revision
- 222721
- Author
- [email protected]
- Date
- 2017-10-02 10:59:36 -0700 (Mon, 02 Oct 2017)
Log Message
Fix build with MathML disabled
https://bugs.webkit.org/show_bug.cgi?id=177744
Patch by Olivier Blin <[email protected]> on 2017-10-02
Reviewed by Michael Catanzaro.
These are regressions from r217549 (StyleResolver) and r221379 (RenderBlockFlow), which do not guard MathML usage.
* css/StyleResolver.cpp:
(WebCore::hasEffectiveDisplayNoneForDisplayContents):
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::willCreateColumns const):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (222720 => 222721)
--- trunk/Source/WebCore/ChangeLog 2017-10-02 17:58:49 UTC (rev 222720)
+++ trunk/Source/WebCore/ChangeLog 2017-10-02 17:59:36 UTC (rev 222721)
@@ -1,3 +1,17 @@
+2017-10-02 Olivier Blin <[email protected]>
+
+ Fix build with MathML disabled
+ https://bugs.webkit.org/show_bug.cgi?id=177744
+
+ Reviewed by Michael Catanzaro.
+
+ These are regressions from r217549 (StyleResolver) and r221379 (RenderBlockFlow), which do not guard MathML usage.
+
+ * css/StyleResolver.cpp:
+ (WebCore::hasEffectiveDisplayNoneForDisplayContents):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::willCreateColumns const):
+
2017-10-02 Yusuke Suzuki <[email protected]>
Use ThreadIdentifier instead of thread::this_thread::get_id
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (222720 => 222721)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2017-10-02 17:58:49 UTC (rev 222720)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2017-10-02 17:59:36 UTC (rev 222721)
@@ -779,9 +779,11 @@
// FIXME: <g>, <use> and <tspan> have special (?) behavior for display:contents in the current draft spec.
if (is<SVGElement>(element))
return true;
+#if ENABLE(MATHML)
// Not sure MathML code can handle it.
if (is<MathMLElement>(element))
return true;
+#endif // ENABLE(MATHML)
if (!is<HTMLElement>(element))
return false;
return tagNames.get().contains(element.localName());
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (222720 => 222721)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-10-02 17:58:49 UTC (rev 222720)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-10-02 17:59:36 UTC (rev 222721)
@@ -430,8 +430,12 @@
// The following types are not supposed to create multicol context.
if (isFileUploadControl() || isTextControl() || isListBox())
return false;
- if (isRenderSVGBlock() || isRenderMathMLBlock() || isRubyRun())
+ if (isRenderSVGBlock() || isRubyRun())
return false;
+#if ENABLE(MATHML)
+ if (isRenderMathMLBlock())
+ return false;
+#endif // ENABLE(MATHML)
if (!firstChild())
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
