<!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>[191806] 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/191806">191806</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-10-30 13:05:05 -0700 (Fri, 30 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>WKView being inside WKWebView leads to weird API issues
https://bugs.webkit.org/show_bug.cgi?id=150174
Reviewed by Anders Carlsson.
* UIProcess/API/mac/WKView.mm:
(-[WKView mouseMoved:]):
(-[WKView mouseDown:]):
(-[WKView mouseUp:]):
(-[WKView mouseDragged:]):
(-[WKView mouseEntered:]):
(-[WKView mouseExited:]):
(-[WKView otherMouseDown:]):
(-[WKView otherMouseDragged:]):
(-[WKView otherMouseUp:]):
(-[WKView rightMouseDown:]):
(-[WKView rightMouseDragged:]):
(-[WKView rightMouseUp:]):
(-[WKView _updateViewExposedRect]): Deleted.
* UIProcess/Cocoa/WebViewImpl.h:
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::mouseMoved):
(WebKit::WebViewImpl::mouseDown):
(WebKit::WebViewImpl::mouseUp):
(WebKit::WebViewImpl::mouseDragged):
Move mouse event handling.</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>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplh">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplmm">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191805 => 191806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-30 19:38:40 UTC (rev 191805)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-30 20:05:05 UTC (rev 191806)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-10-30 Tim Horton <timothy_horton@apple.com>
+
+ WKView being inside WKWebView leads to weird API issues
+ https://bugs.webkit.org/show_bug.cgi?id=150174
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView mouseMoved:]):
+ (-[WKView mouseDown:]):
+ (-[WKView mouseUp:]):
+ (-[WKView mouseDragged:]):
+ (-[WKView mouseEntered:]):
+ (-[WKView mouseExited:]):
+ (-[WKView otherMouseDown:]):
+ (-[WKView otherMouseDragged:]):
+ (-[WKView otherMouseUp:]):
+ (-[WKView rightMouseDown:]):
+ (-[WKView rightMouseDragged:]):
+ (-[WKView rightMouseUp:]):
+ (-[WKView _updateViewExposedRect]): Deleted.
+ * UIProcess/Cocoa/WebViewImpl.h:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::mouseMoved):
+ (WebKit::WebViewImpl::mouseDown):
+ (WebKit::WebViewImpl::mouseUp):
+ (WebKit::WebViewImpl::mouseDragged):
+ Move mouse event handling.
+
</ins><span class="cx"> 2015-10-30 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Tapping and holding a link should have a share option
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (191805 => 191806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-10-30 19:38:40 UTC (rev 191805)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-10-30 20:05:05 UTC (rev 191806)
</span><span class="lines">@@ -557,88 +557,6 @@
</span><span class="cx"> return _data->_impl->wantsKeyDownForEvent(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(ASYNC_NSTEXTINPUTCLIENT)
-#define NATIVE_MOUSE_EVENT_HANDLER(Selector) \
- - (void)Selector:(NSEvent *)theEvent \
- { \
- if (_data->_impl->ignoresNonWheelEvents()) \
- return; \
- if (NSTextInputContext *context = [self inputContext]) { \
- [context handleEvent:theEvent completionHandler:^(BOOL handled) { \
- if (handled) \
- LOG(TextInput, "%s was handled by text input context", String(#Selector).substring(0, String(#Selector).find("Internal")).ascii().data()); \
- else { \
- NativeWebMouseEvent webEvent(theEvent, _data->_impl->lastPressureEvent(), self); \
- _data->_page->handleMouseEvent(webEvent); \
- } \
- }]; \
- return; \
- } \
- NativeWebMouseEvent webEvent(theEvent, _data->_impl->lastPressureEvent(), self); \
- _data->_page->handleMouseEvent(webEvent); \
- }
-#define NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(Selector) \
- - (void)Selector:(NSEvent *)theEvent \
- { \
- if (_data->_impl->ignoresNonWheelEvents()) \
- return; \
- if (NSTextInputContext *context = [self inputContext]) { \
- [context handleEvent:theEvent completionHandler:^(BOOL handled) { \
- if (handled) \
- LOG(TextInput, "%s was handled by text input context", String(#Selector).substring(0, String(#Selector).find("Internal")).ascii().data()); \
- else { \
- NativeWebMouseEvent webEvent(theEvent, _data->_impl->lastPressureEvent(), self); \
- _data->_page->handleMouseEvent(webEvent); \
- } \
- }]; \
- return; \
- } \
- NativeWebMouseEvent webEvent(theEvent, _data->_impl->lastPressureEvent(), self); \
- _data->_page->handleMouseEvent(webEvent); \
- }
-#else
-#define NATIVE_MOUSE_EVENT_HANDLER(Selector) \
- - (void)Selector:(NSEvent *)theEvent \
- { \
- if (_data->_impl->ignoresNonWheelEvents()) \
- return; \
- 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, _data->_impl->lastPressureEvent(), self); \
- _data->_page->handleMouseEvent(webEvent); \
- }
-#define NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(Selector) \
- - (void)Selector:(NSEvent *)theEvent \
- { \
- if (_data->_impl->ignoresNonWheelEvents()) \
- return; \
- 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, _data->_impl->lastPressureEvent(), self); \
- _data->_page->handleMouseEvent(webEvent); \
- }
-#endif
-
-NATIVE_MOUSE_EVENT_HANDLER(mouseEntered)
-NATIVE_MOUSE_EVENT_HANDLER(mouseExited)
-NATIVE_MOUSE_EVENT_HANDLER(otherMouseDown)
-NATIVE_MOUSE_EVENT_HANDLER(otherMouseDragged)
-NATIVE_MOUSE_EVENT_HANDLER(otherMouseUp)
-NATIVE_MOUSE_EVENT_HANDLER(rightMouseDown)
-NATIVE_MOUSE_EVENT_HANDLER(rightMouseDragged)
-NATIVE_MOUSE_EVENT_HANDLER(rightMouseUp)
-
-NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(mouseMovedInternal)
-NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(mouseDownInternal)
-NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(mouseUpInternal)
-NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(mouseDraggedInternal)
-
-#undef NATIVE_MOUSE_EVENT_HANDLER
-
</del><span class="cx"> - (void)scrollWheel:(NSEvent *)event
</span><span class="cx"> {
</span><span class="cx"> _data->_impl->scrollWheel(event);
</span><span class="lines">@@ -651,46 +569,64 @@
</span><span class="cx">
</span><span class="cx"> - (void)mouseMoved:(NSEvent *)event
</span><span class="cx"> {
</span><del>- if (_data->_impl->ignoresNonWheelEvents())
- return;
</del><ins>+ _data->_impl->mouseMoved(event);
+}
</ins><span class="cx">
</span><del>- // When a view is first responder, it gets mouse moved events even when the mouse is outside its visible rect.
- if (self == [[self window] firstResponder] && !NSPointInRect([self convertPoint:[event locationInWindow] fromView:nil], [self visibleRect]))
- return;
</del><ins>+- (void)mouseDown:(NSEvent *)event
+{
+ _data->_impl->mouseDown(event);
+}
</ins><span class="cx">
</span><del>- [self mouseMovedInternal:event];
</del><ins>+- (void)mouseUp:(NSEvent *)event
+{
+ _data->_impl->mouseUp(event);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)mouseDown:(NSEvent *)event
</del><ins>+- (void)mouseDragged:(NSEvent *)event
</ins><span class="cx"> {
</span><del>- if (_data->_impl->ignoresNonWheelEvents())
- return;
</del><ins>+ _data->_impl->mouseDragged(event);
+}
</ins><span class="cx">
</span><del>- _data->_impl->setLastMouseDownEvent(event);
- _data->_impl->setIgnoresMouseDraggedEvents(false);
</del><ins>+- (void)mouseEntered:(NSEvent *)event
+{
+ _data->_impl->mouseEntered(event);
+}
</ins><span class="cx">
</span><del>- [self mouseDownInternal:event];
</del><ins>+- (void)mouseExited:(NSEvent *)event
+{
+ _data->_impl->mouseExited(event);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)mouseUp:(NSEvent *)event
</del><ins>+- (void)otherMouseDown:(NSEvent *)event
</ins><span class="cx"> {
</span><del>- if (_data->_impl->ignoresNonWheelEvents())
- return;
</del><ins>+ _data->_impl->otherMouseDown(event);
+}
</ins><span class="cx">
</span><del>- _data->_impl->setLastMouseDownEvent(nil);
- [self mouseUpInternal:event];
</del><ins>+- (void)otherMouseDragged:(NSEvent *)event
+{
+ _data->_impl->otherMouseDragged(event);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)mouseDragged:(NSEvent *)event
</del><ins>+- (void)otherMouseUp:(NSEvent *)event
</ins><span class="cx"> {
</span><del>- if (_data->_impl->ignoresNonWheelEvents())
- return;
- if (_data->_impl->ignoresMouseDraggedEvents())
- return;
</del><ins>+ _data->_impl->otherMouseUp(event);
+}
</ins><span class="cx">
</span><del>- [self mouseDraggedInternal:event];
</del><ins>+- (void)rightMouseDown:(NSEvent *)event
+{
+ _data->_impl->rightMouseDown(event);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)rightMouseDragged:(NSEvent *)event
+{
+ _data->_impl->rightMouseDragged(event);
+}
+
+- (void)rightMouseUp:(NSEvent *)event
+{
+ _data->_impl->rightMouseUp(event);
+}
+
</ins><span class="cx"> - (void)pressureChangeWithEvent:(NSEvent *)event
</span><span class="cx"> {
</span><span class="cx"> _data->_impl->pressureChangeWithEvent(event);
</span><span class="lines">@@ -1116,13 +1052,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // WK_API_ENABLED
</span><span class="cx">
</span><del>-
-// FIXME: Get rid of this when we have better plumbing to WKViewLayoutStrategy.
-- (void)_updateViewExposedRect
-{
- _data->_impl->updateViewExposedRect();
-}
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WKView (Private)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h (191805 => 191806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2015-10-30 19:38:40 UTC (rev 191805)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2015-10-30 20:05:05 UTC (rev 191806)
</span><span class="lines">@@ -458,6 +458,19 @@
</span><span class="cx"> void characterIndexForPoint(NSPoint, void(^)(NSUInteger));
</span><span class="cx"> #endif // USE(ASYNC_NSTEXTINPUTCLIENT)
</span><span class="cx">
</span><ins>+ void mouseMoved(NSEvent *);
+ void mouseDown(NSEvent *);
+ void mouseUp(NSEvent *);
+ void mouseDragged(NSEvent *);
+ void mouseEntered(NSEvent *);
+ void mouseExited(NSEvent *);
+ void otherMouseDown(NSEvent *);
+ void otherMouseDragged(NSEvent *);
+ void otherMouseUp(NSEvent *);
+ void rightMouseDown(NSEvent *);
+ void rightMouseDragged(NSEvent *);
+ void rightMouseUp(NSEvent *);
+
</ins><span class="cx"> private:
</span><span class="cx"> WeakPtr<WebViewImpl> createWeakPtr() { return m_weakPtrFactory.createWeakPtr(); }
</span><span class="cx">
</span><span class="lines">@@ -485,6 +498,11 @@
</span><span class="cx"> bool interpretKeyEvent(NSEvent *, Vector<WebCore::KeypressCommand>&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ void mouseMovedInternal(NSEvent *);
+ void mouseDownInternal(NSEvent *);
+ void mouseUpInternal(NSEvent *);
+ void mouseDraggedInternal(NSEvent *);
+
</ins><span class="cx"> NSView <WebViewImplDelegate> *m_view;
</span><span class="cx"> WebPageProxy& m_page;
</span><span class="cx"> PageClient& m_pageClient;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (191805 => 191806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2015-10-30 19:38:40 UTC (rev 191805)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2015-10-30 20:05:05 UTC (rev 191806)
</span><span class="lines">@@ -4169,6 +4169,140 @@
</span><span class="cx">
</span><span class="cx"> #endif // USE(ASYNC_NSTEXTINPUTCLIENT)
</span><span class="cx">
</span><ins>+#if USE(ASYNC_NSTEXTINPUTCLIENT)
+#define NATIVE_MOUSE_EVENT_HANDLER(EventName) \
+ void WebViewImpl::EventName(NSEvent *event) \
+ { \
+ if (m_ignoresNonWheelEvents) \
+ return; \
+ if (NSTextInputContext *context = m_view.inputContext) { \
+ auto weakThis = createWeakPtr(); \
+ RetainPtr<NSEvent> retainedEvent = event; \
+ [context handleEvent:event completionHandler:[weakThis, retainedEvent] (BOOL handled) { \
+ if (!weakThis) \
+ return; \
+ if (handled) \
+ LOG(TextInput, "%s was handled by text input context", String(#EventName).substring(0, String(#EventName).find("Internal")).ascii().data()); \
+ else { \
+ NativeWebMouseEvent webEvent(retainedEvent.get(), weakThis->m_lastPressureEvent.get(), weakThis->m_view); \
+ weakThis->m_page.handleMouseEvent(webEvent); \
+ } \
+ }]; \
+ return; \
+ } \
+ NativeWebMouseEvent webEvent(event, m_lastPressureEvent.get(), m_view); \
+ m_page.handleMouseEvent(webEvent); \
+ }
+#define NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(EventName) \
+ void WebViewImpl::EventName(NSEvent *event) \
+ { \
+ if (m_ignoresNonWheelEvents) \
+ return; \
+ if (NSTextInputContext *context = m_view.inputContext) { \
+ auto weakThis = createWeakPtr(); \
+ RetainPtr<NSEvent> retainedEvent = event; \
+ [context handleEvent:event completionHandler:[weakThis, retainedEvent] (BOOL handled) { \
+ if (!weakThis) \
+ return; \
+ if (handled) \
+ LOG(TextInput, "%s was handled by text input context", String(#EventName).substring(0, String(#EventName).find("Internal")).ascii().data()); \
+ else { \
+ NativeWebMouseEvent webEvent(retainedEvent.get(), weakThis->m_lastPressureEvent.get(), weakThis->m_view); \
+ weakThis->m_page.handleMouseEvent(webEvent); \
+ } \
+ }]; \
+ return; \
+ } \
+ NativeWebMouseEvent webEvent(event, m_lastPressureEvent.get(), m_view); \
+ m_page.handleMouseEvent(webEvent); \
+ }
+
+#else // USE(ASYNC_NSTEXTINPUTCLIENT)
+#define NATIVE_MOUSE_EVENT_HANDLER(EventName) \
+ void WebViewImpl::EventName(NSEvent *event) \
+ { \
+ if (m_ignoresNonWheelEvents) \
+ return; \
+ if ([m_view.inputContext handleEvent:event]) { \
+ LOG(TextInput, "%s was handled by text input context", String(#EventName).substring(0, String(#EventName).find("Internal")).ascii().data()); \
+ return; \
+ } \
+ NativeWebMouseEvent webEvent(event, m_lastPressureEvent.get(), m_view); \
+ m_page.handleMouseEvent(webEvent); \
+ }
+#define NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(EventName) \
+ void WebViewImpl::EventName(NSEvent *event) \
+ { \
+ if (m_ignoresNonWheelEvents) \
+ return; \
+ if ([m_view.inputContext handleEvent:event]) { \
+ LOG(TextInput, "%s was handled by text input context", String(#EventName).substring(0, String(#EventName).find("Internal")).ascii().data()); \
+ return; \
+ } \
+ NativeWebMouseEvent webEvent(event, m_lastPressureEvent.get(), m_view); \
+ m_page.handleMouseEvent(webEvent); \
+ }
+#endif // USE(ASYNC_NSTEXTINPUTCLIENT)
+
+NATIVE_MOUSE_EVENT_HANDLER(mouseEntered)
+NATIVE_MOUSE_EVENT_HANDLER(mouseExited)
+NATIVE_MOUSE_EVENT_HANDLER(otherMouseDown)
+NATIVE_MOUSE_EVENT_HANDLER(otherMouseDragged)
+NATIVE_MOUSE_EVENT_HANDLER(otherMouseUp)
+NATIVE_MOUSE_EVENT_HANDLER(rightMouseDown)
+NATIVE_MOUSE_EVENT_HANDLER(rightMouseDragged)
+NATIVE_MOUSE_EVENT_HANDLER(rightMouseUp)
+
+NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(mouseMovedInternal)
+NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(mouseDownInternal)
+NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(mouseUpInternal)
+NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(mouseDraggedInternal)
+
+#undef NATIVE_MOUSE_EVENT_HANDLER
+#undef NATIVE_MOUSE_EVENT_HANDLER_INTERNAL
+
+void WebViewImpl::mouseMoved(NSEvent *event)
+{
+ if (m_ignoresNonWheelEvents)
+ return;
+
+ // When a view is first responder, it gets mouse moved events even when the mouse is outside its visible rect.
+ if (m_view == m_view.window.firstResponder && !NSPointInRect([m_view convertPoint:[event locationInWindow] fromView:nil], m_view.visibleRect))
+ return;
+
+ mouseMovedInternal(event);
+}
+
+void WebViewImpl::mouseDown(NSEvent *event)
+{
+ if (m_ignoresNonWheelEvents)
+ return;
+
+ setLastMouseDownEvent(event);
+ setIgnoresMouseDraggedEvents(false);
+
+ mouseDownInternal(event);
+}
+
+void WebViewImpl::mouseUp(NSEvent *event)
+{
+ if (m_ignoresNonWheelEvents)
+ return;
+
+ setLastMouseDownEvent(nil);
+ mouseUpInternal(event);
+}
+
+void WebViewImpl::mouseDragged(NSEvent *event)
+{
+ if (m_ignoresNonWheelEvents)
+ return;
+ if (ignoresMouseDraggedEvents())
+ return;
+
+ mouseDraggedInternal(event);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre>
</div>
</div>
</body>
</html>