<!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>[200858] 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/200858">200858</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-13 09:06:03 -0700 (Fri, 13 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] <select> elements popover should render right-aligned when in RTL mode
https://bugs.webkit.org/show_bug.cgi?id=157672
<rdar://problem/26193442>
Patch by Antoine Quint <graouts@apple.com> on 2016-05-13
Reviewed by Darin Adler.
Add a new isRTL field to the AssistedNodeInformation as specified by the assisted
node's render style and account for it when displaying the table view shown in the
popover attached to the assisted node using the UIView semanticContentAttribute
property.
* Shared/AssistedNodeInformation.cpp:
(WebKit::AssistedNodeInformation::encode):
(WebKit::AssistedNodeInformation::decode):
* Shared/AssistedNodeInformation.h:
(WebKit::AssistedNodeInformation::AssistedNodeInformation):
* UIProcess/ios/forms/WKFormSelectPopover.mm:
(-[WKSelectTableViewController initWithView:hasGroups:]):
(-[WKSelectTableViewController tableView:cellForRowAtIndexPath:]):
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::getAssistedNodeInformation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAssistedNodeInformationcpp">trunk/Source/WebKit2/Shared/AssistedNodeInformation.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAssistedNodeInformationh">trunk/Source/WebKit2/Shared/AssistedNodeInformation.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosformsWKFormSelectPopovermm">trunk/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPopover.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (200857 => 200858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-13 14:58:53 UTC (rev 200857)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-13 16:06:03 UTC (rev 200858)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-05-13 Antoine Quint <graouts@apple.com>
+
+ [iOS] <select> elements popover should render right-aligned when in RTL mode
+ https://bugs.webkit.org/show_bug.cgi?id=157672
+ <rdar://problem/26193442>
+
+ Reviewed by Darin Adler.
+
+ Add a new isRTL field to the AssistedNodeInformation as specified by the assisted
+ node's render style and account for it when displaying the table view shown in the
+ popover attached to the assisted node using the UIView semanticContentAttribute
+ property.
+
+ * Shared/AssistedNodeInformation.cpp:
+ (WebKit::AssistedNodeInformation::encode):
+ (WebKit::AssistedNodeInformation::decode):
+ * Shared/AssistedNodeInformation.h:
+ (WebKit::AssistedNodeInformation::AssistedNodeInformation):
+ * UIProcess/ios/forms/WKFormSelectPopover.mm:
+ (-[WKSelectTableViewController initWithView:hasGroups:]):
+ (-[WKSelectTableViewController tableView:cellForRowAtIndexPath:]):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getAssistedNodeInformation):
+
</ins><span class="cx"> 2016-05-13 Tina Liu <iting_liu@apple.com>
</span><span class="cx">
</span><span class="cx"> Revert r199691.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAssistedNodeInformationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/AssistedNodeInformation.cpp (200857 => 200858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/AssistedNodeInformation.cpp 2016-05-13 14:58:53 UTC (rev 200857)
+++ trunk/Source/WebKit2/Shared/AssistedNodeInformation.cpp 2016-05-13 16:06:03 UTC (rev 200858)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> encoder << hasNextNode;
</span><span class="cx"> encoder << hasPreviousNode;
</span><span class="cx"> encoder << isAutocorrect;
</span><ins>+ encoder << isRTL;
</ins><span class="cx"> encoder.encodeEnum(autocapitalizeType);
</span><span class="cx"> encoder.encodeEnum(elementType);
</span><span class="cx"> encoder << formAction;
</span><span class="lines">@@ -112,6 +113,9 @@
</span><span class="cx"> if (!decoder.decode(result.isAutocorrect))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (!decoder.decode(result.isRTL))
+ return false;
+
</ins><span class="cx"> if (!decoder.decodeEnum(result.autocapitalizeType))
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAssistedNodeInformationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/AssistedNodeInformation.h (200857 => 200858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/AssistedNodeInformation.h 2016-05-13 14:58:53 UTC (rev 200857)
+++ trunk/Source/WebKit2/Shared/AssistedNodeInformation.h 2016-05-13 16:06:03 UTC (rev 200858)
</span><span class="lines">@@ -100,6 +100,7 @@
</span><span class="cx"> , hasNextNode(false)
</span><span class="cx"> , hasPreviousNode(false)
</span><span class="cx"> , isAutocorrect(false)
</span><ins>+ , isRTL(false)
</ins><span class="cx"> , isMultiSelect(false)
</span><span class="cx"> , isReadOnly(false)
</span><span class="cx"> , allowsUserScaling(false)
</span><span class="lines">@@ -119,6 +120,7 @@
</span><span class="cx"> bool hasNextNode;
</span><span class="cx"> bool hasPreviousNode;
</span><span class="cx"> bool isAutocorrect;
</span><ins>+ bool isRTL;
</ins><span class="cx"> bool isMultiSelect;
</span><span class="cx"> bool isReadOnly;
</span><span class="cx"> bool allowsUserScaling;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosformsWKFormSelectPopovermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPopover.mm (200857 => 200858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPopover.mm 2016-05-13 14:58:53 UTC (rev 200857)
+++ trunk/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPopover.mm 2016-05-13 16:06:03 UTC (rev 200858)
</span><span class="lines">@@ -122,11 +122,12 @@
</span><span class="cx"> currentIndex++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- UITextWritingDirection writingDirection = UITextWritingDirectionLeftToRight;
</del><ins>+ UITextWritingDirection writingDirection = _contentView.assistedNodeInformation.isRTL ? UITextWritingDirectionRightToLeft : UITextWritingDirectionLeftToRight;
</ins><span class="cx"> BOOL override = NO;
</span><del>- // FIXME: retrieve from WebProcess writing direction and override.
</del><span class="cx"> _textAlignment = (writingDirection == UITextWritingDirectionLeftToRight) ? NSTextAlignmentLeft : NSTextAlignmentRight;
</span><span class="cx">
</span><ins>+ if (writingDirection == UITextWritingDirectionRightToLeft)
+ self.view.semanticContentAttribute = UISemanticContentAttributeForceRightToLeft;
</ins><span class="cx"> [self setTitle:stringWithWritingDirection(_contentView.assistedNodeInformation.title, writingDirection, override)];
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="lines">@@ -244,6 +245,7 @@
</span><span class="cx"> if (!cell)
</span><span class="cx"> cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:WKPopoverTableViewCellReuseIdentifier] autorelease];
</span><span class="cx">
</span><ins>+ cell.semanticContentAttribute = self.view.semanticContentAttribute;
</ins><span class="cx"> cell.textLabel.textAlignment = _textAlignment;
</span><span class="cx">
</span><span class="cx"> if (_contentView.assistedNodeInformation.selectOptions.isEmpty()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (200857 => 200858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-05-13 14:58:53 UTC (rev 200857)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-05-13 16:06:03 UTC (rev 200858)
</span><span class="lines">@@ -2512,6 +2512,7 @@
</span><span class="cx"> bool inFixed = false;
</span><span class="cx"> renderer->localToContainerPoint(FloatPoint(), nullptr, UseTransforms, &inFixed);
</span><span class="cx"> information.insideFixedPosition = inFixed;
</span><ins>+ information.isRTL = renderer->style().direction() == RTL;
</ins><span class="cx">
</span><span class="cx"> if (inFixed && elementFrame.isMainFrame()) {
</span><span class="cx"> FrameView* frameView = elementFrame.view();
</span></span></pre>
</div>
</div>
</body>
</html>