<!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>[242467] trunk</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/242467">242467</a></dd>
<dt>Author</dt> <dd>ryanhaddad@apple.com</dd>
<dt>Date</dt> <dd>2019-03-05 09:18:30 -0800 (Tue, 05 Mar 2019)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/242403">r242403</a>.
Caused layout test crashes on iOS simulator.
Reverted changeset:
"[ContentChangeObserver] Introduce fixed duration content
observation"
https://bugs.webkit.org/show_bug.cgi?id=195295
https://trac.webkit.org/changeset/242403</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageiosContentChangeObservercpp">trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp</a></li>
<li><a href="#trunkSourceWebCorepageiosContentChangeObserverh">trunk/Source/WebCore/page/ios/ContentChangeObserver.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventstouchiosvisibilitychangehappensontimerhopsexpectedtxt">trunk/LayoutTests/fast/events/touch/ios/visibility-change-happens-on-timer-hops-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchiosvisibilitychangehappensontimerhopshtml">trunk/LayoutTests/fast/events/touch/ios/visibility-change-happens-on-timer-hops.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (242466 => 242467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2019-03-05 16:18:43 UTC (rev 242466)
+++ trunk/LayoutTests/ChangeLog 2019-03-05 17:18:30 UTC (rev 242467)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2019-03-05 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r242403.
+
+ Caused layout test crashes on iOS simulator.
+
+ Reverted changeset:
+
+ "[ContentChangeObserver] Introduce fixed duration content
+ observation"
+ https://bugs.webkit.org/show_bug.cgi?id=195295
+ https://trac.webkit.org/changeset/242403
+
</ins><span class="cx"> 2019-03-04 Diego Pino Garcia <dpino@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Unreviewed test gardening
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchiosvisibilitychangehappensontimerhopsexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/events/touch/ios/visibility-change-happens-on-timer-hops-expected.txt (242466 => 242467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/visibility-change-happens-on-timer-hops-expected.txt 2019-03-05 16:18:43 UTC (rev 242466)
+++ trunk/LayoutTests/fast/events/touch/ios/visibility-change-happens-on-timer-hops-expected.txt 2019-03-05 17:18:30 UTC (rev 242467)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-PASS if 'clicked' text is not shown below.
-
</del></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchiosvisibilitychangehappensontimerhopshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/events/touch/ios/visibility-change-happens-on-timer-hops.html (242466 => 242467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/visibility-change-happens-on-timer-hops.html 2019-03-05 16:18:43 UTC (rev 242466)
+++ trunk/LayoutTests/fast/events/touch/ios/visibility-change-happens-on-timer-hops.html 2019-03-05 17:18:30 UTC (rev 242467)
</span><span class="lines">@@ -1,66 +0,0 @@
</span><del>-<html>
-<head>
-<title>This tests the case when nested timers trigger visible content change</title>
-<script src="../../../../resources/basic-gestures.js"></script>
-<style>
-#tapthis {
- width: 400px;
- height: 400px;
- border: 1px solid green;
-}
-
-#becomesVisible {
- visibility: hidden;
- width: 100px;
- height: 100px;
- background-color: green;
-}
-</style>
-<script>
-async function test() {
- if (!window.testRunner || !testRunner.runUIScript)
- return;
-
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-
- let rect = tapthis.getBoundingClientRect();
- let x = rect.left + rect.width / 2;
- let y = rect.top + rect.height / 2;
-
- await tapAtPoint(x, y);
-}
-</script>
-</head>
-<body onload="test()">
-<div id=tapthis>PASS if 'clicked' text is not shown below.</div>
-<div id=becomesVisible></div>
-<pre id=result></pre>
-<script>
-tapthis.addEventListener("mouseover", function( event ) {
- // 1. Install a short timer on hover
- setTimeout(function() {
- // 2. Trigger some non-visibility style change with forcing offsetHeight.
- becomesVisible.style.marginLeft = "5px";
- document.body.offsetHeight;
-
- // 3. Install a nested timer with visibility change.
- setTimeout(function() {
- becomesVisible.style.visibility = "visible";
- document.body.offsetHeight;
- if (window.testRunner)
- setTimeout(testRunner.notifyDone(), 0);
- }, 10);
- }, 0);
-}, false);
-
-becomesVisible.addEventListener("click", function( event ) {
- result.innerHTML = "clicked hidden";
-}, false);
-
-tapthis.addEventListener("click", function( event ) {
- result.innerHTML = "clicked";
-}, false);
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (242466 => 242467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2019-03-05 16:18:43 UTC (rev 242466)
+++ trunk/Source/WebCore/ChangeLog 2019-03-05 17:18:30 UTC (rev 242467)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2019-03-05 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r242403.
+
+ Caused layout test crashes on iOS simulator.
+
+ Reverted changeset:
+
+ "[ContentChangeObserver] Introduce fixed duration content
+ observation"
+ https://bugs.webkit.org/show_bug.cgi?id=195295
+ https://trac.webkit.org/changeset/242403
+
</ins><span class="cx"> 2019-03-05 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Better categorize CPU usage per-thread / worker
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosContentChangeObservercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp (242466 => 242467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp 2019-03-05 16:18:43 UTC (rev 242466)
+++ trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp 2019-03-05 17:18:30 UTC (rev 242467)
</span><span class="lines">@@ -38,26 +38,9 @@
</span><span class="cx">
</span><span class="cx"> ContentChangeObserver::ContentChangeObserver(Document& document)
</span><span class="cx"> : m_document(document)
</span><del>- , m_contentObservationTimer([this] { stopDurationBasedContentObservation(); })
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ContentChangeObserver::startContentObservationForDuration(Seconds duration)
-{
- if (hasVisibleChangeState())
- return;
- LOG_WITH_STREAM(ContentObservation, stream << "startContentObservationForDuration: start observing the content for " << duration.milliseconds() << "ms");
- adjustObservedState(Event::StartedFixedObservationTimeWindow);
- m_contentObservationTimer.startOneShot(duration);
-}
-
-void ContentChangeObserver::stopDurationBasedContentObservation()
-{
- LOG_WITH_STREAM(ContentObservation, stream << "stopDurationBasedContentObservation: stop duration based content observing ");
- adjustObservedState(Event::EndedFixedObservationTimeWindow);
- notifyContentChangeIfNeeded();
-}
-
</del><span class="cx"> void ContentChangeObserver::didInstallDOMTimer(const DOMTimer& timer, Seconds timeout, bool singleShot)
</span><span class="cx"> {
</span><span class="cx"> if (m_document.activeDOMObjectsAreSuspended())
</span><span class="lines">@@ -196,7 +179,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (hasVisibleChangeState())
</span><span class="cx"> return true;
</span><del>- return observedContentChange() == WKContentNoChange && !hasPendingActivity();
</del><ins>+ return observedContentChange() == WKContentNoChange && !hasObservedDOMTimer() && !m_document.hasPendingStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ContentChangeObserver::adjustObservedState(Event event)
</span><span class="lines">@@ -206,7 +189,6 @@
</span><span class="cx"> setHasNoChangeState();
</span><span class="cx"> break;
</span><span class="cx"> case Event::InstalledDOMTimer:
</span><del>- case Event::StartedFixedObservationTimeWindow:
</del><span class="cx"> // Expecting a timer fire. Promote to an indeterminate state.
</span><span class="cx"> ASSERT(!hasVisibleChangeState());
</span><span class="cx"> setHasIndeterminateState();
</span><span class="lines">@@ -213,9 +195,8 @@
</span><span class="cx"> break;
</span><span class="cx"> case Event::RemovedDOMTimer:
</span><span class="cx"> case Event::StyleRecalcFinished:
</span><del>- case Event::EndedFixedObservationTimeWindow:
</del><span class="cx"> // Demote to "no change" when there's no pending activity anymore.
</span><del>- if (observedContentChange() == WKContentIndeterminateChange && !hasPendingActivity())
</del><ins>+ if (observedContentChange() == WKContentIndeterminateChange && !hasObservedDOMTimer() && !m_document.hasPendingStyleRecalc())
</ins><span class="cx"> setHasNoChangeState();
</span><span class="cx"> break;
</span><span class="cx"> case Event::ContentVisibilityChanged:
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosContentChangeObserverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/ContentChangeObserver.h (242466 => 242467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/ContentChangeObserver.h 2019-03-05 16:18:43 UTC (rev 242466)
+++ trunk/Source/WebCore/page/ios/ContentChangeObserver.h 2019-03-05 17:18:30 UTC (rev 242467)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><span class="cx">
</span><del>-#include "Timer.h"
</del><span class="cx"> #include "WKContentObservation.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -39,7 +38,6 @@
</span><span class="cx"> public:
</span><span class="cx"> ContentChangeObserver(Document&);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void startContentObservationForDuration(Seconds duration);
</del><span class="cx"> WEBCORE_EXPORT WKContentChange observedContentChange() const;
</span><span class="cx">
</span><span class="cx"> void didInstallDOMTimer(const DOMTimer&, Seconds timeout, bool singleShot);
</span><span class="lines">@@ -104,7 +102,7 @@
</span><span class="cx"> void setShouldObserveNextStyleRecalc(bool);
</span><span class="cx"> bool isObservingStyleRecalc() const { return m_isObservingStyleRecalc; }
</span><span class="cx">
</span><del>- bool isObservingContentChanges() const { return m_domTimerisBeingExecuted || m_styleRecalcIsBeingExecuted || m_contentObservationTimer.isActive(); }
</del><ins>+ bool isObservingContentChanges() const { return m_domTimerisBeingExecuted || m_styleRecalcIsBeingExecuted; }
</ins><span class="cx">
</span><span class="cx"> void clearObservedDOMTimers() { m_DOMTimerList.clear(); }
</span><span class="cx"> void clearTimersAndReportContentChange();
</span><span class="lines">@@ -119,23 +117,16 @@
</span><span class="cx">
</span><span class="cx"> void notifyContentChangeIfNeeded();
</span><span class="cx">
</span><del>- void stopDurationBasedContentObservation();
-
- bool hasPendingActivity() const { return hasObservedDOMTimer() || m_document.hasPendingStyleRecalc() || m_contentObservationTimer.isActive(); }
-
</del><span class="cx"> enum class Event {
</span><span class="cx"> ContentObservationStarted,
</span><span class="cx"> InstalledDOMTimer,
</span><span class="cx"> RemovedDOMTimer,
</span><span class="cx"> StyleRecalcFinished,
</span><del>- ContentVisibilityChanged,
- StartedFixedObservationTimeWindow,
- EndedFixedObservationTimeWindow
</del><ins>+ ContentVisibilityChanged
</ins><span class="cx"> };
</span><span class="cx"> void adjustObservedState(Event);
</span><span class="cx">
</span><span class="cx"> Document& m_document;
</span><del>- Timer m_contentObservationTimer;
</del><span class="cx"> HashSet<const DOMTimer*> m_DOMTimerList;
</span><span class="cx"> bool m_isObservingStyleRecalc { false };
</span><span class="cx"> bool m_styleRecalcIsBeingExecuted { false };
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (242466 => 242467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2019-03-05 16:18:43 UTC (rev 242466)
+++ trunk/Source/WebKit/ChangeLog 2019-03-05 17:18:30 UTC (rev 242467)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2019-03-05 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r242403.
+
+ Caused layout test crashes on iOS simulator.
+
+ Reverted changeset:
+
+ "[ContentChangeObserver] Introduce fixed duration content
+ observation"
+ https://bugs.webkit.org/show_bug.cgi?id=195295
+ https://trac.webkit.org/changeset/242403
+
</ins><span class="cx"> 2019-03-05 Loïc Yhuel <loic.yhuel@softathome.com>
</span><span class="cx">
</span><span class="cx"> [WPE] Do not create a PlatformDisplay in the Service Worker process
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (242466 => 242467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2019-03-05 16:18:43 UTC (rev 242466)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2019-03-05 17:18:30 UTC (rev 242467)
</span><span class="lines">@@ -552,9 +552,6 @@
</span><span class="cx"> mainframe.document()->updateStyleIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const Seconds observationDuration = 32_ms;
- respondingDocument.contentChangeObserver().startContentObservationForDuration(observationDuration);
-
</del><span class="cx"> m_pendingSyntheticClickNode = nullptr;
</span><span class="cx"> m_pendingSyntheticClickLocation = FloatPoint();
</span><span class="cx"> m_pendingSyntheticClickModifiers = { };
</span></span></pre>
</div>
</div>
</body>
</html>