Diff
Modified: trunk/Source/WebCore/ChangeLog (210325 => 210326)
--- trunk/Source/WebCore/ChangeLog 2017-01-05 13:14:05 UTC (rev 210325)
+++ trunk/Source/WebCore/ChangeLog 2017-01-05 13:47:59 UTC (rev 210326)
@@ -1,3 +1,23 @@
+2017-01-05 Andreas Kling <[email protected]>
+
+ Remove ChromeClient::needTouchEvents().
+ <https://webkit.org/b/166723>
+
+ Rubber-stamped by Antti Koivisto.
+
+ Remove this hook since it's a no-op in every port.
+
+ * dom/Document.cpp:
+ (WebCore::Document::didBecomeCurrentDocumentInFrame):
+ (WebCore::Document::didAddTouchEventHandler):
+ (WebCore::Document::didRemoveTouchEventHandler):
+ * history/CachedFrame.cpp:
+ (WebCore::CachedFrameBase::restore):
+ * loader/EmptyClients.h:
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::transitionToCommitted):
+ * page/ChromeClient.h:
+
2017-01-05 Darin Adler <[email protected]>
Remove PassRefPtr use from "bindings/scripts", "svg", "testing", and "workers"
Modified: trunk/Source/WebCore/dom/Document.cpp (210325 => 210326)
--- trunk/Source/WebCore/dom/Document.cpp 2017-01-05 13:14:05 UTC (rev 210325)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-01-05 13:47:59 UTC (rev 210326)
@@ -2168,13 +2168,6 @@
if (page() && m_frame->isMainFrame())
wheelEventHandlersChanged();
-#if ENABLE(TOUCH_EVENTS)
- // FIXME: Doing this only for the main frame is insufficient.
- // A subframe could have touch event handlers.
- if (hasTouchEventHandlers() && page() && m_frame->isMainFrame())
- page()->chrome().client().needTouchEvents(true);
-#endif
-
// Ensure that the scheduled task state of the document matches the DOM suspension state of the frame. It can
// be out of sync if the DOM suspension state changed while the document was not in the frame (possibly in the
// page cache, or simply newly created).
@@ -6238,11 +6231,6 @@
parent->didAddTouchEventHandler(*this);
return;
}
-
- if (Page* page = this->page()) {
- if (m_touchEventTargets->size() == 1)
- page->chrome().client().needTouchEvents(true);
- }
#else
UNUSED_PARAM(handler);
#endif
@@ -6256,23 +6244,8 @@
removeHandlerFromSet(*m_touchEventTargets, handler, removal);
- if (Document* parent = parentDocument()) {
+ if (Document* parent = parentDocument())
parent->didRemoveTouchEventHandler(*this);
- return;
- }
-
- Page* page = this->page();
- if (!page)
- return;
- if (m_touchEventTargets->size())
- return;
-
- // FIXME: why can't we trust m_touchEventTargets?
- for (const Frame* frame = &page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
- if (frame->document() && frame->document()->hasTouchEventHandlers())
- return;
- }
- page->chrome().client().needTouchEvents(false);
#else
UNUSED_PARAM(handler);
UNUSED_PARAM(removal);
Modified: trunk/Source/WebCore/history/CachedFrame.cpp (210325 => 210326)
--- trunk/Source/WebCore/history/CachedFrame.cpp 2017-01-05 13:14:05 UTC (rev 210325)
+++ trunk/Source/WebCore/history/CachedFrame.cpp 2017-01-05 13:47:59 UTC (rev 210326)
@@ -48,11 +48,6 @@
#include <wtf/RefCountedLeakCounter.h>
#include <wtf/text/CString.h>
-#if PLATFORM(IOS) || ENABLE(TOUCH_EVENTS)
-#include "Chrome.h"
-#include "ChromeClient.h"
-#endif
-
namespace WebCore {
DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, cachedFrameCounter, ("CachedFrame"));
@@ -125,11 +120,6 @@
if (historyItem && historyItem->stateObject())
m_document->enqueuePopstateEvent(historyItem->stateObject());
-#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS)
- if (m_document->hasTouchEventHandlers())
- m_document->page()->chrome().client().needTouchEvents(true);
-#endif
-
frame.view()->didRestoreFromPageCache();
}
Modified: trunk/Source/WebCore/loader/EmptyClients.h (210325 => 210326)
--- trunk/Source/WebCore/loader/EmptyClients.h 2017-01-05 13:14:05 UTC (rev 210325)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2017-01-05 13:47:59 UTC (rev 210326)
@@ -226,10 +226,6 @@
bool isStopping() override { return false; }
#endif
-#if ENABLE(TOUCH_EVENTS)
- void needTouchEvents(bool) override { }
-#endif
-
void wheelEventHandlersChanged(bool) override { }
bool isEmptyChromeClient() const override { return true; }
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (210325 => 210326)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2017-01-05 13:14:05 UTC (rev 210325)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2017-01-05 13:47:59 UTC (rev 210326)
@@ -1915,11 +1915,6 @@
setState(FrameStateCommittedPage);
-#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS)
- if (m_frame.isMainFrame())
- m_frame.page()->chrome().client().needTouchEvents(false);
-#endif
-
// Handle adding the URL to the back/forward list.
DocumentLoader* dl = m_documentLoader.get();
Modified: trunk/Source/WebCore/page/ChromeClient.h (210325 => 210326)
--- trunk/Source/WebCore/page/ChromeClient.h 2017-01-05 13:14:05 UTC (rev 210325)
+++ trunk/Source/WebCore/page/ChromeClient.h 2017-01-05 13:47:59 UTC (rev 210326)
@@ -373,10 +373,6 @@
virtual void AXFinishFrameLoad() = 0;
#endif
-#if ENABLE(TOUCH_EVENTS)
- virtual void needTouchEvents(bool) = 0;
-#endif
-
virtual bool selectItemWritingDirectionIsNatural() = 0;
virtual bool selectItemAlignmentFollowsMenuWritingDirection() = 0;
// Checks if there is an opened popup, called by RenderMenuList::showPopup().
Modified: trunk/Source/WebKit/mac/ChangeLog (210325 => 210326)
--- trunk/Source/WebKit/mac/ChangeLog 2017-01-05 13:14:05 UTC (rev 210325)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-01-05 13:47:59 UTC (rev 210326)
@@ -1,3 +1,12 @@
+2017-01-05 Andreas Kling <[email protected]>
+
+ Remove ChromeClient::needTouchEvents().
+ <https://webkit.org/b/166723>
+
+ Rubber-stamped by Antti Koivisto.
+
+ * WebCoreSupport/WebChromeClient.h:
+
2017-01-04 Darin Adler <[email protected]>
Remove PassRefPtr use from the "html" directory, other improvements
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (210325 => 210326)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2017-01-05 13:14:05 UTC (rev 210325)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2017-01-05 13:47:59 UTC (rev 210326)
@@ -143,10 +143,6 @@
void enableSuddenTermination() override;
void disableSuddenTermination() override;
-#if ENABLE(TOUCH_EVENTS)
- void needTouchEvents(bool) override { }
-#endif
-
bool shouldReplaceWithGeneratedFileForUpload(const WTF::String& path, WTF::String &generatedFilename) override;
WTF::String generateReplacementFile(const WTF::String& path) override;
Modified: trunk/Source/WebKit/win/ChangeLog (210325 => 210326)
--- trunk/Source/WebKit/win/ChangeLog 2017-01-05 13:14:05 UTC (rev 210325)
+++ trunk/Source/WebKit/win/ChangeLog 2017-01-05 13:47:59 UTC (rev 210326)
@@ -1,3 +1,12 @@
+2017-01-05 Andreas Kling <[email protected]>
+
+ Remove ChromeClient::needTouchEvents().
+ <https://webkit.org/b/166723>
+
+ Rubber-stamped by Antti Koivisto.
+
+ * WebCoreSupport/WebChromeClient.h:
+
2017-01-04 Darin Adler <[email protected]>
Remove PassRefPtr use from the "html" directory, other improvements
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h (210325 => 210326)
--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2017-01-05 13:14:05 UTC (rev 210325)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2017-01-05 13:47:59 UTC (rev 210326)
@@ -160,10 +160,6 @@
virtual void exitFullScreenForElement(WebCore::Element*);
#endif
-#if ENABLE(TOUCH_EVENTS)
- void needTouchEvents(bool) override { }
-#endif
-
void wheelEventHandlersChanged(bool) override { }
WebView* webView() { return m_webView; }
Modified: trunk/Source/WebKit2/ChangeLog (210325 => 210326)
--- trunk/Source/WebKit2/ChangeLog 2017-01-05 13:14:05 UTC (rev 210325)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-05 13:47:59 UTC (rev 210326)
@@ -1,3 +1,12 @@
+2017-01-05 Andreas Kling <[email protected]>
+
+ Remove ChromeClient::needTouchEvents().
+ <https://webkit.org/b/166723>
+
+ Rubber-stamped by Antti Koivisto.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+
2017-01-04 Darin Adler <[email protected]>
Remove PassRefPtr use from the "html" directory, other improvements
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (210325 => 210326)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2017-01-05 13:14:05 UTC (rev 210325)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2017-01-05 13:47:59 UTC (rev 210326)
@@ -236,10 +236,6 @@
PassRefPtr<WebCore::ScrollingCoordinator> createScrollingCoordinator(WebCore::Page*) const override;
#endif
-#if ENABLE(TOUCH_EVENTS)
- void needTouchEvents(bool) override { }
-#endif
-
#if PLATFORM(IOS)
void elementDidRefocus(const WebCore::Node*) override;
#endif
