<!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>[200268] trunk/Source</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/200268">200268</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-04-29 16:54:35 -0700 (Fri, 29 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>RTL <select> popup menu is in the wrong location
https://bugs.webkit.org/show_bug.cgi?id=157159
<rdar://problem/25894451>
Reapply http://trac.webkit.org/changeset/200217
but with changes that will allow it to build on Yosemite.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportPopupMenuMacmm">trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPopupMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (200267 => 200268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2016-04-29 23:43:29 UTC (rev 200267)
+++ trunk/Source/WebKit/mac/ChangeLog        2016-04-29 23:54:35 UTC (rev 200268)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-04-29 Dean Jackson <dino@apple.com>
+
+ RTL <select> popup menu is in the wrong location
+ https://bugs.webkit.org/show_bug.cgi?id=157159
+ <rdar://problem/25894451>
+
+ Reapply http://trac.webkit.org/changeset/200217
+ but with changes that will allow it to build on Yosemite.
+
+ * WebCoreSupport/PopupMenuMac.mm:
+ (PopupMenuMac::show):
+
</ins><span class="cx"> 2016-04-29 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r200217.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportPopupMenuMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm (200267 => 200268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm        2016-04-29 23:43:29 UTC (rev 200267)
+++ trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm        2016-04-29 23:54:35 UTC (rev 200268)
</span><span class="lines">@@ -148,11 +148,17 @@
</span><span class="cx">
</span><span class="cx"> NSView* view = v->documentView();
</span><span class="cx">
</span><ins>+ TextDirection textDirection = m_client->menuStyle().textDirection();
+
</ins><span class="cx"> [m_popup attachPopUpWithFrame:r inView:view];
</span><span class="cx"> [m_popup selectItemAtIndex:index];
</span><ins>+ [m_popup setUserInterfaceLayoutDirection:textDirection == LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
</ins><span class="cx">
</span><span class="cx"> NSMenu* menu = [m_popup menu];
</span><del>-
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+ [menu setUserInterfaceLayoutDirection:textDirection == LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
+#endif
+
</ins><span class="cx"> NSPoint location;
</span><span class="cx"> NSFont* font = m_client->menuStyle().font().primaryFont().getNSFont();
</span><span class="cx">
</span><span class="lines">@@ -169,8 +175,9 @@
</span><span class="cx"> NSFont* defaultFont = [NSFont systemFontOfSize:[font pointSize]];
</span><span class="cx"> vertOffset += [font descender] - [defaultFont descender];
</span><span class="cx"> vertOffset = fminf(NSHeight(r), vertOffset);
</span><del>-
- location = NSMakePoint(NSMinX(r) + popOverHorizontalAdjust, NSMaxY(r) - vertOffset);
</del><ins>+
+ float horizontalOffset = textDirection == LTR ? popOverHorizontalAdjust : 0;
+ location = NSMakePoint(NSMinX(r) + horizontalOffset, NSMaxY(r) - vertOffset);
</ins><span class="cx"> } else
</span><span class="cx"> location = NSMakePoint(NSMinX(r) + popUnderHorizontalAdjust, NSMaxY(r) + popUnderVerticalAdjust);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (200267 => 200268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2016-04-29 23:43:29 UTC (rev 200267)
+++ trunk/Source/WebKit2/ChangeLog        2016-04-29 23:54:35 UTC (rev 200268)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-04-29 Dean Jackson <dino@apple.com>
+
+ RTL <select> popup menu is in the wrong location
+ https://bugs.webkit.org/show_bug.cgi?id=157159
+ <rdar://problem/25894451>
+
+ Reapply http://trac.webkit.org/changeset/200217
+ but with changes that will allow it to build on Yosemite.
+
+ * UIProcess/mac/WebPopupMenuProxyMac.mm:
+ (WebKit::WebPopupMenuProxyMac::showPopupMenu):
+
</ins><span class="cx"> 2016-04-28 Ada Chan <adachan@apple.com>
</span><span class="cx">
</span><span class="cx"> Indicate we are processing user gesture when handling messages from WebPlaybackSessionManagerProxy to WebPlaybackSessionManager
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPopupMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm (200267 => 200268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm        2016-04-29 23:43:29 UTC (rev 200267)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm        2016-04-29 23:54:35 UTC (rev 200268)
</span><span class="lines">@@ -118,6 +118,9 @@
</span><span class="cx"> [m_popup setUserInterfaceLayoutDirection:textDirection == LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
</span><span class="cx">
</span><span class="cx"> NSMenu *menu = [m_popup menu];
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+ [menu setUserInterfaceLayoutDirection:textDirection == LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
+#endif
</ins><span class="cx">
</span><span class="cx"> // These values were borrowed from AppKit to match their placement of the menu.
</span><span class="cx"> const int popOverHorizontalAdjust = -10;
</span><span class="lines">@@ -131,8 +134,9 @@
</span><span class="cx"> NSRect titleFrame = [m_popup titleRectForBounds:rect];
</span><span class="cx"> if (titleFrame.size.width <= 0 || titleFrame.size.height <= 0)
</span><span class="cx"> titleFrame = rect;
</span><del>- float vertOffset = roundf((NSMaxY(rect) - NSMaxY(titleFrame)) + NSHeight(titleFrame));
- location = NSMakePoint(NSMinX(rect) + popOverHorizontalAdjust, NSMaxY(rect) - vertOffset);
</del><ins>+ float verticalOffset = roundf((NSMaxY(rect) - NSMaxY(titleFrame)) + NSHeight(titleFrame));
+ float horizontalOffset = textDirection == LTR ? popOverHorizontalAdjust : 0;
+ location = NSMakePoint(NSMinX(rect) + horizontalOffset, NSMaxY(rect) - verticalOffset);
</ins><span class="cx"> } else
</span><span class="cx"> location = NSMakePoint(NSMinX(rect) + popUnderHorizontalAdjust, NSMaxY(rect) + popUnderVerticalAdjust);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>