<!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>[200190] trunk/Source/WebCore</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/200190">200190</a></dd>
<dt>Author</dt> <dd>tonikitoo@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-28 07:35:24 -0700 (Thu, 28 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Factor out the "paint item" logic in RenderListBox into a helper
https://bugs.webkit.org/show_bug.cgi?id=157117
Reviewed by Daniel Bates.
Patch factors out the duplicated painting logic in RenderListBox::paintObject()
into a member function named paintItem.
This is in preparation for bug 156590.
No new tests, since there is no behavior change.
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::paintItem):
(WebCore::RenderListBox::paintObject):
* rendering/RenderListBox.h:</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCorerenderingRenderListBoxh">trunk/Source/WebCore/rendering/RenderListBox.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200189 => 200190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-28 14:02:02 UTC (rev 200189)
+++ trunk/Source/WebCore/ChangeLog 2016-04-28 14:35:24 UTC (rev 200190)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-04-28 Antonio Gomes <tonikitoo@webkit.org>
+
+ Factor out the "paint item" logic in RenderListBox into a helper
+ https://bugs.webkit.org/show_bug.cgi?id=157117
+
+ Reviewed by Daniel Bates.
+
+ Patch factors out the duplicated painting logic in RenderListBox::paintObject()
+ into a member function named paintItem.
+
+ This is in preparation for bug 156590.
+ No new tests, since there is no behavior change.
+
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::paintItem):
+ (WebCore::RenderListBox::paintObject):
+ * rendering/RenderListBox.h:
+
</ins><span class="cx"> 2016-04-28 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: [ATK] We need to be smarter about flattening and the accessible text implementation
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (200189 => 200190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2016-04-28 14:02:02 UTC (rev 200189)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2016-04-28 14:35:24 UTC (rev 200190)
</span><span class="lines">@@ -271,20 +271,24 @@
</span><span class="cx"> LayoutUnit y = additionalOffset.y() + borderTop() + paddingTop() + itemHeight() * (index - m_indexOffset);
</span><span class="cx"> return LayoutRect(x, y, contentWidth(), itemHeight());
</span><span class="cx"> }
</span><del>-
</del><ins>+
+void RenderListBox::paintItem(PaintInfo& paintInfo, const LayoutPoint& paintOffset, PaintFunction paintFunction)
+{
+ int listItemsSize = numItems();
+ int endIndex = m_indexOffset + numVisibleItems();
+ for (int i = m_indexOffset; i < listItemsSize && i <= endIndex; ++i)
+ paintFunction(paintInfo, paintOffset, i);
+}
+
</ins><span class="cx"> void RenderListBox::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
</span><span class="cx"> {
</span><span class="cx"> if (style().visibility() != VISIBLE)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- int listItemsSize = numItems();
-
</del><span class="cx"> if (paintInfo.phase == PaintPhaseForeground) {
</span><del>- int index = m_indexOffset;
- while (index < listItemsSize && index <= m_indexOffset + numVisibleItems()) {
- paintItemForeground(paintInfo, paintOffset, index);
- index++;
- }
</del><ins>+ paintItem(paintInfo, paintOffset, [this](PaintInfo& paintInfo, const LayoutPoint& paintOffset, int listItemIndex) {
+ paintItemForeground(paintInfo, paintOffset, listItemIndex);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Paint the children.
</span><span class="lines">@@ -303,11 +307,9 @@
</span><span class="cx"> break;
</span><span class="cx"> case PaintPhaseChildBlockBackground:
</span><span class="cx"> case PaintPhaseChildBlockBackgrounds: {
</span><del>- int index = m_indexOffset;
- while (index < listItemsSize && index <= m_indexOffset + numVisibleItems()) {
- paintItemBackground(paintInfo, paintOffset, index);
- index++;
- }
</del><ins>+ paintItem(paintInfo, paintOffset, [this](PaintInfo& paintInfo, const LayoutPoint& paintOffset, int listItemIndex) {
+ paintItemBackground(paintInfo, paintOffset, listItemIndex);
+ });
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> default:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.h (200189 => 200190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.h 2016-04-28 14:02:02 UTC (rev 200189)
+++ trunk/Source/WebCore/rendering/RenderListBox.h 2016-04-28 14:35:24 UTC (rev 200190)
</span><span class="lines">@@ -142,6 +142,9 @@
</span><span class="cx"> // NOTE: This should only be called by the overriden setScrollOffset from ScrollableArea.
</span><span class="cx"> void scrollTo(int newOffset);
</span><span class="cx">
</span><ins>+ using PaintFunction = std::function<void(PaintInfo&, const LayoutPoint&, int listItemIndex)>;
+ void paintItem(PaintInfo& , const LayoutPoint& , PaintFunction);
+
</ins><span class="cx"> void setHasVerticalScrollbar(bool hasScrollbar);
</span><span class="cx"> PassRefPtr<Scrollbar> createScrollbar();
</span><span class="cx"> void destroyScrollbar();
</span></span></pre>
</div>
</div>
</body>
</html>