<!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>[191323] 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/191323">191323</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-10-19 17:17:17 -0700 (Mon, 19 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused support for long presses from WebKit
https://bugs.webkit.org/show_bug.cgi?id=150345
Reviewed by Beth Dakin.
* Shared/WebPreferencesDefinitions.h:
* UIProcess/API/APIUIClient.h:
(API::UIClient::didBeginTrackingPotentialLongMousePress): Deleted.
(API::UIClient::didRecognizeLongMousePress): Deleted.
(API::UIClient::didCancelTrackingPotentialLongMousePress): Deleted.
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageUIClient): Deleted.
* UIProcess/API/C/WKPageUIClient.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesGetLongMousePressEnabled):
(WKPreferencesSetLongMousePressEnabled): Deleted.
* UIProcess/API/C/WKPreferencesRefPrivate.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didBeginTrackingPotentialLongMousePress): Deleted.
(WebKit::WebPageProxy::didRecognizeLongMousePress): Deleted.
(WebKit::WebPageProxy::didCancelTrackingPotentialLongMousePress): Deleted.
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h:
(API::InjectedBundle::PageUIClient::didBeginTrackingPotentialLongMousePress): Deleted.
(API::InjectedBundle::PageUIClient::didRecognizeLongMousePress): Deleted.
(API::InjectedBundle::PageUIClient::didCancelTrackingPotentialLongMousePress): Deleted.
* WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h:
* WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
(WebKit::InjectedBundlePageUIClient::didBeginTrackingPotentialLongMousePress): Deleted.
(WebKit::InjectedBundlePageUIClient::didRecognizeLongMousePress): Deleted.
(WebKit::InjectedBundlePageUIClient::didCancelTrackingPotentialLongMousePress): Deleted.
* WebProcess/InjectedBundle/InjectedBundlePageUIClient.h:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::didBeginTrackingPotentialLongMousePress): Deleted.
(WebKit::WebChromeClient::didRecognizeLongMousePress): Deleted.
(WebKit::WebChromeClient::didCancelTrackingPotentialLongMousePress): Deleted.
* WebProcess/WebCoreSupport/WebChromeClient.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences): Deleted.
* page/Chrome.cpp:
(WebCore::Chrome::didBeginTrackingPotentialLongMousePress): Deleted.
(WebCore::Chrome::didRecognizeLongMousePress): Deleted.
(WebCore::Chrome::didCancelTrackingPotentialLongMousePress): Deleted.
* page/Chrome.h:
* page/ChromeClient.h:
* page/EventHandler.cpp:
(WebCore::EventHandler::EventHandler): Deleted.
(WebCore::EventHandler::clear): Deleted.
(WebCore::EventHandler::handleMousePressEvent): Deleted.
(WebCore::EventHandler::eventMayStartDrag): Deleted.
(WebCore::EventHandler::handleMouseReleaseEvent): Deleted.
(WebCore::EventHandler::beginTrackingPotentialLongMousePress): Deleted.
(WebCore::EventHandler::recognizeLongMousePress): Deleted.
(WebCore::EventHandler::cancelTrackingPotentialLongMousePress): Deleted.
(WebCore::EventHandler::clearLongMousePressState): Deleted.
(WebCore::EventHandler::handleLongMousePressMouseMovedEvent): Deleted.
(WebCore::EventHandler::handleMouseMoveEvent): Deleted.
(WebCore::EventHandler::handleDrag): Deleted.
* page/EventHandler.h:
* page/Settings.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageChromecpp">trunk/Source/WebCore/page/Chrome.cpp</a></li>
<li><a href="#trunkSourceWebCorepageChromeh">trunk/Source/WebCore/page/Chrome.h</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlerh">trunk/Source/WebCore/page/EventHandler.h</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUIClienth">trunk/Source/WebKit2/UIProcess/API/APIUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageUIClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencescpp">trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIAPIInjectedBundlePageUIClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageUIClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageUIClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageUIClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebCore/ChangeLog 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2015-10-19 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Remove unused support for long presses from WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=150345
+
+ Reviewed by Beth Dakin.
+
+ * page/Chrome.cpp:
+ (WebCore::Chrome::didBeginTrackingPotentialLongMousePress): Deleted.
+ (WebCore::Chrome::didRecognizeLongMousePress): Deleted.
+ (WebCore::Chrome::didCancelTrackingPotentialLongMousePress): Deleted.
+ * page/Chrome.h:
+ * page/ChromeClient.h:
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::EventHandler): Deleted.
+ (WebCore::EventHandler::clear): Deleted.
+ (WebCore::EventHandler::handleMousePressEvent): Deleted.
+ (WebCore::EventHandler::eventMayStartDrag): Deleted.
+ (WebCore::EventHandler::handleMouseReleaseEvent): Deleted.
+ (WebCore::EventHandler::beginTrackingPotentialLongMousePress): Deleted.
+ (WebCore::EventHandler::recognizeLongMousePress): Deleted.
+ (WebCore::EventHandler::cancelTrackingPotentialLongMousePress): Deleted.
+ (WebCore::EventHandler::clearLongMousePressState): Deleted.
+ (WebCore::EventHandler::handleLongMousePressMouseMovedEvent): Deleted.
+ (WebCore::EventHandler::handleMouseMoveEvent): Deleted.
+ (WebCore::EventHandler::handleDrag): Deleted.
+ * page/EventHandler.h:
+ * page/Settings.in:
+
+2015-10-19 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> WKView being inside WKWebView leads to weird API issues
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150174
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Chrome.cpp (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Chrome.cpp 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebCore/page/Chrome.cpp 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -599,19 +599,4 @@
</span><span class="cx"> observer->willOpenPopup();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Chrome::didBeginTrackingPotentialLongMousePress(const IntPoint& mouseDownPosition, const HitTestResult& hitTestResult)
-{
- m_client.didBeginTrackingPotentialLongMousePress(mouseDownPosition, hitTestResult);
-}
-
-void Chrome::didRecognizeLongMousePress()
-{
- m_client.didRecognizeLongMousePress();
-}
-
-void Chrome::didCancelTrackingPotentialLongMousePress()
-{
- m_client.didCancelTrackingPotentialLongMousePress();
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Chrome.h (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Chrome.h 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebCore/page/Chrome.h 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -186,10 +186,6 @@
</span><span class="cx"> void registerPopupOpeningObserver(PopupOpeningObserver*);
</span><span class="cx"> void unregisterPopupOpeningObserver(PopupOpeningObserver*);
</span><span class="cx">
</span><del>- void didBeginTrackingPotentialLongMousePress(const IntPoint&, const HitTestResult&);
- void didRecognizeLongMousePress();
- void didCancelTrackingPotentialLongMousePress();
-
</del><span class="cx"> private:
</span><span class="cx"> void notifyPopupOpeningObservers() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebCore/page/ChromeClient.h 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -400,10 +400,6 @@
</span><span class="cx"> virtual bool isPointerLocked() { return false; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual void didBeginTrackingPotentialLongMousePress(const IntPoint& mouseDownPosition, const HitTestResult&) { UNUSED_PARAM(mouseDownPosition); }
- virtual void didRecognizeLongMousePress() { }
- virtual void didCancelTrackingPotentialLongMousePress() { }
-
</del><span class="cx"> virtual FloatSize minimumWindowSize() const { return FloatSize(100, 100); };
</span><span class="cx">
</span><span class="cx"> virtual bool isEmptyChromeClient() const { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -135,9 +135,6 @@
</span><span class="cx"> const int GeneralDragHysteresis = 3;
</span><span class="cx"> #endif // ENABLE(DRAG_SUPPORT)
</span><span class="cx">
</span><del>-const std::chrono::milliseconds longMousePressRecognitionDelay = std::chrono::milliseconds(500);
-const int maximumLongMousePressDragDistance = 5; // in points.
-
</del><span class="cx"> #if ENABLE(IOS_GESTURE_EVENTS) || ENABLE(MAC_GESTURE_EVENTS)
</span><span class="cx"> const float GestureUnknown = 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -381,7 +378,6 @@
</span><span class="cx"> #if ENABLE(CURSOR_SUPPORT)
</span><span class="cx"> , m_cursorUpdateTimer(*this, &EventHandler::cursorUpdateTimerFired)
</span><span class="cx"> #endif
</span><del>- , m_longMousePressTimer(*this, &EventHandler::recognizeLongMousePress)
</del><span class="cx"> , m_autoscrollController(std::make_unique<AutoscrollController>())
</span><span class="cx"> #if !ENABLE(IOS_TOUCH_EVENTS)
</span><span class="cx"> , m_fakeMouseMoveEventTimer(*this, &EventHandler::fakeMouseMoveEventTimerFired)
</span><span class="lines">@@ -422,7 +418,6 @@
</span><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span><span class="cx"> cancelAutoHideCursorTimer();
</span><span class="cx"> #endif
</span><del>- clearLongMousePressState();
</del><span class="cx"> m_resizeLayer = nullptr;
</span><span class="cx"> m_elementUnderMouse = nullptr;
</span><span class="cx"> m_lastElementUnderMouse = nullptr;
</span><span class="lines">@@ -467,7 +462,6 @@
</span><span class="cx"> m_maxMouseMovedDuration = 0;
</span><span class="cx"> m_baseEventType = PlatformEvent::NoType;
</span><span class="cx"> m_didStartDrag = false;
</span><del>- m_didLongPressInvokeContextMenu = false;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventHandler::nodeWillBeRemoved(Node& nodeToBeRemoved)
</span><span class="lines">@@ -786,11 +780,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (event.event().button() == LeftButton && event.isOverLink()) {
- // FIXME 135703: Handle long press for more than just links.
- beginTrackingPotentialLongMousePress(event.hitTestResult());
- }
-
</del><span class="cx"> // We don't do this at the start of mouse down handling,
</span><span class="cx"> // because we don't want to do it until we know we didn't hit a widget.
</span><span class="cx"> if (singleClick)
</span><span class="lines">@@ -875,9 +864,6 @@
</span><span class="cx"> if (event.button() != LeftButton || event.clickCount() != 1)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (m_didRecognizeLongMousePress)
- return false;
-
</del><span class="cx"> FrameView* view = m_frame.view();
</span><span class="cx"> if (!view)
</span><span class="cx"> return false;
</span><span class="lines">@@ -1033,11 +1019,6 @@
</span><span class="cx"> m_mouseDownWasInSubframe = false;
</span><span class="cx">
</span><span class="cx"> bool handled = false;
</span><del>-
- if (event.event().button() == LeftButton) {
- // FIXME 135767: Implement long mouse press for arbitrary mouse buttons.
- clearLongMousePressState();
- }
</del><span class="cx">
</span><span class="cx"> // Clear the selection if the mouse didn't move after the last mouse
</span><span class="cx"> // press and it's not a context menu click. We do this so when clicking
</span><span class="lines">@@ -1578,69 +1559,7 @@
</span><span class="cx"> view->setCursor(m_currentMouseCursor);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>-
-void EventHandler::beginTrackingPotentialLongMousePress(const HitTestResult& hitTestResult)
-{
- clearLongMousePressState();
</del><span class="cx">
</span><del>- Page* page = m_frame.page();
- if (!(page && page->settings().longMousePressEnabled()))
- return;
-
- m_longMousePressTimer.startOneShot(longMousePressRecognitionDelay);
-
- page->chrome().didBeginTrackingPotentialLongMousePress(m_mouseDownPos, hitTestResult);
-}
-
-void EventHandler::recognizeLongMousePress()
-{
- Page* page = m_frame.page();
- if (!page)
- return;
-
- m_didRecognizeLongMousePress = true;
-
- // Clear mouse state to avoid initiating a drag.
- m_mousePressed = false;
- invalidateClick();
-
- page->chrome().didRecognizeLongMousePress();
-}
-
-void EventHandler::cancelTrackingPotentialLongMousePress()
-{
- if (!m_longMousePressTimer.isActive())
- return;
-
- clearLongMousePressState();
-
- Page* page = m_frame.page();
- if (!page)
- return;
-
- page->chrome().didCancelTrackingPotentialLongMousePress();
-}
-
-void EventHandler::clearLongMousePressState()
-{
- m_longMousePressTimer.stop();
- m_didRecognizeLongMousePress = false;
-}
-
-bool EventHandler::handleLongMousePressMouseMovedEvent(const PlatformMouseEvent& mouseEvent)
-{
- if (mouseEvent.button() != LeftButton || mouseEvent.type() != PlatformEvent::MouseMoved)
- return false;
-
- if (m_didRecognizeLongMousePress)
- return true;
-
- if (!mouseMovementExceedsThreshold(mouseEvent.position(), maximumLongMousePressDragDistance))
- cancelTrackingPotentialLongMousePress();
-
- return false;
-}
-
</del><span class="cx"> static LayoutPoint documentPointForWindowPoint(Frame& frame, const IntPoint& windowPoint)
</span><span class="cx"> {
</span><span class="cx"> FrameView* view = frame.view();
</span><span class="lines">@@ -1894,9 +1813,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (handleLongMousePressMouseMovedEvent(platformMouseEvent))
- return true;
-
</del><span class="cx"> RefPtr<FrameView> protector(m_frame.view());
</span><span class="cx">
</span><span class="cx"> setLastKnownMousePosition(platformMouseEvent);
</span><span class="lines">@@ -3529,8 +3445,6 @@
</span><span class="cx"> // On OS X this causes problems with the ownership of the pasteboard and the promised types.
</span><span class="cx"> if (m_didStartDrag) {
</span><span class="cx"> m_mouseDownMayStartDrag = false;
</span><del>-
- cancelTrackingPotentialLongMousePress();
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> if (dragState().source && dragState().shouldDispatchEvents) {
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.h (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.h 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebCore/page/EventHandler.h 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -459,13 +459,6 @@
</span><span class="cx"> void autoHideCursorTimerFired();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void beginTrackingPotentialLongMousePress(const HitTestResult&);
- void recognizeLongMousePress();
- void cancelTrackingPotentialLongMousePress();
- bool longMousePressHysteresisExceeded();
- void clearLongMousePressState();
- bool handleLongMousePressMouseMovedEvent(const PlatformMouseEvent&);
-
</del><span class="cx"> void clearLatchedState();
</span><span class="cx">
</span><span class="cx"> Frame& m_frame;
</span><span class="lines">@@ -494,9 +487,6 @@
</span><span class="cx"> Timer m_cursorUpdateTimer;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- Timer m_longMousePressTimer;
- bool m_didRecognizeLongMousePress { false };
-
</del><span class="cx"> std::unique_ptr<AutoscrollController> m_autoscrollController;
</span><span class="cx"> bool m_mouseDownMayStartAutoscroll { false };
</span><span class="cx"> bool m_mouseDownWasInSubframe { false };
</span><span class="lines">@@ -575,7 +565,6 @@
</span><span class="cx"> double m_maxMouseMovedDuration { 0 };
</span><span class="cx"> PlatformEvent::Type m_baseEventType { PlatformEvent::NoType };
</span><span class="cx"> bool m_didStartDrag { false };
</span><del>- bool m_didLongPressInvokeContextMenu { false };
</del><span class="cx"> bool m_isHandlingWheelEvent { false };
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebCore/page/Settings.in 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -232,8 +232,6 @@
</span><span class="cx"> # of 1080p video and stereo audio.
</span><span class="cx"> maximumSourceBufferSize type=int, initial=318767104, conditional=MEDIA_SOURCE
</span><span class="cx">
</span><del>-longMousePressEnabled initial=false
-
</del><span class="cx"> serviceControlsEnabled initial=false, conditional=SERVICE_CONTROLS
</span><span class="cx">
</span><span class="cx"> ignoreViewportScalingConstraints initial=false
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2015-10-19 Tim Horton <timothy_horton@apple.com>
+
+ Remove unused support for long presses from WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=150345
+
+ Reviewed by Beth Dakin.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/APIUIClient.h:
+ (API::UIClient::didBeginTrackingPotentialLongMousePress): Deleted.
+ (API::UIClient::didRecognizeLongMousePress): Deleted.
+ (API::UIClient::didCancelTrackingPotentialLongMousePress): Deleted.
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageUIClient): Deleted.
+ * UIProcess/API/C/WKPageUIClient.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesGetLongMousePressEnabled):
+ (WKPreferencesSetLongMousePressEnabled): Deleted.
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didBeginTrackingPotentialLongMousePress): Deleted.
+ (WebKit::WebPageProxy::didRecognizeLongMousePress): Deleted.
+ (WebKit::WebPageProxy::didCancelTrackingPotentialLongMousePress): Deleted.
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h:
+ (API::InjectedBundle::PageUIClient::didBeginTrackingPotentialLongMousePress): Deleted.
+ (API::InjectedBundle::PageUIClient::didRecognizeLongMousePress): Deleted.
+ (API::InjectedBundle::PageUIClient::didCancelTrackingPotentialLongMousePress): Deleted.
+ * WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
+ (WebKit::InjectedBundlePageUIClient::didBeginTrackingPotentialLongMousePress): Deleted.
+ (WebKit::InjectedBundlePageUIClient::didRecognizeLongMousePress): Deleted.
+ (WebKit::InjectedBundlePageUIClient::didCancelTrackingPotentialLongMousePress): Deleted.
+ * WebProcess/InjectedBundle/InjectedBundlePageUIClient.h:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::didBeginTrackingPotentialLongMousePress): Deleted.
+ (WebKit::WebChromeClient::didRecognizeLongMousePress): Deleted.
+ (WebKit::WebChromeClient::didCancelTrackingPotentialLongMousePress): Deleted.
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Deleted.
+
</ins><span class="cx"> 2015-10-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Make sure development Safari does not delete the stable Safari cache storage.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -204,7 +204,6 @@
</span><span class="cx"> macro(EnableInheritURIQueryComponent, enableInheritURIQueryComponent, Bool, bool, false) \
</span><span class="cx"> macro(ServiceControlsEnabled, serviceControlsEnabled, Bool, bool, false) \
</span><span class="cx"> macro(GamepadsEnabled, gamepadsEnabled, Bool, bool, false) \
</span><del>- macro(LongMousePressEnabled, longMousePressEnabled, Bool, bool, false) \
</del><span class="cx"> macro(NewBlockInsideInlineModelEnabled, newBlockInsideInlineModelEnabled, Bool, bool, false) \
</span><span class="cx"> macro(AntialiasedFontDilationEnabled, antialiasedFontDilationEnabled, Bool, bool, false) \
</span><span class="cx"> macro(HTTPEquivEnabled, httpEquivEnabled, Bool, bool, true) \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUIClient.h (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -147,10 +147,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void pinnedStateDidChange(WebKit::WebPageProxy&) { }
</span><span class="cx">
</span><del>- virtual void didBeginTrackingPotentialLongMousePress(WebKit::WebPageProxy*, const WebCore::IntPoint&, const WebKit::WebHitTestResultData&, API::Object*) { }
- virtual void didRecognizeLongMousePress(WebKit::WebPageProxy*, API::Object*) { }
- virtual void didCancelTrackingPotentialLongMousePress(WebKit::WebPageProxy*, API::Object*) { }
-
</del><span class="cx"> virtual void isPlayingAudioDidChange(WebKit::WebPageProxy&) { }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -1922,31 +1922,6 @@
</span><span class="cx"> m_client.pinnedStateDidChange(toAPI(&page), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void didBeginTrackingPotentialLongMousePress(WebPageProxy* page, const IntPoint& mouseDownPosition, const WebHitTestResultData& data, API::Object* userInfo) override
- {
- if (!m_client.didBeginTrackingPotentialLongMousePress)
- return;
-
- RefPtr<API::HitTestResult> webHitTestResult = API::HitTestResult::create(data);
- m_client.didBeginTrackingPotentialLongMousePress(toAPI(page), toAPI(mouseDownPosition), toAPI(webHitTestResult.get()), toAPI(userInfo), m_client.base.clientInfo);
- }
-
- virtual void didRecognizeLongMousePress(WebPageProxy* page, API::Object* userInfo) override
- {
- if (!m_client.didRecognizeLongMousePress)
- return;
-
- m_client.didRecognizeLongMousePress(toAPI(page), toAPI(userInfo), m_client.base.clientInfo);
- }
-
- virtual void didCancelTrackingPotentialLongMousePress(WebPageProxy* page, API::Object* userInfo) override
- {
- if (!m_client.didCancelTrackingPotentialLongMousePress)
- return;
-
- m_client.didCancelTrackingPotentialLongMousePress(toAPI(page), toAPI(userInfo), m_client.base.clientInfo);
- }
-
</del><span class="cx"> virtual void isPlayingAudioDidChange(WebPageProxy& page) override
</span><span class="cx"> {
</span><span class="cx"> if (!m_client.isPlayingAudioDidChange)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -85,9 +85,6 @@
</span><span class="cx"> typedef void (*WKPageHideColorPickerCallback)(WKPageRef page, const void* clientInfo);
</span><span class="cx"> typedef void (*WKPageUnavailablePluginButtonClickedCallback)(WKPageRef page, WKPluginUnavailabilityReason pluginUnavailabilityReason, WKDictionaryRef pluginInfoDictionary, const void* clientInfo);
</span><span class="cx"> typedef void (*WKPagePinnedStateDidChangeCallback)(WKPageRef page, const void* clientInfo);
</span><del>-typedef void (*WKPageDidBeginTrackingPotentialLongMousePressCallback)(WKPageRef page, WKPoint mouseDownPosition, WKHitTestResultRef hitTestResult, WKTypeRef userData, const void *clientInfo);
-typedef void (*WKPageDidRecognizeLongMousePressCallback)(WKPageRef page, WKTypeRef userData, const void *clientInfo);
-typedef void (*WKPageDidCancelTrackingPotentialLongMousePressCallback)(WKPageRef page, WKTypeRef userData, const void *clientInfo);
</del><span class="cx"> typedef void (*WKPageIsPlayingAudioDidChangeCallback)(WKPageRef page, const void* clientInfo);
</span><span class="cx"> typedef void (*WKPageDecidePolicyForUserMediaPermissionRequestCallback)(WKPageRef page, WKFrameRef frame, WKSecurityOriginRef origin, WKUserMediaPermissionRequestRef permissionRequest, const void* clientInfo);
</span><span class="cx"> typedef void (*WKPageDidClickAutoFillButtonCallback)(WKPageRef page, WKTypeRef userData, const void *clientInfo);
</span><span class="lines">@@ -359,7 +356,7 @@
</span><span class="cx"> WKPageDrawFooterCallback drawFooter;
</span><span class="cx"> WKPagePrintFrameCallback printFrame;
</span><span class="cx"> WKPageUIClientCallback runModal;
</span><del>- void* unused1; // Used to be didCompleteRubberBandForMainFrame
</del><ins>+ void* unused1; // Used to be didCompleteRubberBandForMainFrame.
</ins><span class="cx"> WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
</span><span class="cx"> void* shouldInterruptJavaScript_unavailable;
</span><span class="cx">
</span><span class="lines">@@ -378,9 +375,9 @@
</span><span class="cx"> WKPagePinnedStateDidChangeCallback pinnedStateDidChange;
</span><span class="cx">
</span><span class="cx"> // Version 4.
</span><del>- WKPageDidBeginTrackingPotentialLongMousePressCallback didBeginTrackingPotentialLongMousePress;
- WKPageDidRecognizeLongMousePressCallback didRecognizeLongMousePress;
- WKPageDidCancelTrackingPotentialLongMousePressCallback didCancelTrackingPotentialLongMousePress;
</del><ins>+ void* unused2; // Used to be didBeginTrackingPotentialLongMousePress.
+ void* unused3; // Used to be didRecognizeLongMousePress.
+ void* unused4; // Used to be didCancelTrackingPotentialLongMousePress.
</ins><span class="cx"> WKPageIsPlayingAudioDidChangeCallback isPlayingAudioDidChange;
</span><span class="cx"> } WKPageUIClientV4;
</span><span class="cx">
</span><span class="lines">@@ -443,9 +440,9 @@
</span><span class="cx"> WKPagePinnedStateDidChangeCallback pinnedStateDidChange;
</span><span class="cx">
</span><span class="cx"> // Version 4.
</span><del>- WKPageDidBeginTrackingPotentialLongMousePressCallback didBeginTrackingPotentialLongMousePress;
- WKPageDidRecognizeLongMousePressCallback didRecognizeLongMousePress;
- WKPageDidCancelTrackingPotentialLongMousePressCallback didCancelTrackingPotentialLongMousePress;
</del><ins>+ void* unused2; // Used to be didBeginTrackingPotentialLongMousePress.
+ void* unused3; // Used to be didRecognizeLongMousePress.
+ void* unused4; // Used to be didCancelTrackingPotentialLongMousePress.
</ins><span class="cx"> WKPageIsPlayingAudioDidChangeCallback isPlayingAudioDidChange;
</span><span class="cx">
</span><span class="cx"> // Version 5.
</span><span class="lines">@@ -516,9 +513,9 @@
</span><span class="cx"> WKPagePinnedStateDidChangeCallback pinnedStateDidChange;
</span><span class="cx">
</span><span class="cx"> // Version 4.
</span><del>- WKPageDidBeginTrackingPotentialLongMousePressCallback didBeginTrackingPotentialLongMousePress;
- WKPageDidRecognizeLongMousePressCallback didRecognizeLongMousePress;
- WKPageDidCancelTrackingPotentialLongMousePressCallback didCancelTrackingPotentialLongMousePress;
</del><ins>+ void* unused2; // Used to be didBeginTrackingPotentialLongMousePress.
+ void* unused3; // Used to be didRecognizeLongMousePress.
+ void* unused4; // Used to be didCancelTrackingPotentialLongMousePress.
</ins><span class="cx"> WKPageIsPlayingAudioDidChangeCallback isPlayingAudioDidChange;
</span><span class="cx">
</span><span class="cx"> // Version 5.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -1327,14 +1327,14 @@
</span><span class="cx"> return toImpl(preferencesRef)->gamepadsEnabled();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: Remove these when possible.
</ins><span class="cx"> void WKPreferencesSetLongMousePressEnabled(WKPreferencesRef preferencesRef, bool enabled)
</span><span class="cx"> {
</span><del>- toImpl(preferencesRef)->setLongMousePressEnabled(enabled);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WKPreferencesGetLongMousePressEnabled(WKPreferencesRef preferencesRef)
</span><span class="cx"> {
</span><del>- return toImpl(preferencesRef)->longMousePressEnabled();
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPreferencesSetMinimumZoomFontSize(WKPreferencesRef preferencesRef, double size)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx"> WK_EXPORT void WKPreferencesSetGamepadsEnabled(WKPreferencesRef preferencesRef, bool enabled);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetGamepadsEnabled(WKPreferencesRef preferencesRef);
</span><span class="cx">
</span><del>-// Defaults to false.
</del><ins>+// Not implemented, should be deleted once there are no callers.
</ins><span class="cx"> WK_EXPORT void WKPreferencesSetLongMousePressEnabled(WKPreferencesRef preferencesRef, bool enabled);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetLongMousePressEnabled(WKPreferencesRef preferencesRef);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -3579,21 +3579,6 @@
</span><span class="cx"> m_uiClient->mouseDidMoveOverElement(this, hitTestResultData, modifiers, m_process->transformHandlesToObjects(userData.object()).get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::didBeginTrackingPotentialLongMousePress(const IntPoint& mouseDownPosition, const WebHitTestResultData& hitTestResultData, const UserData& userData)
-{
- m_uiClient->didBeginTrackingPotentialLongMousePress(this, mouseDownPosition, hitTestResultData, m_process->transformHandlesToObjects(userData.object()).get());
-}
-
-void WebPageProxy::didRecognizeLongMousePress(const UserData& userData)
-{
- m_uiClient->didRecognizeLongMousePress(this, m_process->transformHandlesToObjects(userData.object()).get());
-}
-
-void WebPageProxy::didCancelTrackingPotentialLongMousePress(const UserData& userData)
-{
- m_uiClient->didCancelTrackingPotentialLongMousePress(this, m_process->transformHandlesToObjects(userData.object()).get());
-}
-
</del><span class="cx"> void WebPageProxy::connectionWillOpen(IPC::Connection& connection)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(&connection == m_process->connection());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -1158,10 +1158,6 @@
</span><span class="cx"> void setStatusText(const String&);
</span><span class="cx"> void mouseDidMoveOverElement(const WebHitTestResultData&, uint32_t modifiers, const UserData&);
</span><span class="cx">
</span><del>- void didBeginTrackingPotentialLongMousePress(const WebCore::IntPoint& mouseDownPosition, const WebHitTestResultData&, const UserData&);
- void didRecognizeLongMousePress(const UserData&);
- void didCancelTrackingPotentialLongMousePress(const UserData&);
-
</del><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> void unavailablePluginButtonClicked(uint32_t opaquePluginUnavailabilityReason, const String& mimeType, const String& pluginURLString, const String& pluginsPageURLString, const String& frameURLString, const String& pageURLString);
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -30,10 +30,6 @@
</span><span class="cx"> RunJavaScriptPrompt(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, String message, String defaultValue) -> (String result) Delayed
</span><span class="cx"> MouseDidMoveOverElement(struct WebKit::WebHitTestResultData hitTestResultData, uint32_t modifiers, WebKit::UserData userData)
</span><span class="cx">
</span><del>- DidBeginTrackingPotentialLongMousePress(WebCore::IntPoint mouseDownPosition, struct WebKit::WebHitTestResultData hitTestResultData, WebKit::UserData userData)
- DidRecognizeLongMousePress(WebKit::UserData userData)
- DidCancelTrackingPotentialLongMousePress(WebKit::UserData userData)
-
</del><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> UnavailablePluginButtonClicked(uint32_t pluginUnavailabilityReason, String mimeType, String pluginURLString, String pluginspageAttributeURLString, String frameURLString, String pageURLString)
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIAPIInjectedBundlePageUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -87,10 +87,6 @@
</span><span class="cx"> virtual WTF::String plugInExtraStyleSheet() const { return emptyString(); }
</span><span class="cx"> virtual WTF::String plugInExtraScript() const { return emptyString(); }
</span><span class="cx">
</span><del>- virtual void didBeginTrackingPotentialLongMousePress(WebKit::WebPage*, const WebCore::IntPoint&, const WebCore::HitTestResult&, RefPtr<API::Object>& userData) { UNUSED_PARAM(userData); }
- virtual void didRecognizeLongMousePress(WebKit::WebPage*, RefPtr<API::Object>& userData) { UNUSED_PARAM(userData); }
- virtual void didCancelTrackingPotentialLongMousePress(WebKit::WebPage*, RefPtr<API::Object>& userData) { UNUSED_PARAM(userData); }
-
</del><span class="cx"> virtual void didClickAutoFillButton(WebKit::WebPage&, WebKit::InjectedBundleNodeHandle&, RefPtr<API::Object>&) { }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -54,9 +54,6 @@
</span><span class="cx"> typedef WKStringRef (*WKBundlePagePlugInCreateStartLabelSubtitleCallback)(WKStringRef mimeType, const void *clientInfo);
</span><span class="cx"> typedef WKStringRef (*WKBundlePagePlugInCreateExtraStyleSheetCallback)(const void *clientInfo);
</span><span class="cx"> typedef WKStringRef (*WKBundlePagePlugInCreateExtraScriptCallback)(const void *clientInfo);
</span><del>-typedef void (*WKBundlePageDidBeginTrackingPotentialLongMousePressCallback)(WKBundlePageRef page, WKPoint mouseDownPosition, WKBundleHitTestResultRef hitTestResult, WKTypeRef* userData, const void *clientInfo);
-typedef void (*WKBundlePageDidRecognizeLongMousePressCallback)(WKBundlePageRef page, WKTypeRef* userData, const void *clientInfo);
-typedef void (*WKBundlePageDidCancelTrackingPotentialLongMousePressCallback)(WKBundlePageRef page, WKTypeRef* userData, const void *clientInfo);
</del><span class="cx"> typedef void (*WKBundlePageDidClickAutoFillButtonCallback)(WKBundlePageRef page, WKBundleNodeHandleRef inputElement, WKTypeRef* userData, const void *clientInfo);
</span><span class="cx">
</span><span class="cx"> typedef struct WKBundlePageUIClientBase {
</span><span class="lines">@@ -167,9 +164,9 @@
</span><span class="cx"> WKBundlePagePlugInCreateExtraScriptCallback createPlugInExtraScript;
</span><span class="cx">
</span><span class="cx"> // Version 3.
</span><del>- WKBundlePageDidBeginTrackingPotentialLongMousePressCallback didBeginTrackingPotentialLongMousePress;
- WKBundlePageDidRecognizeLongMousePressCallback didRecognizeLongMousePress;
- WKBundlePageDidCancelTrackingPotentialLongMousePressCallback didCancelTrackingPotentialLongMousePress;
</del><ins>+ void* unused3;
+ void* unused4;
+ void* unused5;
</ins><span class="cx">
</span><span class="cx"> WKBundlePageDidClickAutoFillButtonCallback didClickAutoFillButton;
</span><span class="cx"> } WKBundlePageUIClientV3;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageUIClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -202,38 +202,6 @@
</span><span class="cx"> return script ? script->string() : String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedBundlePageUIClient::didBeginTrackingPotentialLongMousePress(WebPage* page, const IntPoint& mouseDownPosition, const HitTestResult& coreHitTestResult, RefPtr<API::Object>& userData)
-{
- if (!m_client.didBeginTrackingPotentialLongMousePress)
- return;
-
- RefPtr<InjectedBundleHitTestResult> hitTestResult = InjectedBundleHitTestResult::create(coreHitTestResult);
-
- WKTypeRef userDataToPass = nullptr;
- m_client.didBeginTrackingPotentialLongMousePress(toAPI(page), toAPI(mouseDownPosition), toAPI(hitTestResult.get()), &userDataToPass, m_client.base.clientInfo);
- userData = adoptRef(toImpl(userDataToPass));
-}
-
-void InjectedBundlePageUIClient::didRecognizeLongMousePress(WebPage* page, RefPtr<API::Object>& userData)
-{
- if (!m_client.didRecognizeLongMousePress)
- return;
-
- WKTypeRef userDataToPass = nullptr;
- m_client.didRecognizeLongMousePress(toAPI(page), &userDataToPass, m_client.base.clientInfo);
- userData = adoptRef(toImpl(userDataToPass));
-}
-
-void InjectedBundlePageUIClient::didCancelTrackingPotentialLongMousePress(WebPage* page, RefPtr<API::Object>& userData)
-{
- if (!m_client.didCancelTrackingPotentialLongMousePress)
- return;
-
- WKTypeRef userDataToPass = nullptr;
- m_client.didCancelTrackingPotentialLongMousePress(toAPI(page), &userDataToPass, m_client.base.clientInfo);
- userData = adoptRef(toImpl(userDataToPass));
-}
-
</del><span class="cx"> void InjectedBundlePageUIClient::didClickAutoFillButton(WebPage& page, InjectedBundleNodeHandle& nodeHandle, RefPtr<API::Object>& userData)
</span><span class="cx"> {
</span><span class="cx"> if (!m_client.didClickAutoFillButton)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -70,10 +70,6 @@
</span><span class="cx"> String plugInExtraStyleSheet() const override;
</span><span class="cx"> String plugInExtraScript() const override;
</span><span class="cx">
</span><del>- void didBeginTrackingPotentialLongMousePress(WebPage*, const WebCore::IntPoint&, const WebCore::HitTestResult&, RefPtr<API::Object>& userData) override;
- void didRecognizeLongMousePress(WebPage*, RefPtr<API::Object>& userData) override;
- void didCancelTrackingPotentialLongMousePress(WebPage*, RefPtr<API::Object>& userData) override;
-
</del><span class="cx"> void didClickAutoFillButton(WebPage&, InjectedBundleNodeHandle&, RefPtr<API::Object>& userData) override;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -607,40 +607,6 @@
</span><span class="cx"> m_page->send(Messages::WebPageProxy::MouseDidMoveOverElement(webHitTestResultData, modifierFlags, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClient::didBeginTrackingPotentialLongMousePress(const IntPoint& mouseDownPosition, const HitTestResult& hitTestResult)
-{
- RefPtr<API::Object> userData;
-
- // Notify the bundle client.
- m_page->injectedBundleUIClient().didBeginTrackingPotentialLongMousePress(m_page, mouseDownPosition, hitTestResult, userData);
-
- // Notify the UIProcess.
- WebHitTestResultData webHitTestResultData(hitTestResult);
- m_page->send(Messages::WebPageProxy::DidBeginTrackingPotentialLongMousePress(mouseDownPosition, webHitTestResultData, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
-}
-
-void WebChromeClient::didRecognizeLongMousePress()
-{
- RefPtr<API::Object> userData;
-
- // Notify the bundle client.
- m_page->injectedBundleUIClient().didRecognizeLongMousePress(m_page, userData);
-
- // Notify the UIProcess.
- m_page->send(Messages::WebPageProxy::DidRecognizeLongMousePress(UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
-}
-
-void WebChromeClient::didCancelTrackingPotentialLongMousePress()
-{
- RefPtr<API::Object> userData;
-
- // Notify the bundle client.
- m_page->injectedBundleUIClient().didCancelTrackingPotentialLongMousePress(m_page, userData);
-
- // Notify the UIProcess.
- m_page->send(Messages::WebPageProxy::DidCancelTrackingPotentialLongMousePress(UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
-}
-
</del><span class="cx"> void WebChromeClient::setToolTip(const String& toolTip, TextDirection)
</span><span class="cx"> {
</span><span class="cx"> // Only send a tool tip to the WebProcess if it has changed since the last time this function was called.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -128,10 +128,6 @@
</span><span class="cx"> virtual void scrollbarsModeDidChange() const override;
</span><span class="cx"> virtual void mouseDidMoveOverElement(const WebCore::HitTestResult&, unsigned modifierFlags) override;
</span><span class="cx">
</span><del>- virtual void didBeginTrackingPotentialLongMousePress(const WebCore::IntPoint& mouseDownPosition, const WebCore::HitTestResult&) override;
- virtual void didRecognizeLongMousePress() override;
- virtual void didCancelTrackingPotentialLongMousePress() override;
-
</del><span class="cx"> virtual void setToolTip(const String&, WebCore::TextDirection) override;
</span><span class="cx">
</span><span class="cx"> virtual void print(WebCore::Frame*) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (191322 => 191323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-10-20 00:05:27 UTC (rev 191322)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-10-20 00:17:17 UTC (rev 191323)
</span><span class="lines">@@ -2907,8 +2907,6 @@
</span><span class="cx"> settings.setUseImageDocumentForSubframePDF(true);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- settings.setLongMousePressEnabled(store.getBoolValueForKey(WebPreferencesKey::longMousePressEnabledKey()));
-
</del><span class="cx"> #if ENABLE(GAMEPAD)
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setGamepadsEnabled(store.getBoolValueForKey(WebPreferencesKey::gamepadsEnabledKey()));
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>