<!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>[196070] trunk/Source</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/196070">196070</a></dd>
<dt>Author</dt> <dd>jberlin@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-03 09:59:23 -0800 (Wed, 03 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Build fix.
[NSEvent context] has always returned nil. Replace uses with nullptr.
Source/WebCore:
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::sendFakeEventsAfterWidgetTracking):
Source/WebKit/mac:
* WebView/WebHTMLView.mm:
(-[WebHTMLView _postFakeMouseMovedEventForFlagsChangedEvent:]):
(-[WebHTMLView _updateMouseoverWithFakeEvent]):
(-[WebHTMLView _updateMouseoverWithEvent:]):
(-[WebHTMLView _autoscroll]):
(-[WebHTMLView draggedImage:endedAt:operation:]):
Source/WebKit2:
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::postFakeMouseMovedEventForFlagsChangedEvent):
* UIProcess/mac/WebPopupMenuProxyMac.mm:
(WebKit::WebPopupMenuProxyMac::showPopupMenu):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplmm">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPopupMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196069 => 196070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-03 17:51:05 UTC (rev 196069)
+++ trunk/Source/WebCore/ChangeLog 2016-02-03 17:59:23 UTC (rev 196070)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-02-03 Jessie Berlin <jberlin@webkit.org>
+
+ Build fix.
+
+ [NSEvent context] has always returned nil. Replace uses with nullptr.
+
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::sendFakeEventsAfterWidgetTracking):
+
</ins><span class="cx"> 2016-02-03 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Layout Test http/tests/appcache/different-https-origin-resource-main.html is failing
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (196069 => 196070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2016-02-03 17:51:05 UTC (rev 196069)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2016-02-03 17:59:23 UTC (rev 196070)
</span><span class="lines">@@ -577,7 +577,7 @@
</span><span class="cx"> modifierFlags:[initiatingEvent modifierFlags]
</span><span class="cx"> timestamp:[initiatingEvent timestamp]
</span><span class="cx"> windowNumber:[initiatingEvent windowNumber]
</span><del>- context:[initiatingEvent context]
</del><ins>+ context:nullptr
</ins><span class="cx"> eventNumber:[initiatingEvent eventNumber]
</span><span class="cx"> clickCount:[initiatingEvent clickCount]
</span><span class="cx"> pressure:[initiatingEvent pressure]];
</span><span class="lines">@@ -589,7 +589,7 @@
</span><span class="cx"> modifierFlags:[initiatingEvent modifierFlags]
</span><span class="cx"> timestamp:[initiatingEvent timestamp]
</span><span class="cx"> windowNumber:[initiatingEvent windowNumber]
</span><del>- context:[initiatingEvent context]
</del><ins>+ context:nullptr
</ins><span class="cx"> characters:[initiatingEvent characters]
</span><span class="cx"> charactersIgnoringModifiers:[initiatingEvent charactersIgnoringModifiers]
</span><span class="cx"> isARepeat:[initiatingEvent isARepeat]
</span><span class="lines">@@ -606,7 +606,7 @@
</span><span class="cx"> modifierFlags:[initiatingEvent modifierFlags]
</span><span class="cx"> timestamp:[initiatingEvent timestamp]
</span><span class="cx"> windowNumber:[initiatingEvent windowNumber]
</span><del>- context:[initiatingEvent context]
</del><ins>+ context:nullptr
</ins><span class="cx"> eventNumber:0
</span><span class="cx"> clickCount:0
</span><span class="cx"> pressure:0];
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (196069 => 196070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-02-03 17:51:05 UTC (rev 196069)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-02-03 17:59:23 UTC (rev 196070)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-02-03 Jessie Berlin <jberlin@webkit.org>
+
+ Build fix.
+
+ [NSEvent context] has always returned nil. Replace uses with nullptr.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _postFakeMouseMovedEventForFlagsChangedEvent:]):
+ (-[WebHTMLView _updateMouseoverWithFakeEvent]):
+ (-[WebHTMLView _updateMouseoverWithEvent:]):
+ (-[WebHTMLView _autoscroll]):
+ (-[WebHTMLView draggedImage:endedAt:operation:]):
+
</ins><span class="cx"> 2016-02-01 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a line grid pagination SPI to WebKit.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (196069 => 196070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-02-03 17:51:05 UTC (rev 196069)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-02-03 17:59:23 UTC (rev 196070)
</span><span class="lines">@@ -1349,7 +1349,7 @@
</span><span class="cx"> {
</span><span class="cx"> NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSMouseMoved location:flagsChangedEvent.window.mouseLocationOutsideOfEventStream
</span><span class="cx"> modifierFlags:flagsChangedEvent.modifierFlags timestamp:flagsChangedEvent.timestamp windowNumber:flagsChangedEvent.windowNumber
</span><del>- context:flagsChangedEvent.context eventNumber:0 clickCount:0 pressure:0];
</del><ins>+ context:nullptr eventNumber:0 clickCount:0 pressure:0];
</ins><span class="cx">
</span><span class="cx"> [self mouseMoved:fakeEvent];
</span><span class="cx"> }
</span><span class="lines">@@ -1659,7 +1659,7 @@
</span><span class="cx"> modifierFlags:[[NSApp currentEvent] modifierFlags]
</span><span class="cx"> timestamp:[NSDate timeIntervalSinceReferenceDate]
</span><span class="cx"> windowNumber:[[self window] windowNumber]
</span><del>- context:[[NSApp currentEvent] context]
</del><ins>+ context:nullptr
</ins><span class="cx"> eventNumber:0 clickCount:0 pressure:0];
</span><span class="cx"> #pragma clang diagnostic pop
</span><span class="cx">
</span><span class="lines">@@ -2115,7 +2115,7 @@
</span><span class="cx"> modifierFlags:[[NSApp currentEvent] modifierFlags]
</span><span class="cx"> timestamp:[NSDate timeIntervalSinceReferenceDate]
</span><span class="cx"> windowNumber:[[view window] windowNumber]
</span><del>- context:[[NSApp currentEvent] context]
</del><ins>+ context:nullptr
</ins><span class="cx"> eventNumber:0 clickCount:0 pressure:0];
</span><span class="cx"> if (Frame* lastHitCoreFrame = core([lastHitView _frame]))
</span><span class="cx"> lastHitCoreFrame->eventHandler().mouseMoved(event, [[self _webView] _pressureEvent]);
</span><span class="lines">@@ -2305,7 +2305,7 @@
</span><span class="cx"> modifierFlags:[[NSApp currentEvent] modifierFlags]
</span><span class="cx"> timestamp:[NSDate timeIntervalSinceReferenceDate]
</span><span class="cx"> windowNumber:[[self window] windowNumber]
</span><del>- context:[[NSApp currentEvent] context]
</del><ins>+ context:nullptr
</ins><span class="cx"> eventNumber:0 clickCount:0 pressure:0];
</span><span class="cx"> #pragma clang diagnostic pop
</span><span class="cx"> [self mouseDragged:fakeEvent];
</span><span class="lines">@@ -4593,7 +4593,7 @@
</span><span class="cx"> modifierFlags:[[NSApp currentEvent] modifierFlags]
</span><span class="cx"> timestamp:[NSDate timeIntervalSinceReferenceDate]
</span><span class="cx"> windowNumber:[[self window] windowNumber]
</span><del>- context:[[NSApp currentEvent] context]
</del><ins>+ context:nullptr
</ins><span class="cx"> eventNumber:0 clickCount:0 pressure:0];
</span><span class="cx"> [self mouseUp:fakeEvent]; // This will also update the mouseover state.
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (196069 => 196070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-03 17:51:05 UTC (rev 196069)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-03 17:59:23 UTC (rev 196070)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-02-03 Jessie Berlin <jberlin@webkit.org>
+
+ Build fix.
+
+ [NSEvent context] has always returned nil. Replace uses with nullptr.
+
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::postFakeMouseMovedEventForFlagsChangedEvent):
+ * UIProcess/mac/WebPopupMenuProxyMac.mm:
+ (WebKit::WebPopupMenuProxyMac::showPopupMenu):
+
</ins><span class="cx"> 2016-02-03 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Engineering builds use manual sandboxing, but don’t need to
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (196069 => 196070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-02-03 17:51:05 UTC (rev 196069)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-02-03 17:59:23 UTC (rev 196070)
</span><span class="lines">@@ -1252,7 +1252,7 @@
</span><span class="cx"> {
</span><span class="cx"> NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSMouseMoved location:flagsChangedEvent.window.mouseLocationOutsideOfEventStream
</span><span class="cx"> modifierFlags:flagsChangedEvent.modifierFlags timestamp:flagsChangedEvent.timestamp windowNumber:flagsChangedEvent.windowNumber
</span><del>- context:flagsChangedEvent.context eventNumber:0 clickCount:0 pressure:0];
</del><ins>+ context:nullptr eventNumber:0 clickCount:0 pressure:0];
</ins><span class="cx"> NativeWebMouseEvent webEvent(fakeEvent, m_lastPressureEvent.get(), m_view);
</span><span class="cx"> m_page->handleMouseEvent(webEvent);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPopupMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm (196069 => 196070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2016-02-03 17:51:05 UTC (rev 196069)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2016-02-03 17:59:23 UTC (rev 196070)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> modifierFlags:[initiatingNSEvent modifierFlags]
</span><span class="cx"> timestamp:[initiatingNSEvent timestamp]
</span><span class="cx"> windowNumber:[initiatingNSEvent windowNumber]
</span><del>- context:[initiatingNSEvent context]
</del><ins>+ context:nullptr
</ins><span class="cx"> eventNumber:[initiatingNSEvent eventNumber]
</span><span class="cx"> clickCount:[initiatingNSEvent clickCount]
</span><span class="cx"> pressure:[initiatingNSEvent pressure]];
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> modifierFlags:[initiatingNSEvent modifierFlags]
</span><span class="cx"> timestamp:[initiatingNSEvent timestamp]
</span><span class="cx"> windowNumber:[initiatingNSEvent windowNumber]
</span><del>- context:[initiatingNSEvent context]
</del><ins>+ context:nullptr
</ins><span class="cx"> eventNumber:0
</span><span class="cx"> clickCount:0
</span><span class="cx"> pressure:0];
</span></span></pre>
</div>
</div>
</body>
</html>