<!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>[174148] trunk/Source/WebKit2</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/174148">174148</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-01 01:15:40 -0700 (Wed, 01 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] <select> with <optgroup> may change initial selected option when assisted
https://bugs.webkit.org/show_bug.cgi?id=137261
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-10-01
Reviewed by Enrica Casucci.
The initial assignemnt of _singleSelectionIndex was calculating the
item index (ignoring groups) instead of the row index (affected by
groups!). Thus if there was N groups we would select the row N
before the real selection.
Also avoid this entirely if this is a multiple selection picker.
This logic is only needed for single selection with groups.
* UIProcess/ios/forms/WKFormSelectPicker.mm:
(-[WKMultipleSelectPicker initWithView:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosformsWKFormSelectPickermm">trunk/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPicker.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174147 => 174148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-01 07:57:22 UTC (rev 174147)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-01 08:15:40 UTC (rev 174148)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-10-01 Joseph Pecoraro <pecoraro@apple.com>
+
+ [iOS] <select> with <optgroup> may change initial selected option when assisted
+ https://bugs.webkit.org/show_bug.cgi?id=137261
+
+ Reviewed by Enrica Casucci.
+
+ The initial assignemnt of _singleSelectionIndex was calculating the
+ item index (ignoring groups) instead of the row index (affected by
+ groups!). Thus if there was N groups we would select the row N
+ before the real selection.
+
+ Also avoid this entirely if this is a multiple selection picker.
+ This logic is only needed for single selection with groups.
+
+ * UIProcess/ios/forms/WKFormSelectPicker.mm:
+ (-[WKMultipleSelectPicker initWithView:]):
+
</ins><span class="cx"> 2014-09-30 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Rename TEST_THEME_DIR macro
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosformsWKFormSelectPickermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPicker.mm (174147 => 174148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPicker.mm 2014-10-01 07:57:22 UTC (rev 174147)
+++ trunk/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPicker.mm 2014-10-01 08:15:40 UTC (rev 174148)
</span><span class="lines">@@ -166,22 +166,21 @@
</span><span class="cx"> [self setSize:[UIKeyboard defaultSizeForInterfaceOrientation:[UIApp interfaceOrientation]]];
</span><span class="cx"> [self reloadAllComponents];
</span><span class="cx">
</span><del>- const Vector<OptionItem>& selectOptions = [_view assistedNodeSelectOptions];
- int currentIndex = 0;
- for (size_t i = 0; i < selectOptions.size(); ++i) {
- const OptionItem& item = selectOptions[i];
- if (item.isGroup)
- continue;
</del><ins>+ if (!_allowsMultipleSelection) {
+ const Vector<OptionItem>& selectOptions = [_view assistedNodeSelectOptions];
+ for (size_t i = 0; i < selectOptions.size(); ++i) {
+ const OptionItem& item = selectOptions[i];
+ if (item.isGroup)
+ continue;
</ins><span class="cx">
</span><del>- if (!_allowsMultipleSelection && item.isSelected)
- _singleSelectionIndex = currentIndex;
-
- currentIndex++;
</del><ins>+ if (item.isSelected) {
+ _singleSelectionIndex = i;
+ [self selectRow:_singleSelectionIndex inComponent:0 animated:NO];
+ break;
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (_singleSelectionIndex != NSNotFound)
- [self selectRow:_singleSelectionIndex inComponent:0 animated:NO];
-
</del><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>