<!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>[175673] 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/175673">175673</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-11-05 21:50:58 -0800 (Wed, 05 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/175630">r175630</a>. <rdar://problems/18876437></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessAPICocoaWKViewPrivateh">branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessAPICocoaWKWebViewInternalh">branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessAPImacWKViewmm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm</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 (175672 => 175673)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-06 05:50:50 UTC (rev 175672)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-06 05:50:58 UTC (rev 175673)
</span><span class="lines">@@ -1,5 +1,49 @@
</span><span class="cx"> 2014-11-05 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r175630. <rdar://problem/18876437>
+
+ 2014-11-05 Conrad Shultz <conrad_shultz@apple.com>
+
+ Disable interaction with action menu page previews
+ https://bugs.webkit.org/show_bug.cgi?id=138400
+
+ Reviewed by Tim Horton.
+
+ Expand on the existing -[WKView shouldIgnoreMouseEvents] by adding facilities to suppress handling
+ of all non-wheel events, effectively creating a scroll-only web view. Deploy this in
+ WKPagePreviewViewController.
+
+ * UIProcess/API/Cocoa/WKViewPrivate.h:
+ Declare the OS X-only ignoresNonWheelMouseEvents SPI.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _ignoresNonWheelMouseEvents]):
+ (-[WKWebView _setIgnoresNonWheelMouseEvents:]):
+ Wrap the underlying WKView methods.
+
+ * UIProcess/API/Cocoa/WKWebViewInternal.h:
+ Declare the OS X-only ignoresNonWheelMouseEvents property.
+
+ * UIProcess/API/mac/WKView.mm:
+ Add _ignoresNonWheelMouseEvents to WKViewData.
+ (-[WKView shouldIgnoreMouseEvents]):
+ Include a check for _ignoresNonWheelMouseEvents.
+ (-[WKView _setIgnoresNonWheelMouseEvents:]):
+ Set the ivar in WKViewData.
+ (-[WKView _ignoresNonWheelMouseEvents]):
+ Fetch the ivar in WKViewData.
+ (-[WKView _shouldIgnoreWheelEvents]):
+ Implement the old -shouldIgnoreMouseEvents behavior.
+ (-[WKView scrollWheel:]):
+ -shouldIgnoreMouseEvents -> -_shouldIgnoreWheelEvents.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKPagePreviewViewController loadView]):
+ Configure the WKWebView to ignore non-wheel mouse events; use RetainPtr for the WKWebView.
+
+
+2014-11-05 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r175591. <rdar://problem/18871842>
</span><span class="cx">
</span><span class="cx"> 2014-11-04 Anders Carlsson <andersca@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessAPICocoaWKViewPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h (175672 => 175673)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-11-06 05:50:50 UTC (rev 175672)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-11-06 05:50:58 UTC (rev 175673)
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx"> @property (readonly, getter=isUsingUISideCompositing) BOOL usingUISideCompositing;
</span><span class="cx"> @property (readwrite) BOOL allowsMagnification;
</span><span class="cx"> @property (readwrite) double magnification;
</span><ins>+@property (readwrite, setter=_setIgnoresNonWheelMouseEvents:) BOOL _ignoresNonWheelMouseEvents;
</ins><span class="cx"> @property (readwrite) BOOL allowsBackForwardNavigationGestures;
</span><span class="cx"> @property (nonatomic, setter=_setTopContentInset:) CGFloat _topContentInset;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (175672 => 175673)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-11-06 05:50:50 UTC (rev 175672)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-11-06 05:50:58 UTC (rev 175673)
</span><span class="lines">@@ -2404,6 +2404,16 @@
</span><span class="cx"> [_wkView _setTopContentInset:contentInset];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_ignoresNonWheelMouseEvents
+{
+ return [_wkView _ignoresNonWheelMouseEvents];
+}
+
+- (void)_setIgnoresNonWheelMouseEvents:(BOOL)ignoresNonWheelMouseEvents
+{
+ [_wkView _setIgnoresNonWheelMouseEvents:ignoresNonWheelMouseEvents];
+}
+
</ins><span class="cx"> - (CGFloat)_topContentInset
</span><span class="cx"> {
</span><span class="cx"> return [_wkView _topContentInset];
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessAPICocoaWKWebViewInternalh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h (175672 => 175673)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2014-11-06 05:50:50 UTC (rev 175672)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2014-11-06 05:50:58 UTC (rev 175673)
</span><span class="lines">@@ -96,7 +96,10 @@
</span><span class="cx"> - (void)_updateVisibleContentRects;
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) UIEdgeInsets _computedContentInset;
</span><ins>+#else
+@property (nonatomic, setter=_setIgnoresNonWheelMouseEvents:) BOOL _ignoresNonWheelMouseEvents;
</ins><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> WKWebView* fromWebPageProxy(WebKit::WebPageProxy&);
</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 (175672 => 175673)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-11-06 05:50:50 UTC (rev 175672)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-11-06 05:50:58 UTC (rev 175673)
</span><span class="lines">@@ -242,6 +242,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<ViewGestureController> _gestureController;
</span><span class="cx"> BOOL _allowsMagnification;
</span><ins>+ BOOL _ignoresNonWheelMouseEvents;
</ins><span class="cx"> BOOL _allowsBackForwardNavigationGestures;
</span><span class="cx">
</span><span class="cx"> RetainPtr<CALayer> _rootLayer;
</span><span class="lines">@@ -1095,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">@@ -1103,6 +1104,28 @@
</span><span class="cx"> if (_data->_thumbnailView)
</span><span class="cx"> return YES;
</span><span class="cx"> #endif
</span><ins>+
+ // -scrollWheel: uses -_shouldIgnoreWheelEvents, so for all other event types it is correct to use this.
+ return _data->_ignoresNonWheelMouseEvents;
+}
+
+- (void)_setIgnoresNonWheelMouseEvents:(BOOL)ignoresNonWheelMouseEvents
+{
+ _data->_ignoresNonWheelMouseEvents = ignoresNonWheelMouseEvents;
+}
+
+- (BOOL)_ignoresNonWheelMouseEvents
+{
+ return _data->_ignoresNonWheelMouseEvents;
+}
+
+- (BOOL)_shouldIgnoreWheelEvents
+{
+#if WK_API_ENABLED
+ if (_data->_thumbnailView)
+ return YES;
+#endif
+
</ins><span class="cx"> return NO;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1185,7 +1208,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)scrollWheel:(NSEvent *)event
</span><span class="cx"> {
</span><del>- if ([self shouldIgnoreMouseEvents])
</del><ins>+ if ([self _shouldIgnoreWheelEvents])
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (_data->_allowsBackForwardNavigationGestures) {
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175672 => 175673)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-06 05:50:50 UTC (rev 175672)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-06 05:50:58 UTC (rev 175673)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import "WKNSURLExtras.h"
</span><span class="cx"> #import "WKViewInternal.h"
</span><span class="cx"> #import "WKWebView.h"
</span><ins>+#import "WKWebViewInternal.h"
</ins><span class="cx"> #import "WebContext.h"
</span><span class="cx"> #import "WebKitSystemInterface.h"
</span><span class="cx"> #import "WebPageMessages.h"
</span><span class="lines">@@ -98,12 +99,13 @@
</span><span class="cx">
</span><span class="cx"> - (void)loadView
</span><span class="cx"> {
</span><del>- WKWebView *webView = [[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, _preferredSize.width, _preferredSize.height)];
</del><ins>+ RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, _preferredSize.width, _preferredSize.height)]);
+ [webView _setIgnoresNonWheelMouseEvents:YES];
</ins><span class="cx"> if (_url) {
</span><span class="cx"> NSURLRequest *request = [NSURLRequest requestWithURL:_url.get()];
</span><span class="cx"> [webView loadRequest:request];
</span><span class="cx"> }
</span><del>- [self setView:webView];
</del><ins>+ self.view = webView.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>