<!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>[202250] trunk</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/202250">202250</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-20 16:23:16 -0700 (Mon, 20 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>A composition underline is placed to wrong position in RTL
https://bugs.webkit.org/show_bug.cgi?id=158602
Patch by Fujii Hironori <Hironori.Fujii@sony.com> on 2016-06-20
Reviewed by Myles C. Maxfield.
Source/WebCore:
InlineTextBox::paintCompositionUnderline does not take RTL into
account. The position of composition underline should be
mirrored in RTL.
Test: editing/input/composition-underline-rtl.html
* rendering/InlineTextBox.cpp:
(WebCore::mirrorRTLSegment): New helper function to convert RTL start position to LTR.
(WebCore::InlineTextBox::paintDecoration): Use mirrorRTLSegment.
(WebCore::InlineTextBox::paintCompositionUnderline): Ditto.
LayoutTests:
* editing/input/composition-underline-rtl-expected.html: Added.
* editing/input/composition-underline-rtl.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditinginputcompositionunderlinertlexpectedhtml">trunk/LayoutTests/editing/input/composition-underline-rtl-expected.html</a></li>
<li><a href="#trunkLayoutTestseditinginputcompositionunderlinertlhtml">trunk/LayoutTests/editing/input/composition-underline-rtl.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202249 => 202250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-20 22:41:24 UTC (rev 202249)
+++ trunk/LayoutTests/ChangeLog 2016-06-20 23:23:16 UTC (rev 202250)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-06-20 Fujii Hironori <Hironori.Fujii@sony.com>
+
+ A composition underline is placed to wrong position in RTL
+ https://bugs.webkit.org/show_bug.cgi?id=158602
+
+ Reviewed by Myles C. Maxfield.
+
+ * editing/input/composition-underline-rtl-expected.html: Added.
+ * editing/input/composition-underline-rtl.html: Added.
+
</ins><span class="cx"> 2016-06-20 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Test expectations gardening for
</span></span></pre></div>
<a id="trunkLayoutTestseditinginputcompositionunderlinertlexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/input/composition-underline-rtl-expected.html (0 => 202250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/input/composition-underline-rtl-expected.html (rev 0)
+++ trunk/LayoutTests/editing/input/composition-underline-rtl-expected.html 2016-06-20 23:23:16 UTC (rev 202250)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#test {
+ font-size: 300%;
+}
+</style>
+</head>
+<body>
+The composition underline should be under "XYZ".
+<div id=test contenteditable></div>
+
+<script>
+function moveCaretToBeginningOfElement(elm) {
+ var range = document.createRange();
+ range.selectNodeContents(elm);
+ range.collapse(true);
+ var sel = window.getSelection();
+ sel.removeAllRanges();
+ sel.addRange(range);
+}
+var test = document.getElementById('test');
+test.focus();
+if (window.testRunner) {
+ textInputController.insertText("cba");
+ moveCaretToBeginningOfElement(test);
+ textInputController.setMarkedText("ZYX", 0, 0);
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestseditinginputcompositionunderlinertlhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/input/composition-underline-rtl.html (0 => 202250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/input/composition-underline-rtl.html (rev 0)
+++ trunk/LayoutTests/editing/input/composition-underline-rtl.html 2016-06-20 23:23:16 UTC (rev 202250)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#test {
+ font-size: 300%;
+ text-align: left;
+ direction: rtl;
+ unicode-bidi: bidi-override;
+}
+</style>
+</head>
+<body>
+The composition underline should be under "XYZ".
+<div id=test contenteditable></div>
+
+<script>
+document.getElementById('test').focus();
+if (window.testRunner) {
+ textInputController.insertText("abc");
+ textInputController.setMarkedText("XYZ", 3, 0);
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202249 => 202250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-20 22:41:24 UTC (rev 202249)
+++ trunk/Source/WebCore/ChangeLog 2016-06-20 23:23:16 UTC (rev 202250)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-06-20 Fujii Hironori <Hironori.Fujii@sony.com>
+
+ A composition underline is placed to wrong position in RTL
+ https://bugs.webkit.org/show_bug.cgi?id=158602
+
+ Reviewed by Myles C. Maxfield.
+
+ InlineTextBox::paintCompositionUnderline does not take RTL into
+ account. The position of composition underline should be
+ mirrored in RTL.
+
+ Test: editing/input/composition-underline-rtl.html
+
+ * rendering/InlineTextBox.cpp:
+ (WebCore::mirrorRTLSegment): New helper function to convert RTL start position to LTR.
+ (WebCore::InlineTextBox::paintDecoration): Use mirrorRTLSegment.
+ (WebCore::InlineTextBox::paintCompositionUnderline): Ditto.
+
</ins><span class="cx"> 2016-06-20 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> It should be easy to add a private global helper function for builtins
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (202249 => 202250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2016-06-20 22:41:24 UTC (rev 202249)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2016-06-20 23:23:16 UTC (rev 202250)
</span><span class="lines">@@ -691,6 +691,13 @@
</span><span class="cx"> context.fillRect(snapRectToDevicePixelsWithWritingDirection(selectionRect, renderer().document().deviceScaleFactor(), textRun.ltr()), compositionColor);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline void mirrorRTLSegment(float logicalWidth, TextDirection direction, float& start, float width)
+{
+ if (direction == LTR)
+ return;
+ start = logicalWidth - width - start;
+}
+
</ins><span class="cx"> void InlineTextBox::paintDecoration(GraphicsContext& context, const FontCascade& font, RenderCombineText* combinedText, const TextRun& textRun, const FloatPoint& textOrigin,
</span><span class="cx"> const FloatRect& boxRect, TextDecoration decoration, TextPaintStyle textPaintStyle, const ShadowData* shadow)
</span><span class="cx"> {
</span><span class="lines">@@ -697,16 +704,15 @@
</span><span class="cx"> if (m_truncation == cFullTruncation)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- FloatPoint localOrigin = boxRect.location();
</del><span class="cx"> updateGraphicsContext(context, textPaintStyle);
</span><span class="cx"> if (combinedText)
</span><span class="cx"> context.concatCTM(rotation(boxRect, Clockwise));
</span><span class="cx">
</span><ins>+ float start = 0;
</ins><span class="cx"> float width = m_logicalWidth;
</span><span class="cx"> if (m_truncation != cNoTruncation) {
</span><span class="cx"> width = renderer().width(m_start, m_truncation, textPos(), isFirstLine());
</span><del>- if (!isLeftToRightDirection())
- localOrigin.move(m_logicalWidth - width, 0);
</del><ins>+ mirrorRTLSegment(m_logicalWidth, direction(), start, width);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int baseline = lineStyle().fontMetrics().ascent();
</span><span class="lines">@@ -718,6 +724,8 @@
</span><span class="cx"> decorationPainter.setIsHorizontal(isHorizontal());
</span><span class="cx"> decorationPainter.addTextShadow(shadow);
</span><span class="cx">
</span><ins>+ FloatPoint localOrigin = boxRect.location();
+ localOrigin.move(start, 0);
</ins><span class="cx"> decorationPainter.paintTextDecoration(textRun, textOrigin, localOrigin);
</span><span class="cx">
</span><span class="cx"> if (combinedText)
</span><span class="lines">@@ -934,6 +942,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (!useWholeWidth) {
</span><span class="cx"> width = renderer().width(paintStart, paintEnd - paintStart, textPos() + start, isFirstLine());
</span><ins>+ mirrorRTLSegment(m_logicalWidth, direction(), start, width);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Thick marked text underlines are 2px thick as long as there is room for the 2px line under the baseline.
</span></span></pre>
</div>
</div>
</body>
</html>