<!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>[210326] 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/210326">210326</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2017-01-05 05:47:59 -0800 (Thu, 05 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove ChromeClient::needTouchEvents().
<https://webkit.org/b/166723>
Rubber-stamped by Antti Koivisto.
Source/WebCore:
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:
Source/WebKit/mac:
* WebCoreSupport/WebChromeClient.h:
Source/WebKit/win:
* WebCoreSupport/WebChromeClient.h:
Source/WebKit2:
* WebProcess/WebCoreSupport/WebChromeClient.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryCachedFramecpp">trunk/Source/WebCore/history/CachedFrame.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClienth">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210325 => 210326)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-01-05 Andreas Kling <akling@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2017-01-05 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove PassRefPtr use from "bindings/scripts", "svg", "testing", and "workers"
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (210325 => 210326)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2168,13 +2168,6 @@
</span><span class="cx"> if (page() && m_frame->isMainFrame())
</span><span class="cx"> wheelEventHandlersChanged();
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> // Ensure that the scheduled task state of the document matches the DOM suspension state of the frame. It can
</span><span class="cx"> // be out of sync if the DOM suspension state changed while the document was not in the frame (possibly in the
</span><span class="cx"> // page cache, or simply newly created).
</span><span class="lines">@@ -6238,11 +6231,6 @@
</span><span class="cx"> parent->didAddTouchEventHandler(*this);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- if (Page* page = this->page()) {
- if (m_touchEventTargets->size() == 1)
- page->chrome().client().needTouchEvents(true);
- }
</del><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(handler);
</span><span class="cx"> #endif
</span><span class="lines">@@ -6256,23 +6244,8 @@
</span><span class="cx">
</span><span class="cx"> removeHandlerFromSet(*m_touchEventTargets, handler, removal);
</span><span class="cx">
</span><del>- if (Document* parent = parentDocument()) {
</del><ins>+ if (Document* parent = parentDocument())
</ins><span class="cx"> parent->didRemoveTouchEventHandler(*this);
</span><del>- 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);
</del><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(handler);
</span><span class="cx"> UNUSED_PARAM(removal);
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryCachedFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/CachedFrame.cpp (210325 => 210326)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -48,11 +48,6 @@
</span><span class="cx"> #include <wtf/RefCountedLeakCounter.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || ENABLE(TOUCH_EVENTS)
-#include "Chrome.h"
-#include "ChromeClient.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, cachedFrameCounter, ("CachedFrame"));
</span><span class="lines">@@ -125,11 +120,6 @@
</span><span class="cx"> if (historyItem && historyItem->stateObject())
</span><span class="cx"> m_document->enqueuePopstateEvent(historyItem->stateObject());
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS)
- if (m_document->hasTouchEventHandlers())
- m_document->page()->chrome().client().needTouchEvents(true);
-#endif
-
</del><span class="cx"> frame.view()->didRestoreFromPageCache();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (210325 => 210326)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -226,10 +226,6 @@
</span><span class="cx"> bool isStopping() override { return false; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
- void needTouchEvents(bool) override { }
-#endif
-
</del><span class="cx"> void wheelEventHandlersChanged(bool) override { }
</span><span class="cx">
</span><span class="cx"> bool isEmptyChromeClient() const override { return true; }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (210325 => 210326)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1915,11 +1915,6 @@
</span><span class="cx">
</span><span class="cx"> setState(FrameStateCommittedPage);
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS)
- if (m_frame.isMainFrame())
- m_frame.page()->chrome().client().needTouchEvents(false);
-#endif
-
</del><span class="cx"> // Handle adding the URL to the back/forward list.
</span><span class="cx"> DocumentLoader* dl = m_documentLoader.get();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (210325 => 210326)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -373,10 +373,6 @@
</span><span class="cx"> virtual void AXFinishFrameLoad() = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
- virtual void needTouchEvents(bool) = 0;
-#endif
-
</del><span class="cx"> virtual bool selectItemWritingDirectionIsNatural() = 0;
</span><span class="cx"> virtual bool selectItemAlignmentFollowsMenuWritingDirection() = 0;
</span><span class="cx"> // Checks if there is an opened popup, called by RenderMenuList::showPopup().
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (210325 => 210326)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2017-01-05 Andreas Kling <akling@apple.com>
+
+ Remove ChromeClient::needTouchEvents().
+ <https://webkit.org/b/166723>
+
+ Rubber-stamped by Antti Koivisto.
+
+ * WebCoreSupport/WebChromeClient.h:
+
</ins><span class="cx"> 2017-01-04 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove PassRefPtr use from the "html" directory, other improvements
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (210325 => 210326)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -143,10 +143,6 @@
</span><span class="cx"> void enableSuddenTermination() override;
</span><span class="cx"> void disableSuddenTermination() override;
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
- void needTouchEvents(bool) override { }
-#endif
-
</del><span class="cx"> bool shouldReplaceWithGeneratedFileForUpload(const WTF::String& path, WTF::String &generatedFilename) override;
</span><span class="cx"> WTF::String generateReplacementFile(const WTF::String& path) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (210325 => 210326)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2017-01-05 Andreas Kling <akling@apple.com>
+
+ Remove ChromeClient::needTouchEvents().
+ <https://webkit.org/b/166723>
+
+ Rubber-stamped by Antti Koivisto.
+
+ * WebCoreSupport/WebChromeClient.h:
+
</ins><span class="cx"> 2017-01-04 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove PassRefPtr use from the "html" directory, other improvements
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h (210325 => 210326)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -160,10 +160,6 @@
</span><span class="cx"> virtual void exitFullScreenForElement(WebCore::Element*);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
- void needTouchEvents(bool) override { }
-#endif
-
</del><span class="cx"> void wheelEventHandlersChanged(bool) override { }
</span><span class="cx">
</span><span class="cx"> WebView* webView() { return m_webView; }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (210325 => 210326)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2017-01-05 Andreas Kling <akling@apple.com>
+
+ Remove ChromeClient::needTouchEvents().
+ <https://webkit.org/b/166723>
+
+ Rubber-stamped by Antti Koivisto.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+
</ins><span class="cx"> 2017-01-04 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove PassRefPtr use from the "html" directory, other improvements
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (210325 => 210326)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -236,10 +236,6 @@
</span><span class="cx"> PassRefPtr<WebCore::ScrollingCoordinator> createScrollingCoordinator(WebCore::Page*) const override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
- void needTouchEvents(bool) override { }
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void elementDidRefocus(const WebCore::Node*) override;
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>