Diff
Modified: trunk/Source/WebKit/ChangeLog (245678 => 245679)
--- trunk/Source/WebKit/ChangeLog 2019-05-23 07:55:43 UTC (rev 245678)
+++ trunk/Source/WebKit/ChangeLog 2019-05-23 08:39:39 UTC (rev 245679)
@@ -6,6 +6,25 @@
Unreviewed build fix.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::touchWithIdentifierWasRemoved):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::touchWithIdentifierWasRemoved): Deleted.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::touchWithIdentifierWasRemoved):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::touchWithIdentifierWasRemoved): Deleted.
+
+2019-05-23 Antoine Quint <[email protected]>
+
+ [tvOS] Build broken by r245639
+ https://bugs.webkit.org/show_bug.cgi?id=198172
+ <rdar://problem/51048991>
+
+ Unreviewed build fix.
+
* WebProcess/WebPage/WebPage.messages.in:
2019-05-23 Adrian Perez de Castro <[email protected]>
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (245678 => 245679)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-05-23 07:55:43 UTC (rev 245678)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-05-23 08:39:39 UTC (rev 245679)
@@ -2710,6 +2710,11 @@
{
m_process->send(Messages::WebPage::CancelPointer(pointerId, documentPoint), m_pageID);
}
+
+void WebPageProxy::touchWithIdentifierWasRemoved(WebCore::PointerID pointerId)
+{
+ m_process->send(Messages::WebPage::TouchWithIdentifierWasRemoved(pointerId), m_pageID);
+}
#endif
void WebPageProxy::scrollBy(ScrollDirection direction, ScrollGranularity granularity)
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (245678 => 245679)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-05-23 07:55:43 UTC (rev 245678)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-05-23 08:39:39 UTC (rev 245679)
@@ -838,6 +838,7 @@
#if ENABLE(POINTER_EVENTS)
void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&);
+ void touchWithIdentifierWasRemoved(WebCore::PointerID);
#endif
void scrollBy(WebCore::ScrollDirection, WebCore::ScrollGranularity);
@@ -1212,10 +1213,6 @@
#if PLATFORM(IOS_FAMILY)
void willStartUserTriggeredZooming();
-#if ENABLE(POINTER_EVENTS)
- void touchWithIdentifierWasRemoved(WebCore::PointerID);
-#endif
-
void potentialTapAtPosition(const WebCore::FloatPoint&, bool shouldRequestMagnificationInformation, uint64_t& requestID);
void commitPotentialTap(OptionSet<WebKit::WebEvent::Modifier>, uint64_t layerTreeTransactionIdAtLastTouchStart, WebCore::PointerID);
void cancelPotentialTap();
Modified: trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (245678 => 245679)
--- trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2019-05-23 07:55:43 UTC (rev 245678)
+++ trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2019-05-23 08:39:39 UTC (rev 245679)
@@ -836,13 +836,6 @@
process().send(Messages::WebPage::WillStartUserTriggeredZooming(), m_pageID);
}
-#if ENABLE(POINTER_EVENTS)
-void WebPageProxy::touchWithIdentifierWasRemoved(WebCore::PointerID pointerId)
-{
- process().send(Messages::WebPage::TouchWithIdentifierWasRemoved(pointerId), m_pageID);
-}
-#endif
-
void WebPageProxy::potentialTapAtPosition(const WebCore::FloatPoint& position, bool shouldRequestMagnificationInformation, uint64_t& requestID)
{
hideValidationMessage();
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (245678 => 245679)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-05-23 07:55:43 UTC (rev 245678)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-05-23 08:39:39 UTC (rev 245679)
@@ -2953,6 +2953,11 @@
{
m_page->pointerCaptureController().cancelPointer(pointerId, documentPoint);
}
+
+void WebPage::touchWithIdentifierWasRemoved(WebCore::PointerID pointerId)
+{
+ m_page->pointerCaptureController().touchWithIdentifierWasRemoved(pointerId);
+}
#endif
#if ENABLE(MAC_GESTURE_EVENTS)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (245678 => 245679)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2019-05-23 07:55:43 UTC (rev 245678)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2019-05-23 08:39:39 UTC (rev 245679)
@@ -622,10 +622,6 @@
bool allowsUserScaling() const;
bool hasStablePageScaleFactor() const { return m_hasStablePageScaleFactor; }
-#if ENABLE(POINTER_EVENTS)
- void touchWithIdentifierWasRemoved(WebCore::PointerID);
-#endif
-
void handleTap(const WebCore::IntPoint&, OptionSet<WebKit::WebEvent::Modifier>, uint64_t lastLayerTreeTransactionId);
void potentialTapAtPosition(uint64_t requestID, const WebCore::FloatPoint&, bool shouldRequestMagnificationInformation);
void commitPotentialTap(OptionSet<WebKit::WebEvent::Modifier>, uint64_t lastLayerTreeTransactionId, WebCore::PointerID);
@@ -1323,6 +1319,7 @@
#if ENABLE(POINTER_EVENTS)
void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&);
+ void touchWithIdentifierWasRemoved(WebCore::PointerID);
#endif
#if ENABLE(CONTEXT_MENUS)
Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (245678 => 245679)
--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2019-05-23 07:55:43 UTC (rev 245678)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2019-05-23 08:39:39 UTC (rev 245679)
@@ -1036,13 +1036,6 @@
sendTapHighlightForNodeIfNecessary(requestID, mainframe.nodeRespondingToClickEvents(position, adjustedPoint));
}
-#if ENABLE(POINTER_EVENTS)
-void WebPage::touchWithIdentifierWasRemoved(WebCore::PointerID pointerId)
-{
- m_page->pointerCaptureController().touchWithIdentifierWasRemoved(pointerId);
-}
-#endif
-
void WebPage::inspectorNodeSearchMovedToPosition(const FloatPoint& position)
{
IntPoint adjustedPoint = roundedIntPoint(position);
