<!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>[47537] branches/safari-4-branch/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/47537">47537</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2009-08-19 17:57:14 -0700 (Wed, 19 Aug 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/47535">r47535</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari4branchWebCoreChangeLog">branches/safari-4-branch/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari4branchWebCoreplatformwinPopupMenuWincpp">branches/safari-4-branch/WebCore/platform/win/PopupMenuWin.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari4branchWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-4-branch/WebCore/ChangeLog (47536 => 47537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-4-branch/WebCore/ChangeLog        2009-08-20 00:57:11 UTC (rev 47536)
+++ branches/safari-4-branch/WebCore/ChangeLog        2009-08-20 00:57:14 UTC (rev 47537)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2009-08-19  Mark Rowe  &lt;mrowe@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r47535.
+
+    2009-08-19  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        Reviewed by Darin Adler.
+
+        - Fix &lt;rdar://problem/7155710&gt;
+        HTML selects on windows cause containing window to become inactive when opened.
+
+        * platform/win/PopupMenuWin.cpp:
+        (WebCore::PopupMenu::show):
+        Pass SWP_NOACTIVATE to SetWindowPos, remove AW_ACTIVATE from AnimateWindow and pass
+        SW_SHOWNOACTIVATE to ShowWindow.
+        
+        (WebCore::PopupWndProc):
+        Prevent mouse activation from activating the window.
+
+2009-08-19  Mark Rowe  &lt;mrowe@apple.com&gt;
+
</ins><span class="cx">         Merge r47531.
</span><span class="cx"> 
</span><span class="cx">     2009-08-19  Anders Carlsson  &lt;andersca@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari4branchWebCoreplatformwinPopupMenuWincpp"></a>
<div class="modfile"><h4>Modified: branches/safari-4-branch/WebCore/platform/win/PopupMenuWin.cpp (47536 => 47537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-4-branch/WebCore/platform/win/PopupMenuWin.cpp        2009-08-20 00:57:11 UTC (rev 47536)
+++ branches/safari-4-branch/WebCore/platform/win/PopupMenuWin.cpp        2009-08-20 00:57:14 UTC (rev 47537)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx">             m_scrollbar = client()-&gt;createScrollbar(this, VerticalScrollbar, SmallScrollbar);
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-    ::SetWindowPos(m_popup, HWND_TOP, m_windowRect.x(), m_windowRect.y(), m_windowRect.width(), m_windowRect.height(), 0);
</del><ins>+    ::SetWindowPos(m_popup, HWND_TOP, m_windowRect.x(), m_windowRect.y(), m_windowRect.width(), m_windowRect.height(), SWP_NOACTIVATE);
</ins><span class="cx"> 
</span><span class="cx">     // Determine whether we should animate our popups
</span><span class="cx">     // Note: Must use 'BOOL' and 'FALSE' instead of 'bool' and 'false' to avoid stack corruption with SystemParametersInfo
</span><span class="lines">@@ -135,10 +135,10 @@
</span><span class="cx">             // NOTE: This may have to change for Vista
</span><span class="cx">             DWORD slideDirection = (m_windowRect.y() &lt; viewRect.top + v-&gt;contentsToWindow(r.location()).y()) ? AW_VER_NEGATIVE : AW_VER_POSITIVE;
</span><span class="cx"> 
</span><del>-            ::AnimateWindow(m_popup, defaultAnimationDuration, AW_SLIDE | slideDirection | AW_ACTIVATE);
</del><ins>+            ::AnimateWindow(m_popup, defaultAnimationDuration, AW_SLIDE | slideDirection);
</ins><span class="cx">         }
</span><span class="cx">     } else
</span><del>-        ::ShowWindow(m_popup, SW_SHOWNORMAL);
</del><ins>+        ::ShowWindow(m_popup, SW_SHOWNOACTIVATE);
</ins><span class="cx">     ::SetCapture(m_popup);
</span><span class="cx"> 
</span><span class="cx">     if (client()) {
</span><span class="lines">@@ -809,6 +809,11 @@
</span><span class="cx">                 lResult = 0;
</span><span class="cx">             }
</span><span class="cx">             break;
</span><ins>+        case WM_MOUSEACTIVATE:
+            // We don't want to activate the window when someone clicks on it.
+            lResult = MA_NOACTIVATE;
+            break;
+
</ins><span class="cx">         case WM_PRINTCLIENT:
</span><span class="cx">             if (popup)
</span><span class="cx">                 popup-&gt;paint(popup-&gt;clientRect(), (HDC)wParam);
</span></span></pre>
</div>
</div>

</body>
</html>