Title: [246513] trunk/Source/WebKit
- Revision
- 246513
- Author
- [email protected]
- Date
- 2019-06-17 13:30:21 -0700 (Mon, 17 Jun 2019)
Log Message
Fix the build.
* UIProcess/Gamepad/ios/UIGamepadProviderIOS.mm:
(WebKit::UIGamepadProvider::platformWebPageProxyForGamepadInput):
* UIProcess/_WKTouchEventGenerator.mm:
(-[_WKTouchEventGenerator _sendHIDEvent:]):
(-[_WKTouchEventGenerator _sendMarkerHIDEventWithCompletionBlock:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (246512 => 246513)
--- trunk/Source/WebKit/ChangeLog 2019-06-17 20:23:46 UTC (rev 246512)
+++ trunk/Source/WebKit/ChangeLog 2019-06-17 20:30:21 UTC (rev 246513)
@@ -1,3 +1,13 @@
+2019-06-17 Tim Horton <[email protected]>
+
+ Fix the build.
+
+ * UIProcess/Gamepad/ios/UIGamepadProviderIOS.mm:
+ (WebKit::UIGamepadProvider::platformWebPageProxyForGamepadInput):
+ * UIProcess/_WKTouchEventGenerator.mm:
+ (-[_WKTouchEventGenerator _sendHIDEvent:]):
+ (-[_WKTouchEventGenerator _sendMarkerHIDEventWithCompletionBlock:]):
+
2019-06-17 Dan Bernstein <[email protected]>
REGRESSION (r242686): Paths in XPC services’ LC_DYLD_ENVIRONMENT are incorrect in built products directory
Modified: trunk/Source/WebKit/UIProcess/Gamepad/ios/UIGamepadProviderIOS.mm (246512 => 246513)
--- trunk/Source/WebKit/UIProcess/Gamepad/ios/UIGamepadProviderIOS.mm 2019-06-17 20:23:46 UTC (rev 246512)
+++ trunk/Source/WebKit/UIProcess/Gamepad/ios/UIGamepadProviderIOS.mm 2019-06-17 20:30:21 UTC (rev 246513)
@@ -35,7 +35,9 @@
WebPageProxy* UIGamepadProvider::platformWebPageProxyForGamepadInput()
{
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
auto firstResponder = [[[UIApplication sharedApplication] keyWindow] firstResponder];
+ALLOW_DEPRECATED_DECLARATIONS_END
if ([firstResponder isKindOfClass:[WKContentView class]])
return ((WKContentView *)firstResponder).page;
Modified: trunk/Source/WebKit/UIProcess/_WKTouchEventGenerator.mm (246512 => 246513)
--- trunk/Source/WebKit/UIProcess/_WKTouchEventGenerator.mm 2019-06-17 20:23:46 UTC (rev 246512)
+++ trunk/Source/WebKit/UIProcess/_WKTouchEventGenerator.mm 2019-06-17 20:30:21 UTC (rev 246513)
@@ -214,7 +214,9 @@
if (eventRef) {
RetainPtr<IOHIDEventRef> strongEvent = eventRef;
dispatch_async(dispatch_get_main_queue(), ^{
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
uint32_t contextID = [UIApplication sharedApplication].keyWindow._contextId;
+ALLOW_DEPRECATED_DECLARATIONS_END
ASSERT(contextID);
BKSHIDEventSetDigitizerInfo(strongEvent.get(), contextID, false, false, NULL, 0, 0);
[[UIApplication sharedApplication] _enqueueHIDEvent:strongEvent.get()];
@@ -239,7 +241,9 @@
if (markerEvent) {
dispatch_async(dispatch_get_main_queue(), [markerEvent = WTFMove(markerEvent)] {
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
auto contextID = [UIApplication sharedApplication].keyWindow._contextId;
+ALLOW_DEPRECATED_DECLARATIONS_END
ASSERT(contextID);
BKSHIDEventSetDigitizerInfo(markerEvent.get(), contextID, false, false, NULL, 0, 0);
[[UIApplication sharedApplication] _enqueueHIDEvent:markerEvent.get()];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
