<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[175261] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/175261">175261</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-28 11:00:09 -0700 (Tue, 28 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use constants from wtf/MathExtras.h
https://bugs.webkit.org/show_bug.cgi?id=137967
Patch by Milan Crha <mcrha@redhat.com> on 2014-10-28
Reviewed by Darin Adler.
Source/WebCore:
* platform/graphics/freetype/FontPlatformDataFreeType.cpp:
(WebCore::rotateCairoMatrixForVerticalOrientation):
* rendering/mathml/RenderMathMLMenclose.cpp:
(WebCore::RenderMathMLMenclose::computePreferredLogicalWidths):
(WebCore::RenderMathMLMenclose::updateLogicalHeight):
* rendering/mathml/RenderMathMLOperator.cpp:
(WebCore::RenderMathMLOperator::getDisplayStyleLargeOperator):
Source/WTF:
* wtf/MathExtras.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfMathExtrash">trunk/Source/WTF/wtf/MathExtras.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfreetypeFontPlatformDataFreeTypecpp">trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLMenclosecpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLOperatorcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (175260 => 175261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-10-28 17:58:24 UTC (rev 175260)
+++ trunk/Source/WTF/ChangeLog 2014-10-28 18:00:09 UTC (rev 175261)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-10-28 Milan Crha <mcrha@redhat.com>
+
+ Use constants from wtf/MathExtras.h
+ https://bugs.webkit.org/show_bug.cgi?id=137967
+
+ Reviewed by Darin Adler.
+
+ * wtf/MathExtras.h:
+
</ins><span class="cx"> 2014-10-28 Tibor Meszaros <tmeszaros.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Remove unnecessary defines from OptionsEfl.cmake
</span></span></pre></div>
<a id="trunkSourceWTFwtfMathExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MathExtras.h (175260 => 175261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MathExtras.h 2014-10-28 17:58:24 UTC (rev 175260)
+++ trunk/Source/WTF/wtf/MathExtras.h 2014-10-28 18:00:09 UTC (rev 175261)
</span><span class="lines">@@ -67,6 +67,14 @@
</span><span class="cx"> const float piOverFourFloat = static_cast<float>(M_PI_4);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#ifndef M_SQRT2
+const double sqrtOfTwoDouble = 1.41421356237309504880;
+const float sqrtOfTwoFloat = 1.41421356237309504880f;
+#else
+const double sqrtOfTwoDouble = M_SQRT2;
+const float sqrtOfTwoFloat = static_cast<float>(M_SQRT2);
+#endif
+
</ins><span class="cx"> #if OS(DARWIN)
</span><span class="cx">
</span><span class="cx"> // Work around a bug in the Mac OS X libc where ceil(-0.1) return +0.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175260 => 175261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-28 17:58:24 UTC (rev 175260)
+++ trunk/Source/WebCore/ChangeLog 2014-10-28 18:00:09 UTC (rev 175261)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-10-28 Milan Crha <mcrha@redhat.com>
+
+ Use constants from wtf/MathExtras.h
+ https://bugs.webkit.org/show_bug.cgi?id=137967
+
+ Reviewed by Darin Adler.
+
+ * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+ (WebCore::rotateCairoMatrixForVerticalOrientation):
+ * rendering/mathml/RenderMathMLMenclose.cpp:
+ (WebCore::RenderMathMLMenclose::computePreferredLogicalWidths):
+ (WebCore::RenderMathMLMenclose::updateLogicalHeight):
+ * rendering/mathml/RenderMathMLOperator.cpp:
+ (WebCore::RenderMathMLOperator::getDisplayStyleLargeOperator):
+
</ins><span class="cx"> 2014-10-28 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Selection gap painting is ugly for ruby bases.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfreetypeFontPlatformDataFreeTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp (175260 => 175261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2014-10-28 17:58:24 UTC (rev 175260)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2014-10-28 18:00:09 UTC (rev 175261)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include <fontconfig/fcfreetype.h>
</span><span class="cx"> #include <ft2build.h>
</span><span class="cx"> #include FT_TRUETYPE_TABLES_H
</span><ins>+#include <wtf/MathExtras.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(EFL)
</span><span class="lines">@@ -120,7 +121,7 @@
</span><span class="cx"> // combination of rotation (R) and translation (T) applied on the
</span><span class="cx"> // horizontal matrix (H). V = H . R . T, where R rotates by -90 degrees
</span><span class="cx"> // and T translates by font size towards y axis.
</span><del>- cairo_matrix_rotate(matrix, -M_PI_2);
</del><ins>+ cairo_matrix_rotate(matrix, -piOverTwoDouble);
</ins><span class="cx"> cairo_matrix_translate(matrix, 0.0, 1.0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLMenclosecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp (175260 => 175261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp 2014-10-28 17:58:24 UTC (rev 175260)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp 2014-10-28 18:00:09 UTC (rev 175261)
</span><span class="lines">@@ -72,8 +72,8 @@
</span><span class="cx"> size_t notationalValueSize = notationValues.size();
</span><span class="cx"> for (size_t i = 0; i < notationalValueSize; i++) {
</span><span class="cx"> if (notationValues[i] == "circle") {
</span><del>- m_minPreferredLogicalWidth = minPreferredLogicalWidth() * float(M_SQRT2);
- m_maxPreferredLogicalWidth = maxPreferredLogicalWidth() * float(M_SQRT2);
</del><ins>+ m_minPreferredLogicalWidth = minPreferredLogicalWidth() * sqrtOfTwoFloat;
+ m_maxPreferredLogicalWidth = maxPreferredLogicalWidth() * sqrtOfTwoFloat;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> size_t notationalValueSize = notationValues.size();
</span><span class="cx"> for (size_t i = 0; i < notationalValueSize; i++)
</span><span class="cx"> if (notationValues[i] == "circle")
</span><del>- setLogicalHeight(logicalHeight() * float(M_SQRT2));
</del><ins>+ setLogicalHeight(logicalHeight() * sqrtOfTwoFloat);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderMathMLMenclose::paint(PaintInfo& info, const LayoutPoint& paintOffset)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLOperatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp (175260 => 175261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp 2014-10-28 17:58:24 UTC (rev 175260)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp 2014-10-28 18:00:09 UTC (rev 175261)
</span><span class="lines">@@ -1548,7 +1548,7 @@
</span><span class="cx"> Vector<OpenTypeMathData::AssemblyPart> assemblyParts;
</span><span class="cx">
</span><span class="cx"> // The value of displayOperatorMinHeight is sometimes too small, so we ensure that it is at least \sqrt{2} times the size of the base glyph.
</span><del>- float displayOperatorMinHeight = std::max(baseGlyph.fontData->boundsForGlyph(baseGlyph.glyph).height() * float(M_SQRT2), primaryFontData->mathData()->getMathConstant(primaryFontData, OpenTypeMathData::DisplayOperatorMinHeight));
</del><ins>+ float displayOperatorMinHeight = std::max(baseGlyph.fontData->boundsForGlyph(baseGlyph.glyph).height() * sqrtOfTwoFloat, primaryFontData->mathData()->getMathConstant(primaryFontData, OpenTypeMathData::DisplayOperatorMinHeight));
</ins><span class="cx">
</span><span class="cx"> primaryFontData->mathData()->getMathVariants(baseGlyph.glyph, true, sizeVariants, assemblyParts);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>