<!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>[175675] branches/safari-600.3-branch/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/175675">175675</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-11-05 21:56:00 -0800 (Wed, 05 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/175635">r175635</a>. <rdar://problems/18884674></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessAPImacWKViewmm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessAPImacWKViewInternalh">branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175674 => 175675)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-06 05:53:29 UTC (rev 175674)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-06 05:56:00 UTC (rev 175675)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2014-11-05 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r175635. <rdar://problem/18884674>
+
+ 2014-11-05 Conrad Shultz <conrad_shultz@apple.com>
+
+ Disable action menus on page previews
+ https://bugs.webkit.org/show_bug.cgi?id=138431
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _shouldIgnoreMouseEvents]):
+ Renamed from -shouldIgnoreMouseEvents since this isn't actually public.
+ (-[WKView swipeWithEvent:]):
+ (-[WKView mouseMoved:]):
+ (-[WKView mouseDown:]):
+ (-[WKView mouseUp:]):
+ (-[WKView mouseDragged:]):
+ Updated to reflect method rename.
+ (-[WKView shouldIgnoreMouseEvents]): Deleted.
+
+ * UIProcess/API/mac/WKViewInternal.h:
+ Expose -_shouldIgnoreMouseEvents.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController prepareForMenu:withEvent:]):
+ Cancel the menu if the presenting WKView should ignore mouse events.
+
+
+2014-11-05 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r175632. <rdar://problem/18774264>
</span><span class="cx">
</span><span class="cx"> 2014-11-05 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (175674 => 175675)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-11-06 05:53:29 UTC (rev 175674)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-11-06 05:56:00 UTC (rev 175675)
</span><span class="lines">@@ -1096,7 +1096,7 @@
</span><span class="cx">
</span><span class="cx"> // Events
</span><span class="cx">
</span><del>-- (BOOL)shouldIgnoreMouseEvents
</del><ins>+- (BOOL)_shouldIgnoreMouseEvents
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: This check is surprisingly specific. Are there any other cases where we need to block mouse events?
</span><span class="cx"> // Do we actually need to in thumbnail view? And if we do, what about non-mouse events?
</span><span class="lines">@@ -1151,7 +1151,7 @@
</span><span class="cx"> #define NATIVE_MOUSE_EVENT_HANDLER(Selector) \
</span><span class="cx"> - (void)Selector:(NSEvent *)theEvent \
</span><span class="cx"> { \
</span><del>- if ([self shouldIgnoreMouseEvents]) \
</del><ins>+ if (self._shouldIgnoreMouseEvents) \
</ins><span class="cx"> return; \
</span><span class="cx"> if (NSTextInputContext *context = [self inputContext]) { \
</span><span class="cx"> [context handleEvent:theEvent completionHandler:^(BOOL handled) { \
</span><span class="lines">@@ -1171,7 +1171,7 @@
</span><span class="cx"> #define NATIVE_MOUSE_EVENT_HANDLER(Selector) \
</span><span class="cx"> - (void)Selector:(NSEvent *)theEvent \
</span><span class="cx"> { \
</span><del>- if ([self shouldIgnoreMouseEvents]) \
</del><ins>+ if (self._shouldIgnoreMouseEvents) \
</ins><span class="cx"> return; \
</span><span class="cx"> if ([[self inputContext] handleEvent:theEvent]) { \
</span><span class="cx"> LOG(TextInput, "%s was handled by text input context", String(#Selector).substring(0, String(#Selector).find("Internal")).ascii().data()); \
</span><span class="lines">@@ -1223,7 +1223,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)swipeWithEvent:(NSEvent *)event
</span><span class="cx"> {
</span><del>- if ([self shouldIgnoreMouseEvents])
</del><ins>+ if (self._shouldIgnoreMouseEvents)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!_data->_allowsBackForwardNavigationGestures) {
</span><span class="lines">@@ -1241,7 +1241,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)mouseMoved:(NSEvent *)event
</span><span class="cx"> {
</span><del>- if ([self shouldIgnoreMouseEvents])
</del><ins>+ if (self._shouldIgnoreMouseEvents)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // When a view is first responder, it gets mouse moved events even when the mouse is outside its visible rect.
</span><span class="lines">@@ -1253,7 +1253,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)mouseDown:(NSEvent *)event
</span><span class="cx"> {
</span><del>- if ([self shouldIgnoreMouseEvents])
</del><ins>+ if (self._shouldIgnoreMouseEvents)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> [self _setMouseDownEvent:event];
</span><span class="lines">@@ -1263,7 +1263,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)mouseUp:(NSEvent *)event
</span><span class="cx"> {
</span><del>- if ([self shouldIgnoreMouseEvents])
</del><ins>+ if (self._shouldIgnoreMouseEvents)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> [self _setMouseDownEvent:nil];
</span><span class="lines">@@ -1272,7 +1272,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)mouseDragged:(NSEvent *)event
</span><span class="cx"> {
</span><del>- if ([self shouldIgnoreMouseEvents])
</del><ins>+ if (self._shouldIgnoreMouseEvents)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (_data->_ignoringMouseDraggedEvents)
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessAPImacWKViewInternalh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (175674 => 175675)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2014-11-06 05:53:29 UTC (rev 175674)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2014-11-06 05:56:00 UTC (rev 175675)
</span><span class="lines">@@ -109,6 +109,8 @@
</span><span class="cx"> - (void)_setSuppressVisibilityUpdates:(BOOL)suppressVisibilityUpdates;
</span><span class="cx"> - (BOOL)_suppressVisibilityUpdates;
</span><span class="cx">
</span><ins>+- (BOOL)_shouldIgnoreMouseEvents;
+
</ins><span class="cx"> - (void)_didFirstVisuallyNonEmptyLayoutForMainFrame;
</span><span class="cx"> - (void)_didFinishLoadForMainFrame;
</span><span class="cx"> - (void)_didSameDocumentNavigationForMainFrame:(WebKit::SameDocumentNavigationType)type;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175674 => 175675)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-06 05:53:29 UTC (rev 175674)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-06 05:56:00 UTC (rev 175675)
</span><span class="lines">@@ -141,6 +141,11 @@
</span><span class="cx"> if (menu != _wkView.actionMenu)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (_wkView._shouldIgnoreMouseEvents) {
+ [menu cancelTracking];
+ return;
+ }
+
</ins><span class="cx"> _page->performActionMenuHitTestAtLocation([_wkView convertPoint:event.locationInWindow fromView:nil]);
</span><span class="cx">
</span><span class="cx"> _state = ActionMenuState::Pending;
</span></span></pre>
</div>
</div>
</body>
</html>