<!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>[180150] 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/180150">180150</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2015-02-16 09:47:27 -0800 (Mon, 16 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.html: Added.
text-underline-position:under has multiple correctness issues
https://bugs.webkit.org/show_bug.cgi?id=141528
Reviewed by Dean Jackson.
Source/WebCore:
Added a bunch of new tests in fast/text
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
(WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
(WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
* rendering/InlineFlowBox.h:
These functions have been re-written to take an enclosing renderer that specified the
decoration. This way they can properly limit the bottom/top computation to only line boxes
that are contained inside the renderer.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
Tweak the call to get the decoration colors now that quirks mode has been removed.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::enclosingRendererWithTextDecoration):
* rendering/RenderElement.h:
New function that finds the enclosing renderer that specified a text decoration. For now
this is only used in the "under" position computation, but soon we'll be using it
everywhere.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::getTextDecorationColors):
* rendering/RenderObject.h:
Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalBottom): Deleted.
* rendering/RootInlineBox.h:
Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
the InlineFlowBox functions directly.
* style/InlineTextBoxStyle.cpp:
(WebCore::computeUnderlineOffset):
Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
computation to limit which line boxes get included.
LayoutTests:
* fast/text/text-underline-first-line-decoration-expected.html: Added.
* fast/text/text-underline-first-line-decoration.html: Added.
* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
* fast/text/text-underline-position-mixed-fonts.html: Added.
* fast/text/text-underline-position-subscript-expected.html: Added.
* fast/text/text-underline-position-subscript.html: Added.
* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
* fast/text/text-underline-vertical-first-line-decoration.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="#trunkSourceWebCorerenderingInlineFlowBoxcpp">trunk/Source/WebCore/rendering/InlineFlowBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineFlowBoxh">trunk/Source/WebCore/rendering/InlineFlowBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRootInlineBoxcpp">trunk/Source/WebCore/rendering/RootInlineBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRootInlineBoxh">trunk/Source/WebCore/rendering/RootInlineBox.h</a></li>
<li><a href="#trunkSourceWebCorestyleInlineTextBoxStylecpp">trunk/Source/WebCore/style/InlineTextBoxStyle.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttexttextunderlinefirstlinedecorationexpectedhtml">trunk/LayoutTests/fast/text/text-underline-first-line-decoration-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttexttextunderlinefirstlinedecorationhtml">trunk/LayoutTests/fast/text/text-underline-first-line-decoration.html</a></li>
<li><a href="#trunkLayoutTestsfasttexttextunderlinepositionmixedfontsexpectedhtml">trunk/LayoutTests/fast/text/text-underline-position-mixed-fonts-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttexttextunderlinepositionmixedfontshtml">trunk/LayoutTests/fast/text/text-underline-position-mixed-fonts.html</a></li>
<li><a href="#trunkLayoutTestsfasttexttextunderlinepositionsubscriptexpectedhtml">trunk/LayoutTests/fast/text/text-underline-position-subscript-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttexttextunderlinepositionsubscripthtml">trunk/LayoutTests/fast/text/text-underline-position-subscript.html</a></li>
<li><a href="#trunkLayoutTestsfasttexttextunderlineverticalfirstlinedecorationexpectedhtml">trunk/LayoutTests/fast/text/text-underline-vertical-first-line-decoration-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttexttextunderlineverticalfirstlinedecorationhtml">trunk/LayoutTests/fast/text/text-underline-vertical-first-line-decoration.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (180149 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-16 17:17:39 UTC (rev 180149)
+++ trunk/LayoutTests/ChangeLog 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-02-12 David Hyatt <hyatt@apple.com>
+
+ text-underline-position:under has multiple correctness issues
+ https://bugs.webkit.org/show_bug.cgi?id=141528
+
+ Reviewed by Dean Jackson.
+
+ * fast/text/text-underline-first-line-decoration-expected.html: Added.
+ * fast/text/text-underline-first-line-decoration.html: Added.
+ * fast/text/text-underline-position-mixed-fonts-expected.html: Added.
+ * fast/text/text-underline-position-mixed-fonts.html: Added.
+ * fast/text/text-underline-position-subscript-expected.html: Added.
+ * fast/text/text-underline-position-subscript.html: Added.
+ * fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
+ * fast/text/text-underline-vertical-first-line-decoration.html: Added.
+
</ins><span class="cx"> 2015-02-16 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Develop/Disable Caches does not properly disable disk cache
</span></span></pre></div>
<a id="trunkLayoutTestsfasttexttextunderlinefirstlinedecorationexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/text-underline-first-line-decoration-expected.html (0 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/text-underline-first-line-decoration-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/text-underline-first-line-decoration-expected.html 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!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" xmlns:ibooks="http://apple.com/ibooks/html-extensions" xmlns:epub="http://www.idpf.org/2007/ops">
+<head>
+</head>
+<body style="overflow:hidden">
+<p>Test to make sure that the decoration line paints properly underneath the subscript.
+</p>
+
+<p class="decorate" style="font-size:24px; float:left;-webkit-text-underline-position:under; border:1px dotted orange">
+<span style="text-decoration:underline">The first line <span style="vertical-align:-20px">has a decoration,</span> but not </span><img style="vertical-align:-100px; height:20px;width:20px;background-color:lime"><span style="text-decoration:underline"> under the image.</span><br>
+The second line should not.
+</p>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttexttextunderlinefirstlinedecorationhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/text-underline-first-line-decoration.html (0 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/text-underline-first-line-decoration.html (rev 0)
+++ trunk/LayoutTests/fast/text/text-underline-first-line-decoration.html 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!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" xmlns:ibooks="http://apple.com/ibooks/html-extensions" xmlns:epub="http://www.idpf.org/2007/ops">
+<head>
+<style>
+.decorate::first-line { text-decoration:underline }
+</style>
+</head>
+<body style="overflow:hidden">
+<p>Test to make sure that the decoration line paints properly underneath the subscript.
+</p>
+
+<p class="decorate" style="font-size:24px; float:left;-webkit-text-underline-position:under; border:1px dotted orange">
+The first line <span style="vertical-align:-20px">has a decoration,</span> but not <img style="vertical-align:-100px; height:20px;width:20px;background-color:lime"> under the image.<br>
+The second line should not.
+</p>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttexttextunderlinepositionmixedfontsexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/text-underline-position-mixed-fonts-expected.html (0 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/text-underline-position-mixed-fonts-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/text-underline-position-mixed-fonts-expected.html 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!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" xmlns:ibooks="http://apple.com/ibooks/html-extensions" xmlns:epub="http://www.idpf.org/2007/ops">
+<body style="overflow:hidden">
+<p>Test to make sure gigantic fonts that aren't inside the text decoration don't affect the position of
+the line. The giant font is invisible (color:transparent) in this test.
+</p>
+
+<span style="text-decoration:underline;-webkit-text-underline-position:under">This text should be underlined just under the descenders.</span>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttexttextunderlinepositionmixedfontshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/text-underline-position-mixed-fonts.html (0 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/text-underline-position-mixed-fonts.html (rev 0)
+++ trunk/LayoutTests/fast/text/text-underline-position-mixed-fonts.html 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!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" xmlns:ibooks="http://apple.com/ibooks/html-extensions" xmlns:epub="http://www.idpf.org/2007/ops">
+<body style="overflow:hidden">
+<p>Test to make sure gigantic fonts that aren't inside the text decoration don't affect the position of
+the line. The giant font is invisible (color:transparent) in this test.
+</p>
+
+<span style="text-decoration:underline;-webkit-text-underline-position:under">This text should be underlined just under the descenders.</span> <span style="font-size:64px; vertical-align:-256px; color:transparent">Should not be underlined.</span>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttexttextunderlinepositionsubscriptexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/text-underline-position-subscript-expected.html (0 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/text-underline-position-subscript-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/text-underline-position-subscript-expected.html 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!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" xmlns:ibooks="http://apple.com/ibooks/html-extensions" xmlns:epub="http://www.idpf.org/2007/ops">
+<head>
+<style>
+.yellow::first-line { color:grey }
+</style>
+</head>
+<body>
+<p>Test to make sure that the decoration line paints properly underneath the subscript.
+</p>
+
+<p class="yellow" style="font-size:40px; padding-top:5px; float:left; text-decoration:underline;-webkit-text-underline-position:under; border:1px dotted orange"><span style="position:relative;">Here is the subscript for this line.</span>
+</p>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttexttextunderlinepositionsubscripthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/text-underline-position-subscript.html (0 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/text-underline-position-subscript.html (rev 0)
+++ trunk/LayoutTests/fast/text/text-underline-position-subscript.html 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!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" xmlns:ibooks="http://apple.com/ibooks/html-extensions" xmlns:epub="http://www.idpf.org/2007/ops">
+<head>
+<style>
+.yellow::first-line { color:grey }
+</style>
+</head>
+<body>
+<p>Test to make sure that the decoration line paints properly underneath the subscript.
+</p>
+
+<p class="yellow" style="font-size:40px; float:left; text-decoration:underline;-webkit-text-underline-position:under; border:1px dotted orange"><span style="vertical-align:-5px;">Here is the subscript for this line.</span>
+</p>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttexttextunderlineverticalfirstlinedecorationexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/text-underline-vertical-first-line-decoration-expected.html (0 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/text-underline-vertical-first-line-decoration-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/text-underline-vertical-first-line-decoration-expected.html 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!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" xmlns:ibooks="http://apple.com/ibooks/html-extensions" xmlns:epub="http://www.idpf.org/2007/ops">
+<head>
+</head>
+<body style="overflow:hidden">
+<p>Test to make sure that the decoration line paints properly underneath the subscript.
+</p>
+
+<p class="decorate" style="-webkit-writing-mode:vertical-lr; margin-right:10px; font-size:24px; float:left;-webkit-text-underline-position:under; border:1px dotted orange">
+<span style="text-decoration:underline">The first line <span style="vertical-align:-20px">has a decoration,</span> but not </span><img style="vertical-align:-100px; height:20px;width:20px;background-color:lime"><span style="text-decoration:underline"> under the image.</span><br>
+The second line should not.
+</p>
+
+<p class="decorate" style="-webkit-writing-mode:vertical-rl; margin-right:10px; font-size:24px; float:left;-webkit-text-underline-position:under; border:1px dotted orange">
+<span style="text-decoration:underline">The first line <span style="vertical-align:-20px">has a decoration,</span> but not </span><img style="vertical-align:-100px; height:20px;width:20px;background-color:lime"><span style="text-decoration:underline"> under the image.</span><br>
+The second line should not.
+</p>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttexttextunderlineverticalfirstlinedecorationhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/text-underline-vertical-first-line-decoration.html (0 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/text-underline-vertical-first-line-decoration.html (rev 0)
+++ trunk/LayoutTests/fast/text/text-underline-vertical-first-line-decoration.html 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!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" xmlns:ibooks="http://apple.com/ibooks/html-extensions" xmlns:epub="http://www.idpf.org/2007/ops">
+<head>
+<style>
+.decorate::first-line { text-decoration:underline }
+</style>
+</head>
+<body style="overflow:hidden">
+<p>Test to make sure that the decoration line paints properly underneath the subscript.
+</p>
+
+<p class="decorate" style="-webkit-writing-mode:vertical-lr; margin-right:10px; font-size:24px; float:left;-webkit-text-underline-position:under; border:1px dotted orange">
+The first line <span style="vertical-align:-20px">has a decoration,</span> but not <img style="vertical-align:-100px; height:20px;width:20px;background-color:lime"> under the image.<br>
+The second line should not.
+</p>
+
+<p class="decorate" style="-webkit-writing-mode:vertical-rl; margin-right:10px; font-size:24px; float:left;-webkit-text-underline-position:under; border:1px dotted orange">
+The first line <span style="vertical-align:-20px">has a decoration,</span> but not <img style="vertical-align:-100px; height:20px;width:20px;background-color:lime"> under the image.<br>
+The second line should not.
+</p>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180149 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-16 17:17:39 UTC (rev 180149)
+++ trunk/Source/WebCore/ChangeLog 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2015-02-12 David Hyatt <hyatt@apple.com>
+
+ text-underline-position:under has multiple correctness issues
+ https://bugs.webkit.org/show_bug.cgi?id=141528
+
+ Reviewed by Dean Jackson.
+
+ Added a bunch of new tests in fast/text
+
+ * rendering/InlineFlowBox.cpp:
+ (WebCore::InlineFlowBox::maxLogicalBottomForTextDecorationLine):
+ (WebCore::InlineFlowBox::minLogicalTopForTextDecorationLine):
+ (WebCore::InlineFlowBox::computeMaxLogicalBottom): Deleted.
+ * rendering/InlineFlowBox.h:
+ These functions have been re-written to take an enclosing renderer that specified the
+ decoration. This way they can properly limit the bottom/top computation to only line boxes
+ that are contained inside the renderer.
+
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::paintDecoration):
+ Tweak the call to get the decoration colors now that quirks mode has been removed.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::enclosingRendererWithTextDecoration):
+ * rendering/RenderElement.h:
+ New function that finds the enclosing renderer that specified a text decoration. For now
+ this is only used in the "under" position computation, but soon we'll be using it
+ everywhere.
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::getTextDecorationColors):
+ * rendering/RenderObject.h:
+ Remove the quirks mode argument, since we were always passing true anyway (making the argument dead).
+
+ * rendering/RootInlineBox.cpp:
+ (WebCore::RootInlineBox::maxLogicalBottom): Deleted.
+ * rendering/RootInlineBox.h:
+ Get rid of these functions and just have InlineTextBoxStyle's computeUnderLineOffset function call
+ the InlineFlowBox functions directly.
+
+ * style/InlineTextBoxStyle.cpp:
+ (WebCore::computeUnderlineOffset):
+ Re-written to fetch the enclosingRendererWithTextDecoration so that it can be passed to the logical top/bottom
+ computation to limit which line boxes get included.
+
</ins><span class="cx"> 2015-02-16 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> FEGaussianBlur::calculateUnscaledKernelSize does unspeakable things with signed and unsigned values
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineFlowBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineFlowBox.cpp (180149 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2015-02-16 17:17:39 UTC (rev 180149)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -748,18 +748,45 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InlineFlowBox::computeMaxLogicalBottom(float& maxLogicalBottom) const
</del><ins>+void InlineFlowBox::maxLogicalBottomForTextDecorationLine(float& maxLogicalBottom, const RenderElement* decorationRenderer, TextDecoration textDecoration) const
</ins><span class="cx"> {
</span><span class="cx"> for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) {
</span><span class="cx"> if (child->renderer().isOutOfFlowPositioned())
</span><span class="cx"> continue; // Positioned placeholders don't affect calculations.
</span><ins>+
+ if (!(child->lineStyle().textDecorationsInEffect() & textDecoration))
+ continue; // If the text decoration isn't in effect on the child, then it must be outside of |decorationRenderer|'s hierarchy.
+
+ if (decorationRenderer && decorationRenderer->isRenderInline() && !isAncestorAndWithinBlock(downcast<RenderInline>(*decorationRenderer), &child->renderer()))
+ continue;
+
+ if (is<InlineFlowBox>(*child))
+ downcast<InlineFlowBox>(*child).maxLogicalBottomForTextDecorationLine(maxLogicalBottom, decorationRenderer, textDecoration);
+ else {
+ if (child->isInlineTextBox() || child->lineStyle().textDecorationSkip() == TextDecorationSkipNone)
+ maxLogicalBottom = std::max<float>(maxLogicalBottom, child->logicalBottom());
+ }
+ }
+}
</ins><span class="cx">
</span><del>- if (descendantsHaveSameLineHeightAndBaseline())
</del><ins>+void InlineFlowBox::minLogicalTopForTextDecorationLine(float& minLogicalTop, const RenderElement* decorationRenderer, TextDecoration textDecoration) const
+{
+ for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) {
+ if (child->renderer().isOutOfFlowPositioned())
+ continue; // Positioned placeholders don't affect calculations.
+
+ if (!(child->lineStyle().textDecorationsInEffect() & textDecoration))
+ continue; // If the text decoration isn't in effect on the child, then it must be outside of |decorationRenderer|'s hierarchy.
+
+ if (decorationRenderer && decorationRenderer->isRenderInline() && !isAncestorAndWithinBlock(downcast<RenderInline>(*decorationRenderer), &child->renderer()))
</ins><span class="cx"> continue;
</span><del>-
- maxLogicalBottom = std::max<float>(maxLogicalBottom, child->logicalBottom());
</del><ins>+
</ins><span class="cx"> if (is<InlineFlowBox>(*child))
</span><del>- downcast<InlineFlowBox>(*child).computeMaxLogicalBottom(maxLogicalBottom);
</del><ins>+ downcast<InlineFlowBox>(*child).minLogicalTopForTextDecorationLine(minLogicalTop, decorationRenderer, textDecoration);
+ else {
+ if (child->isInlineTextBox() || child->lineStyle().textDecorationSkip() == TextDecorationSkipNone)
+ minLogicalTop = std::min<float>(minLogicalTop, child->logicalTop());
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineFlowBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineFlowBox.h (180149 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineFlowBox.h 2015-02-16 17:17:39 UTC (rev 180149)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.h 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -293,6 +293,10 @@
</span><span class="cx">
</span><span class="cx"> void computeReplacedAndTextLineTopAndBottom(LayoutUnit& lineTop, LayoutUnit& lineBottom) const;
</span><span class="cx">
</span><ins>+ // Used to calculate the underline offset for TextUnderlinePositionUnder.
+ void maxLogicalBottomForTextDecorationLine(float& maxLogicalBottom, const RenderElement* decorationRenderer, TextDecoration) const;
+ void minLogicalTopForTextDecorationLine(float& minLogicalTop, const RenderElement* decorationRenderer, TextDecoration) const;
+
</ins><span class="cx"> private:
</span><span class="cx"> virtual bool isInlineFlowBox() const override final { return true; }
</span><span class="cx"> void boxModelObject() const = delete;
</span><span class="lines">@@ -312,9 +316,6 @@
</span><span class="cx"> InlineFlowBox* m_prevLineBox; // The previous box that also uses our RenderObject
</span><span class="cx"> InlineFlowBox* m_nextLineBox; // The next box that also uses our RenderObject
</span><span class="cx">
</span><del>- // Maximum logicalBottom among all children of an InlineFlowBox. Used to
- // calculate the offset for TextUnderlinePositionUnder.
- void computeMaxLogicalBottom(float& maxLogicalBottom) const;
</del><span class="cx"> private:
</span><span class="cx"> unsigned m_includeLogicalLeftEdge : 1;
</span><span class="cx"> unsigned m_includeLogicalRightEdge : 1;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (180149 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2015-02-16 17:17:39 UTC (rev 180149)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -915,9 +915,9 @@
</span><span class="cx">
</span><span class="cx"> // Get the text decoration colors.
</span><span class="cx"> Color underline, overline, linethrough;
</span><del>- renderer().getTextDecorationColors(decoration, underline, overline, linethrough, true);
</del><ins>+ renderer().getTextDecorationColors(decoration, underline, overline, linethrough);
</ins><span class="cx"> if (isFirstLine())
</span><del>- renderer().getTextDecorationColors(decoration, underline, overline, linethrough, true, true);
</del><ins>+ renderer().getTextDecorationColors(decoration, underline, overline, linethrough, true);
</ins><span class="cx">
</span><span class="cx"> // Use a special function for underlines to get the positioning exactly right.
</span><span class="cx"> bool isPrinting = renderer().document().printing();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (180149 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2015-02-16 17:17:39 UTC (rev 180149)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -1675,4 +1675,22 @@
</span><span class="cx"> return enclosingLayoutRect(FloatRect(upperLeft, lowerRight.expandedTo(upperLeft) - upperLeft));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+const RenderElement* RenderElement::enclosingRendererWithTextDecoration(TextDecoration textDecoration, bool firstLine) const
+{
+ const RenderElement* current = this;
+ do {
+ if (current->isRenderBlock())
+ return current;
+ if (!current->isRenderInline() || current->isRubyText())
+ return nullptr;
+
+ const RenderStyle& styleToUse = firstLine ? current->firstLineStyle() : current->style();
+ if (styleToUse.textDecoration() & textDecoration)
+ return current;
+ current = current->parent();
+ } while (current && (!current->element() || (!is<HTMLAnchorElement>(*current->element()) && !current->element()->hasTagName(HTMLNames::fontTag))));
+
+ return current;
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (180149 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2015-02-16 17:17:39 UTC (rev 180149)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -191,6 +191,8 @@
</span><span class="cx">
</span><span class="cx"> bool isCSSAnimating() const { return m_isCSSAnimating; }
</span><span class="cx"> void setIsCSSAnimating(bool b) { m_isCSSAnimating = b; }
</span><ins>+
+ const RenderElement* enclosingRendererWithTextDecoration(TextDecoration, bool firstLine) const;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> enum BaseTypeFlags {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (180149 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-02-16 17:17:39 UTC (rev 180149)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -2110,8 +2110,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderObject::getTextDecorationColors(int decorations, Color& underline, Color& overline,
- Color& linethrough, bool quirksMode, bool firstlineStyle)
</del><ins>+void RenderObject::getTextDecorationColors(int decorations, Color& underline, Color& overline, Color& linethrough, bool firstlineStyle)
</ins><span class="cx"> {
</span><span class="cx"> RenderObject* current = this;
</span><span class="cx"> RenderStyle* styleToUse = nullptr;
</span><span class="lines">@@ -2141,7 +2140,7 @@
</span><span class="cx"> current = current->parent();
</span><span class="cx"> if (current && current->isAnonymousBlock() && downcast<RenderBlock>(*current).continuation())
</span><span class="cx"> current = downcast<RenderBlock>(*current).continuation();
</span><del>- } while (current && decorations && (!quirksMode || !current->node() || (!is<HTMLAnchorElement>(*current->node()) && !current->node()->hasTagName(fontTag))));
</del><ins>+ } while (current && decorations && (!current->node() || (!is<HTMLAnchorElement>(*current->node()) && !current->node()->hasTagName(fontTag))));
</ins><span class="cx">
</span><span class="cx"> // If we bailed out, use the element we bailed out at (typically a <font> or <a> element).
</span><span class="cx"> if (decorations && current) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (180149 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2015-02-16 17:17:39 UTC (rev 180149)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -703,7 +703,7 @@
</span><span class="cx">
</span><span class="cx"> virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const;
</span><span class="cx">
</span><del>- void getTextDecorationColors(int decorations, Color& underline, Color& overline, Color& linethrough, bool quirksMode = false, bool firstlineStyle = false);
</del><ins>+ void getTextDecorationColors(int decorations, Color& underline, Color& overline, Color& linethrough, bool firstlineStyle = false);
</ins><span class="cx">
</span><span class="cx"> // Return the RenderLayerModelObject in the container chain which is responsible for painting this object, or 0
</span><span class="cx"> // if painting is root-relative. This is the container that should be passed to the 'forRepaint'
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRootInlineBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RootInlineBox.cpp (180149 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RootInlineBox.cpp 2015-02-16 17:17:39 UTC (rev 180149)
+++ trunk/Source/WebCore/rendering/RootInlineBox.cpp 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -314,13 +314,6 @@
</span><span class="cx"> return heightOfBlock + maxHeight;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-float RootInlineBox::maxLogicalBottom() const
-{
- float maxLogicalBottom = logicalBottom();
- computeMaxLogicalBottom(maxLogicalBottom);
- return maxLogicalBottom;
-}
-
</del><span class="cx"> LayoutUnit RootInlineBox::beforeAnnotationsAdjustment() const
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit result = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRootInlineBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RootInlineBox.h (180149 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RootInlineBox.h 2015-02-16 17:17:39 UTC (rev 180149)
+++ trunk/Source/WebCore/rendering/RootInlineBox.h 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -187,9 +187,6 @@
</span><span class="cx"> return InlineFlowBox::logicalBottomLayoutOverflow(lineBottom());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Used to calculate the underline offset for TextUnderlinePositionUnder.
- float maxLogicalBottom() const;
-
</del><span class="cx"> Node* getLogicalStartBoxWithNode(InlineBox*&) const;
</span><span class="cx"> Node* getLogicalEndBoxWithNode(InlineBox*&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestyleInlineTextBoxStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/InlineTextBoxStyle.cpp (180149 => 180150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/InlineTextBoxStyle.cpp 2015-02-16 17:17:39 UTC (rev 180149)
+++ trunk/Source/WebCore/style/InlineTextBoxStyle.cpp 2015-02-16 17:47:27 UTC (rev 180150)
</span><span class="lines">@@ -46,7 +46,19 @@
</span><span class="cx"> case TextUnderlinePositionUnder: {
</span><span class="cx"> ASSERT(inlineTextBox);
</span><span class="cx"> // Position underline relative to the bottom edge of the lowest element's content box.
</span><del>- float offset = inlineTextBox->root().maxLogicalBottom() - inlineTextBox->logicalBottom();
</del><ins>+ const RootInlineBox& rootBox = inlineTextBox->root();
+ const RenderElement* decorationRenderer = inlineTextBox->parent()->renderer().enclosingRendererWithTextDecoration(TextDecorationUnderline, inlineTextBox->isFirstLine());
+
+ float offset;
+ if (inlineTextBox->renderer().style().isFlippedLinesWritingMode()) {
+ offset = inlineTextBox->logicalTop();
+ rootBox.minLogicalTopForTextDecorationLine(offset, decorationRenderer, TextDecorationUnderline);
+ offset = inlineTextBox->logicalTop() - offset;
+ } else {
+ offset = inlineTextBox->logicalBottom();
+ rootBox.maxLogicalBottomForTextDecorationLine(offset, decorationRenderer, TextDecorationUnderline);
+ offset -= inlineTextBox->logicalBottom();
+ }
</ins><span class="cx"> return inlineTextBox->logicalHeight() + gap + std::max<float>(offset, 0);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>