<!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>[202112] 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/202112">202112</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-06-15 15:14:09 -0700 (Wed, 15 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>RTL <select> forms are misplaced
https://bugs.webkit.org/show_bug.cgi?id=158810
<rdar://problem/24847541>
Reviewed by Eric Carlson.
AppKit made a change in Sierra that causes popup menus
to snap to a different point when the system language is RTL.
We need to be more explicit about what directionality
we want, and override the location of the popup based
on the text direction.
I also made a small tweak to the fudge offsets we use
in order to make button text and menu text to be
more consistent.
Unfortunately since this is just about the location
of the popup menu, it's unable to be tested in our
current infrastructure.
Source/WebKit/mac:
* WebCoreSupport/PopupMenuMac.mm:
(PopupMenuMac::show):
Source/WebKit2:
* UIProcess/mac/WebPopupMenuProxyMac.mm:
(WebKit::WebPopupMenuProxyMac::showPopupMenu):</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 (202111 => 202112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-06-15 22:07:57 UTC (rev 202111)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-06-15 22:14:09 UTC (rev 202112)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-06-15 Dean Jackson <dino@apple.com>
+
+ RTL <select> forms are misplaced
+ https://bugs.webkit.org/show_bug.cgi?id=158810
+ <rdar://problem/24847541>
+
+ Reviewed by Eric Carlson.
+
+ AppKit made a change in Sierra that causes popup menus
+ to snap to a different point when the system language is RTL.
+ We need to be more explicit about what directionality
+ we want, and override the location of the popup based
+ on the text direction.
+
+ I also made a small tweak to the fudge offsets we use
+ in order to make button text and menu text to be
+ more consistent.
+
+ Unfortunately since this is just about the location
+ of the popup menu, it's unable to be tested in our
+ current infrastructure.
+
+ * WebCoreSupport/PopupMenuMac.mm:
+ (PopupMenuMac::show):
+
</ins><span class="cx"> 2016-06-15 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop some unnecessary header includes
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportPopupMenuMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm (202111 => 202112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm 2016-06-15 22:07:57 UTC (rev 202111)
+++ trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm 2016-06-15 22:14:09 UTC (rev 202112)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> CTFontRef font = m_client->menuStyle().font().primaryFont().getCTFont();
</span><span class="cx">
</span><span class="cx"> // These values were borrowed from AppKit to match their placement of the menu.
</span><del>- const int popOverHorizontalAdjust = -10;
</del><ins>+ const int popOverHorizontalAdjust = -13;
</ins><span class="cx"> const int popUnderHorizontalAdjust = 6;
</span><span class="cx"> const int popUnderVerticalAdjust = 6;
</span><span class="cx"> if (m_client->shouldPopOver()) {
</span><span class="lines">@@ -175,9 +175,14 @@
</span><span class="cx"> auto defaultFont = adoptCF(CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, CTFontGetSize(font), nil));
</span><span class="cx"> vertOffset += CTFontGetDescent(font) - CTFontGetDescent(defaultFont.get());
</span><span class="cx"> vertOffset = fminf(NSHeight(r), vertOffset);
</span><del>-
- float horizontalOffset = textDirection == LTR ? popOverHorizontalAdjust : 0;
- location = NSMakePoint(NSMinX(r) + horizontalOffset, NSMaxY(r) - vertOffset);
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+ if (textDirection == LTR)
+ location = NSMakePoint(NSMinX(r) + popOverHorizontalAdjust, NSMaxY(r) - vertOffset);
+ else
+ location = NSMakePoint(NSMinX(r) - popOverHorizontalAdjust, NSMaxY(r) - vertOffset);
+#else
+ location = NSMakePoint(NSMinX(r) + popOverHorizontalAdjust, NSMaxY(r) - vertOffset);
+#endif
</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 (202111 => 202112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-15 22:07:57 UTC (rev 202111)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-15 22:14:09 UTC (rev 202112)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-06-15 Dean Jackson <dino@apple.com>
+
+ RTL <select> forms are misplaced
+ https://bugs.webkit.org/show_bug.cgi?id=158810
+ <rdar://problem/24847541>
+
+ Reviewed by Eric Carlson.
+
+ AppKit made a change in Sierra that causes popup menus
+ to snap to a different point when the system language is RTL.
+ We need to be more explicit about what directionality
+ we want, and override the location of the popup based
+ on the text direction.
+
+ I also made a small tweak to the fudge offsets we use
+ in order to make button text and menu text to be
+ more consistent.
+
+ Unfortunately since this is just about the location
+ of the popup menu, it's unable to be tested in our
+ current infrastructure.
+
+ * UIProcess/mac/WebPopupMenuProxyMac.mm:
+ (WebKit::WebPopupMenuProxyMac::showPopupMenu):
+
</ins><span class="cx"> 2016-06-15 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop some unnecessary header includes
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPopupMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm (202111 => 202112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2016-06-15 22:07:57 UTC (rev 202111)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2016-06-15 22:14:09 UTC (rev 202112)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // These values were borrowed from AppKit to match their placement of the menu.
</span><del>- const int popOverHorizontalAdjust = -10;
</del><ins>+ const int popOverHorizontalAdjust = -13;
</ins><span class="cx"> const int popUnderHorizontalAdjust = 6;
</span><span class="cx"> const int popUnderVerticalAdjust = 6;
</span><span class="cx">
</span><span class="lines">@@ -134,13 +134,21 @@
</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 verticalOffset = roundf((NSMaxY(rect) - NSMaxY(titleFrame)) + NSHeight(titleFrame));
- float horizontalOffset = textDirection == LTR ? popOverHorizontalAdjust : 0;
- location = NSMakePoint(NSMinX(rect) + horizontalOffset, NSMaxY(rect) - verticalOffset);
</del><ins>+ float verticalOffset = roundf((NSMaxY(rect) - NSMaxY(titleFrame)) + NSHeight(titleFrame)) + 1;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+ if (textDirection == LTR)
+ location = NSMakePoint(NSMinX(rect) + popOverHorizontalAdjust, NSMaxY(rect) - verticalOffset);
+ else
+ location = NSMakePoint(NSMaxX(rect) - popOverHorizontalAdjust, NSMaxY(rect) - verticalOffset);
+#else
+ location = NSMakePoint(NSMinX(rect) + popOverHorizontalAdjust, NSMaxY(rect) - verticalOffset);
+#endif
+
</ins><span class="cx"> } else
</span><span class="cx"> location = NSMakePoint(NSMinX(rect) + popUnderHorizontalAdjust, NSMaxY(rect) + popUnderVerticalAdjust);
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSView> dummyView = adoptNS([[NSView alloc] initWithFrame:rect]);
</span><ins>+ [dummyView.get() setUserInterfaceLayoutDirection:textDirection == LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
</ins><span class="cx"> [m_webView addSubview:dummyView.get()];
</span><span class="cx"> location = [dummyView convertPoint:location fromView:m_webView];
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>