<!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>[185975] 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/185975">185975</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-06-25 18:09:51 -0700 (Thu, 25 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/185964">r185964</a>.
Correct a few pointers-that-should-be-references-now errors.
* platform/win/PopupMenuWin.cpp:
(WebCore::AccessiblePopupMenu::accLocation):
(WebCore::AccessiblePopupMenu::accHitTest):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformwinPopupMenuWincpp">trunk/Source/WebCore/platform/win/PopupMenuWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185974 => 185975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-26 01:00:21 UTC (rev 185974)
+++ trunk/Source/WebCore/ChangeLog 2015-06-26 01:09:51 UTC (rev 185975)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-06-25 Brent Fulgham <bfulgham@apple.com>
+
+ Unreviewed build fix after r185964.
+
+ Correct a few pointers-that-should-be-references-now errors.
+
+ * platform/win/PopupMenuWin.cpp:
+ (WebCore::AccessiblePopupMenu::accLocation):
+ (WebCore::AccessiblePopupMenu::accHitTest):
+
</ins><span class="cx"> 2015-06-25 Doug Russell <d_russell@apple.com>
</span><span class="cx">
</span><span class="cx"> Bug 146300 AX: AccessibilityObject focus events that don't cause a selection
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPopupMenuWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PopupMenuWin.cpp (185974 => 185975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2015-06-26 01:00:21 UTC (rev 185974)
+++ trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2015-06-26 01:09:51 UTC (rev 185975)
</span><span class="lines">@@ -1282,9 +1282,10 @@
</span><span class="cx"> if (!m_popupMenu.scrollbar())
</span><span class="cx"> return E_FAIL;
</span><span class="cx">
</span><ins>+ Scrollbar& scrollbar = *m_popupMenu.scrollbar();
</ins><span class="cx"> WebCore::ScrollbarPart part = static_cast<WebCore::ScrollbarPart>(-vChild.lVal);
</span><span class="cx">
</span><del>- ScrollbarThemeWin* theme = static_cast<ScrollbarThemeWin*>(m_popupMenu.scrollbar()->theme());
</del><ins>+ ScrollbarThemeWin* theme = static_cast<ScrollbarThemeWin*>(scrollbar.theme());
</ins><span class="cx"> if (!theme)
</span><span class="cx"> return E_FAIL;
</span><span class="cx">
</span><span class="lines">@@ -1293,17 +1294,17 @@
</span><span class="cx"> switch (part) {
</span><span class="cx"> case BackTrackPart:
</span><span class="cx"> case BackButtonStartPart:
</span><del>- partRect = theme->backButtonRect(m_popupMenu.scrollbar(), WebCore::BackTrackPart);
</del><ins>+ partRect = theme->backButtonRect(scrollbar, WebCore::BackTrackPart);
</ins><span class="cx"> break;
</span><span class="cx"> case ThumbPart:
</span><del>- partRect = theme->thumbRect(m_popupMenu.scrollbar());
</del><ins>+ partRect = theme->thumbRect(scrollbar);
</ins><span class="cx"> break;
</span><span class="cx"> case ForwardTrackPart:
</span><span class="cx"> case ForwardButtonEndPart:
</span><del>- partRect = theme->forwardButtonRect(m_popupMenu.scrollbar(), WebCore::ForwardTrackPart);
</del><ins>+ partRect = theme->forwardButtonRect(scrollbar, WebCore::ForwardTrackPart);
</ins><span class="cx"> break;
</span><span class="cx"> case ScrollbarBGPart:
</span><del>- partRect = theme->trackRect(m_popupMenu.scrollbar());
</del><ins>+ partRect = theme->trackRect(scrollbar);
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> return E_FAIL;
</span><span class="lines">@@ -1354,12 +1355,13 @@
</span><span class="cx"> scrollRect = m_popupMenu.scrollbar()->frameRect();
</span><span class="cx">
</span><span class="cx"> if (m_popupMenu.scrollbar() && scrollRect.contains(pt)) {
</span><del>- if (!m_popupMenu.scrollbar()->theme())
</del><ins>+ Scrollbar& scrollbar = *m_popupMenu.scrollbar();
+ if (!scrollbar.theme())
</ins><span class="cx"> return E_FAIL;
</span><span class="cx">
</span><span class="cx"> pt.move(-scrollRect.x(), -scrollRect.y());
</span><span class="cx">
</span><del>- WebCore::ScrollbarPart part = m_popupMenu.scrollbar()->theme()->hitTest(m_popupMenu.scrollbar(), pt);
</del><ins>+ WebCore::ScrollbarPart part = scrollbar.theme()->hitTest(scrollbar, pt);
</ins><span class="cx">
</span><span class="cx"> V_VT(pvChildAtPoint) = VT_I4;
</span><span class="cx"> V_I4(pvChildAtPoint) = -part; // Scrollbar parts are encoded as negative, to avoid mixup with item indexes.
</span></span></pre>
</div>
</div>
</body>
</html>