Diff
Modified: trunk/Source/WebCore/ChangeLog (196069 => 196070)
--- 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)
@@ -1,3 +1,12 @@
+2016-02-03 Jessie Berlin <jber...@webkit.org>
+
+ Build fix.
+
+ [NSEvent context] has always returned nil. Replace uses with nullptr.
+
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::sendFakeEventsAfterWidgetTracking):
+
2016-02-03 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Layout Test http/tests/appcache/different-https-origin-resource-main.html is failing
Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (196069 => 196070)
--- 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)
@@ -577,7 +577,7 @@
modifierFlags:[initiatingEvent modifierFlags]
timestamp:[initiatingEvent timestamp]
windowNumber:[initiatingEvent windowNumber]
- context:[initiatingEvent context]
+ context:nullptr
eventNumber:[initiatingEvent eventNumber]
clickCount:[initiatingEvent clickCount]
pressure:[initiatingEvent pressure]];
@@ -589,7 +589,7 @@
modifierFlags:[initiatingEvent modifierFlags]
timestamp:[initiatingEvent timestamp]
windowNumber:[initiatingEvent windowNumber]
- context:[initiatingEvent context]
+ context:nullptr
characters:[initiatingEvent characters]
charactersIgnoringModifiers:[initiatingEvent charactersIgnoringModifiers]
isARepeat:[initiatingEvent isARepeat]
@@ -606,7 +606,7 @@
modifierFlags:[initiatingEvent modifierFlags]
timestamp:[initiatingEvent timestamp]
windowNumber:[initiatingEvent windowNumber]
- context:[initiatingEvent context]
+ context:nullptr
eventNumber:0
clickCount:0
pressure:0];
Modified: trunk/Source/WebKit/mac/ChangeLog (196069 => 196070)
--- 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)
@@ -1,3 +1,16 @@
+2016-02-03 Jessie Berlin <jber...@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:]):
+
2016-02-01 Dave Hyatt <hy...@apple.com>
Add a line grid pagination SPI to WebKit.
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (196069 => 196070)
--- 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)
@@ -1349,7 +1349,7 @@
{
NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSMouseMoved location:flagsChangedEvent.window.mouseLocationOutsideOfEventStream
modifierFlags:flagsChangedEvent.modifierFlags timestamp:flagsChangedEvent.timestamp windowNumber:flagsChangedEvent.windowNumber
- context:flagsChangedEvent.context eventNumber:0 clickCount:0 pressure:0];
+ context:nullptr eventNumber:0 clickCount:0 pressure:0];
[self mouseMoved:fakeEvent];
}
@@ -1659,7 +1659,7 @@
modifierFlags:[[NSApp currentEvent] modifierFlags]
timestamp:[NSDate timeIntervalSinceReferenceDate]
windowNumber:[[self window] windowNumber]
- context:[[NSApp currentEvent] context]
+ context:nullptr
eventNumber:0 clickCount:0 pressure:0];
#pragma clang diagnostic pop
@@ -2115,7 +2115,7 @@
modifierFlags:[[NSApp currentEvent] modifierFlags]
timestamp:[NSDate timeIntervalSinceReferenceDate]
windowNumber:[[view window] windowNumber]
- context:[[NSApp currentEvent] context]
+ context:nullptr
eventNumber:0 clickCount:0 pressure:0];
if (Frame* lastHitCoreFrame = core([lastHitView _frame]))
lastHitCoreFrame->eventHandler().mouseMoved(event, [[self _webView] _pressureEvent]);
@@ -2305,7 +2305,7 @@
modifierFlags:[[NSApp currentEvent] modifierFlags]
timestamp:[NSDate timeIntervalSinceReferenceDate]
windowNumber:[[self window] windowNumber]
- context:[[NSApp currentEvent] context]
+ context:nullptr
eventNumber:0 clickCount:0 pressure:0];
#pragma clang diagnostic pop
[self mouseDragged:fakeEvent];
@@ -4593,7 +4593,7 @@
modifierFlags:[[NSApp currentEvent] modifierFlags]
timestamp:[NSDate timeIntervalSinceReferenceDate]
windowNumber:[[self window] windowNumber]
- context:[[NSApp currentEvent] context]
+ context:nullptr
eventNumber:0 clickCount:0 pressure:0];
[self mouseUp:fakeEvent]; // This will also update the mouseover state.
}
Modified: trunk/Source/WebKit2/ChangeLog (196069 => 196070)
--- 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)
@@ -1,3 +1,14 @@
+2016-02-03 Jessie Berlin <jber...@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):
+
2016-02-03 Dan Bernstein <m...@apple.com>
[iOS] Engineering builds use manual sandboxing, but don’t need to
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (196069 => 196070)
--- 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)
@@ -1252,7 +1252,7 @@
{
NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSMouseMoved location:flagsChangedEvent.window.mouseLocationOutsideOfEventStream
modifierFlags:flagsChangedEvent.modifierFlags timestamp:flagsChangedEvent.timestamp windowNumber:flagsChangedEvent.windowNumber
- context:flagsChangedEvent.context eventNumber:0 clickCount:0 pressure:0];
+ context:nullptr eventNumber:0 clickCount:0 pressure:0];
NativeWebMouseEvent webEvent(fakeEvent, m_lastPressureEvent.get(), m_view);
m_page->handleMouseEvent(webEvent);
}
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm (196069 => 196070)
--- 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)
@@ -174,7 +174,7 @@
modifierFlags:[initiatingNSEvent modifierFlags]
timestamp:[initiatingNSEvent timestamp]
windowNumber:[initiatingNSEvent windowNumber]
- context:[initiatingNSEvent context]
+ context:nullptr
eventNumber:[initiatingNSEvent eventNumber]
clickCount:[initiatingNSEvent clickCount]
pressure:[initiatingNSEvent pressure]];
@@ -187,7 +187,7 @@
modifierFlags:[initiatingNSEvent modifierFlags]
timestamp:[initiatingNSEvent timestamp]
windowNumber:[initiatingNSEvent windowNumber]
- context:[initiatingNSEvent context]
+ context:nullptr
eventNumber:0
clickCount:0
pressure:0];
