<!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>[164906] trunk/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/164906">164906</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-02-28 21:05:16 -0800 (Fri, 28 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Extract _data->_thumbnailView checks into a helper function
https://bugs.webkit.org/show_bug.cgi?id=129517
Reviewed by Sam Weinig.
* UIProcess/API/mac/WKView.mm:
(-[WKView shouldIgnoreMouseEvents]):
(-[WKView scrollWheel:]):
(-[WKView mouseMoved:]):
(-[WKView mouseDown:]):
(-[WKView mouseUp:]):
(-[WKView mouseDragged:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164905 => 164906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-03-01 04:10:24 UTC (rev 164905)
+++ trunk/Source/WebKit2/ChangeLog        2014-03-01 05:05:16 UTC (rev 164906)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-28 Alexey Proskuryakov <ap@apple.com>
+
+ [Mac] Extract _data->_thumbnailView checks into a helper function
+ https://bugs.webkit.org/show_bug.cgi?id=129517
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView shouldIgnoreMouseEvents]):
+ (-[WKView scrollWheel:]):
+ (-[WKView mouseMoved:]):
+ (-[WKView mouseDown:]):
+ (-[WKView mouseUp:]):
+ (-[WKView mouseDragged:]):
+
</ins><span class="cx"> 2014-02-28 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WebKit2] Don't use any of the mach exception handling code on iOS
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (164905 => 164906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm        2014-03-01 04:10:24 UTC (rev 164905)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm        2014-03-01 05:05:16 UTC (rev 164906)
</span><span class="lines">@@ -1052,6 +1052,17 @@
</span><span class="cx">
</span><span class="cx"> // Events
</span><span class="cx">
</span><ins>+-(BOOL)shouldIgnoreMouseEvents
+{
+ // FIXME: This check is surprisingly specific. Are there any other cases where we need to block mouse events?
+ // Do we actually need to in thumbnail view? And if we do, what about non-mouse events?
+#if WK_API_ENABLED
+ if (_data->_thumbnailView)
+ return YES;
+#endif
+ return NO;
+}
+
</ins><span class="cx"> // Override this so that AppKit will send us arrow keys as key down events so we can
</span><span class="cx"> // support them via the key bindings mechanism.
</span><span class="cx"> - (BOOL)_wantsKeyDownForEvent:(NSEvent *)event
</span><span class="lines">@@ -1070,11 +1081,10 @@
</span><span class="cx"> _data->_mouseDownEvent = [event retain];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if WK_API_ENABLED
</del><span class="cx"> #define NATIVE_MOUSE_EVENT_HANDLER(Selector) \
</span><span class="cx"> - (void)Selector:(NSEvent *)theEvent \
</span><span class="cx"> { \
</span><del>- if (_data->_thumbnailView) \
</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">@@ -1083,18 +1093,6 @@
</span><span class="cx"> NativeWebMouseEvent webEvent(theEvent, self); \
</span><span class="cx"> _data->_page->handleMouseEvent(webEvent); \
</span><span class="cx"> }
</span><del>-#else
-#define NATIVE_MOUSE_EVENT_HANDLER(Selector) \
- - (void)Selector:(NSEvent *)theEvent \
- { \
- if ([[self inputContext] handleEvent:theEvent]) { \
- LOG(TextInput, "%s was handled by text input context", String(#Selector).substring(0, String(#Selector).find("Internal")).ascii().data()); \
- return; \
- } \
- NativeWebMouseEvent webEvent(theEvent, self); \
- _data->_page->handleMouseEvent(webEvent); \
- }
-#endif
</del><span class="cx">
</span><span class="cx"> NATIVE_MOUSE_EVENT_HANDLER(mouseEntered)
</span><span class="cx"> NATIVE_MOUSE_EVENT_HANDLER(mouseExited)
</span><span class="lines">@@ -1122,10 +1120,8 @@
</span><span class="cx">
</span><span class="cx"> - (void)scrollWheel:(NSEvent *)event
</span><span class="cx"> {
</span><del>-#if WK_API_ENABLED
- if (_data->_thumbnailView)
</del><ins>+ if ([self shouldIgnoreMouseEvents])
</ins><span class="cx"> return;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (_data->_allowsBackForwardNavigationGestures) {
</span><span class="cx"> [self _ensureGestureController];
</span><span class="lines">@@ -1139,10 +1135,8 @@
</span><span class="cx">
</span><span class="cx"> - (void)mouseMoved:(NSEvent *)event
</span><span class="cx"> {
</span><del>-#if WK_API_ENABLED
- if (_data->_thumbnailView)
</del><ins>+ if ([self shouldIgnoreMouseEvents])
</ins><span class="cx"> return;
</span><del>-#endif
</del><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="cx"> if (self == [[self window] firstResponder] && !NSPointInRect([self convertPoint:[event locationInWindow] fromView:nil], [self visibleRect]))
</span><span class="lines">@@ -1153,10 +1147,8 @@
</span><span class="cx">
</span><span class="cx"> - (void)mouseDown:(NSEvent *)event
</span><span class="cx"> {
</span><del>-#if WK_API_ENABLED
- if (_data->_thumbnailView)
</del><ins>+ if ([self shouldIgnoreMouseEvents])
</ins><span class="cx"> return;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> [self _setMouseDownEvent:event];
</span><span class="cx"> _data->_ignoringMouseDraggedEvents = NO;
</span><span class="lines">@@ -1165,10 +1157,8 @@
</span><span class="cx">
</span><span class="cx"> - (void)mouseUp:(NSEvent *)event
</span><span class="cx"> {
</span><del>-#if WK_API_ENABLED
- if (_data->_thumbnailView)
</del><ins>+ if ([self shouldIgnoreMouseEvents])
</ins><span class="cx"> return;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> [self _setMouseDownEvent:nil];
</span><span class="cx"> [self mouseUpInternal:event];
</span><span class="lines">@@ -1176,10 +1166,8 @@
</span><span class="cx">
</span><span class="cx"> - (void)mouseDragged:(NSEvent *)event
</span><span class="cx"> {
</span><del>-#if WK_API_ENABLED
- if (_data->_thumbnailView)
</del><ins>+ if ([self shouldIgnoreMouseEvents])
</ins><span class="cx"> return;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (_data->_ignoringMouseDraggedEvents)
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>