<!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>[184675] 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/184675">184675</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-05-20 16:34:48 -0700 (Wed, 20 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/172591">r172591</a>): Can no longer style <optgroup> with colors (LayoutTests/fast/forms/select/optgroup-rendering.html)
https://bugs.webkit.org/show_bug.cgi?id=145227
Source/WebCore:
rdar://problem/20967472
Reviewed by Darin Adler.
Test: fast/forms/select/select-painting.html
Use computedStyle() consistently for option and optgroup items.
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::paintItemForeground):
(WebCore::RenderListBox::paintItemBackground):
We can always use computedStyle() and it can't be null. If there was renderer style it would return that.
* rendering/RenderMenuList.cpp:
(RenderMenuList::itemStyle):
(RenderMenuList::getItemBackgroundColor):
LayoutTests:
Reviewed by Darin Adler.
Add ref test for select painting.
* fast/forms/select/select-painting-expected.html: Added.
* fast/forms/select/select-painting.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="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMenuListcpp">trunk/Source/WebCore/rendering/RenderMenuList.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformsselectselectpaintingexpectedhtml">trunk/LayoutTests/fast/forms/select/select-painting-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastformsselectselectpaintinghtml">trunk/LayoutTests/fast/forms/select/select-painting.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (184674 => 184675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-20 23:33:07 UTC (rev 184674)
+++ trunk/LayoutTests/ChangeLog 2015-05-20 23:34:48 UTC (rev 184675)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-05-20 Antti Koivisto <antti@apple.com>
+
+ REGRESSION (r172591): Can no longer style <optgroup> with colors (LayoutTests/fast/forms/select/optgroup-rendering.html)
+ https://bugs.webkit.org/show_bug.cgi?id=145227
+
+ Reviewed by Darin Adler.
+
+ Add ref test for select painting.
+
+ * fast/forms/select/select-painting-expected.html: Added.
+ * fast/forms/select/select-painting.html: Added.
+
</ins><span class="cx"> 2015-05-20 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: AutoFill button is not accessible with VoiceOver
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsselectselectpaintingexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/select/select-painting-expected.html (0 => 184675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/select/select-painting-expected.html (rev 0)
+++ trunk/LayoutTests/fast/forms/select/select-painting-expected.html 2015-05-20 23:34:48 UTC (rev 184675)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style type="text/css">
+
+.select {
+ width: 100px;
+ height:100px;
+ font-family: sans-serif;
+ font-size: 12px;
+ border: 1px solid black;
+ box-sizing: border-box;
+}
+
+.option {
+ margin-left: 2px;
+ margin-bottom: 1px;
+}
+.optgroup {
+ margin-left: 2px;
+ margin-bottom: 1px;
+ font-weight: bold
+}
+
+#cover {
+ position: absolute;
+ width: 100px;
+ height:300px;
+ background-color: black;
+ left: 80px;
+ top: 0px;
+}
+.red { color: red; }
+</style>
+</head>
+<body>
+<div class=select>
+ <div class=option>One</div>
+ <div class="option red">Two</div>
+</div>
+<div class=select>
+ <div class=optgroup>Optgroup1</div>
+ <div class="optgroup red">Optgroup2</div>
+</div>
+<div id=cover></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsselectselectpaintinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/select/select-painting.html (0 => 184675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/select/select-painting.html (rev 0)
+++ trunk/LayoutTests/fast/forms/select/select-painting.html 2015-05-20 23:34:48 UTC (rev 184675)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style type="text/css">
+select {
+ width: 100px;
+ height:100px;
+ font-family: sans-serif;
+ font-size: 12px;
+ border: 1px solid black;
+ box-sizing: border-box;
+}
+#cover {
+ position: absolute;
+ width: 100px;
+ height:300px;
+ background-color: black;
+ left: 80px;
+ top: 0px;
+}
+.red { color: red; }
+</style>
+</head>
+<body>
+<select size="4">
+ <option>One</option>
+ <option class=red>Two</option>
+</select><br><select size="4">
+ <optgroup label="Optgroup1"></optgroup>
+ <optgroup label="Optgroup2" class=red></optgroup>
+</select>
+<div id=cover></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184674 => 184675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-20 23:33:07 UTC (rev 184674)
+++ trunk/Source/WebCore/ChangeLog 2015-05-20 23:34:48 UTC (rev 184675)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-05-20 Antti Koivisto <antti@apple.com>
+
+ REGRESSION (r172591): Can no longer style <optgroup> with colors (LayoutTests/fast/forms/select/optgroup-rendering.html)
+ https://bugs.webkit.org/show_bug.cgi?id=145227
+ rdar://problem/20967472
+
+ Reviewed by Darin Adler.
+
+ Test: fast/forms/select/select-painting.html
+
+ Use computedStyle() consistently for option and optgroup items.
+
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::paintItemForeground):
+ (WebCore::RenderListBox::paintItemBackground):
+
+ We can always use computedStyle() and it can't be null. If there was renderer style it would return that.
+
+ * rendering/RenderMenuList.cpp:
+ (RenderMenuList::itemStyle):
+ (RenderMenuList::getItemBackgroundColor):
+
</ins><span class="cx"> 2015-05-19 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Touching HTMLMediaElement.h or MediaPlayer.h causes a world rebuild.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (184674 => 184675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2015-05-20 23:33:07 UTC (rev 184674)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2015-05-20 23:34:48 UTC (rev 184675)
</span><span class="lines">@@ -374,11 +374,9 @@
</span><span class="cx"> const Vector<HTMLElement*>& listItems = selectElement().listItems();
</span><span class="cx"> HTMLElement* listItemElement = listItems[listIndex];
</span><span class="cx">
</span><del>- RenderStyle* itemStyle = listItemElement->renderStyle();
- if (!itemStyle)
- itemStyle = &style();
</del><ins>+ RenderStyle& itemStyle = *listItemElement->computedStyle();
</ins><span class="cx">
</span><del>- if (itemStyle->visibility() == HIDDEN)
</del><ins>+ if (itemStyle.visibility() == HIDDEN)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> String itemText;
</span><span class="lines">@@ -389,7 +387,7 @@
</span><span class="cx"> itemText = downcast<HTMLOptGroupElement>(*listItemElement).groupLabelText();
</span><span class="cx"> applyTextTransform(style(), itemText, ' ');
</span><span class="cx">
</span><del>- Color textColor = listItemElement->renderStyle() ? listItemElement->renderStyle()->visitedDependentColor(CSSPropertyColor) : style().visitedDependentColor(CSSPropertyColor);
</del><ins>+ Color textColor = itemStyle.visitedDependentColor(CSSPropertyColor);
</ins><span class="cx"> if (isOptionElement && downcast<HTMLOptionElement>(*listItemElement).selected()) {
</span><span class="cx"> if (frame().selection().isFocusedAndActive() && document().focusedElement() == &selectElement())
</span><span class="cx"> textColor = theme().activeListBoxSelectionForegroundColor();
</span><span class="lines">@@ -398,13 +396,13 @@
</span><span class="cx"> textColor = theme().inactiveListBoxSelectionForegroundColor();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ColorSpace colorSpace = itemStyle->colorSpace();
</del><ins>+ ColorSpace colorSpace = itemStyle.colorSpace();
</ins><span class="cx"> paintInfo.context->setFillColor(textColor, colorSpace);
</span><span class="cx">
</span><del>- TextRun textRun(itemText, 0, 0, AllowTrailingExpansion, itemStyle->direction(), isOverride(itemStyle->unicodeBidi()), true, TextRun::NoRounding);
</del><ins>+ TextRun textRun(itemText, 0, 0, AllowTrailingExpansion, itemStyle.direction(), isOverride(itemStyle.unicodeBidi()), true, TextRun::NoRounding);
</ins><span class="cx"> FontCascade itemFont = style().fontCascade();
</span><span class="cx"> LayoutRect r = itemBoundingBoxRect(paintOffset, listIndex);
</span><del>- r.move(itemOffsetForAlignment(textRun, itemStyle, itemFont, r));
</del><ins>+ r.move(itemOffsetForAlignment(textRun, &itemStyle, itemFont, r));
</ins><span class="cx">
</span><span class="cx"> if (is<HTMLOptGroupElement>(*listItemElement)) {
</span><span class="cx"> FontDescription d = itemFont.fontDescription();
</span><span class="lines">@@ -421,6 +419,7 @@
</span><span class="cx"> {
</span><span class="cx"> const Vector<HTMLElement*>& listItems = selectElement().listItems();
</span><span class="cx"> HTMLElement* listItemElement = listItems[listIndex];
</span><ins>+ RenderStyle& itemStyle = *listItemElement->computedStyle();
</ins><span class="cx">
</span><span class="cx"> Color backColor;
</span><span class="cx"> if (is<HTMLOptionElement>(*listItemElement) && downcast<HTMLOptionElement>(*listItemElement).selected()) {
</span><span class="lines">@@ -429,11 +428,11 @@
</span><span class="cx"> else
</span><span class="cx"> backColor = theme().inactiveListBoxSelectionBackgroundColor();
</span><span class="cx"> } else
</span><del>- backColor = listItemElement->renderStyle() ? listItemElement->renderStyle()->visitedDependentColor(CSSPropertyBackgroundColor) : style().visitedDependentColor(CSSPropertyBackgroundColor);
</del><ins>+ backColor = itemStyle.visitedDependentColor(CSSPropertyBackgroundColor);
</ins><span class="cx">
</span><span class="cx"> // Draw the background for this list box item
</span><del>- if (!listItemElement->renderStyle() || listItemElement->renderStyle()->visibility() != HIDDEN) {
- ColorSpace colorSpace = listItemElement->renderStyle() ? listItemElement->renderStyle()->colorSpace() : style().colorSpace();
</del><ins>+ if (itemStyle.visibility() != HIDDEN) {
+ ColorSpace colorSpace = itemStyle.colorSpace();
</ins><span class="cx"> LayoutRect itemRect = itemBoundingBoxRect(paintOffset, listIndex);
</span><span class="cx"> itemRect.intersect(controlClipRect(paintOffset));
</span><span class="cx"> paintInfo.context->fillRect(snappedIntRect(itemRect), backColor, colorSpace);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMenuListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMenuList.cpp (184674 => 184675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMenuList.cpp 2015-05-20 23:33:07 UTC (rev 184674)
+++ trunk/Source/WebCore/rendering/RenderMenuList.cpp 2015-05-20 23:34:48 UTC (rev 184675)
</span><span class="lines">@@ -522,10 +522,10 @@
</span><span class="cx"> bool itemHasCustomBackgroundColor;
</span><span class="cx"> getItemBackgroundColor(listIndex, itemBackgroundColor, itemHasCustomBackgroundColor);
</span><span class="cx">
</span><del>- RenderStyle* style = element->renderStyle() ? element->renderStyle() : element->computedStyle();
- return style ? PopupMenuStyle(style->visitedDependentColor(CSSPropertyColor), itemBackgroundColor, style->fontCascade(), style->visibility() == VISIBLE,
- style->display() == NONE, true, style->textIndent(), style->direction(), isOverride(style->unicodeBidi()),
- itemHasCustomBackgroundColor ? PopupMenuStyle::CustomBackgroundColor : PopupMenuStyle::DefaultBackgroundColor) : menuStyle();
</del><ins>+ RenderStyle& style = *element->computedStyle();
+ return PopupMenuStyle(style.visitedDependentColor(CSSPropertyColor), itemBackgroundColor, style.fontCascade(), style.visibility() == VISIBLE,
+ style.display() == NONE, true, style.textIndent(), style.direction(), isOverride(style.unicodeBidi()),
+ itemHasCustomBackgroundColor ? PopupMenuStyle::CustomBackgroundColor : PopupMenuStyle::DefaultBackgroundColor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderMenuList::getItemBackgroundColor(unsigned listIndex, Color& itemBackgroundColor, bool& itemHasCustomBackgroundColor) const
</span><span class="lines">@@ -538,9 +538,7 @@
</span><span class="cx"> }
</span><span class="cx"> HTMLElement* element = listItems[listIndex];
</span><span class="cx">
</span><del>- Color backgroundColor;
- if (element->renderStyle())
- backgroundColor = element->renderStyle()->visitedDependentColor(CSSPropertyBackgroundColor);
</del><ins>+ Color backgroundColor = element->computedStyle()->visitedDependentColor(CSSPropertyBackgroundColor);
</ins><span class="cx"> itemHasCustomBackgroundColor = backgroundColor.isValid() && backgroundColor.alpha();
</span><span class="cx"> // If the item has an opaque background color, return that.
</span><span class="cx"> if (!backgroundColor.hasAlpha()) {
</span></span></pre>
</div>
</div>
</body>
</html>