Changeset 248759 in webkit

Timestamp:

Aug 15, 2019 7:20:57 PM (5 years ago)

Author:

Alan Bujtas

Message:

[ContentChangeObserver] Keep track of all the visibility candidates.
​https://bugs.webkit.org/show_bug.cgi?id=200777
<rdar://problem/54356331>

Reviewed by Simon Fraser.

Source/WebCore:

In order to find out whether a visible (and actionable) content change happened, we need to keep track of all the candidate elements.

Test: fast/events/touch/ios/content-observation/going-from-hidden-to-visible-and-to-hidden2.html

• page/ios/ContentChangeObserver.cpp:

(WebCore::ContentChangeObserver::reset):
(WebCore::ContentChangeObserver::rendererWillBeDestroyed):
(WebCore::ContentChangeObserver::contentVisibilityDidChange):
(WebCore::ContentChangeObserver::shouldObserveVisibilityChangeForElement):

• page/ios/ContentChangeObserver.h:

Source/WTF:

• wtf/WeakHashSet.h:

LayoutTests:

• fast/events/touch/ios/content-observation/going-from-hidden-to-visible-and-to-hidden2-expected.txt: Added.
• fast/events/touch/ios/content-observation/going-from-hidden-to-visible-and-to-hidden2.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/touch/ios/content-observation/going-from-hidden-to-visible-and-to-hidden2-expected.txt (added)
• LayoutTests/fast/events/touch/ios/content-observation/going-from-hidden-to-visible-and-to-hidden2.html (added)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/WeakHashSet.h (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/ios/ContentChangeObserver.cpp (modified) (4 diffs)
• Source/WebCore/page/ios/ContentChangeObserver.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-08-15  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] Keep track of all the visibility candidates.
+        https://bugs.webkit.org/show_bug.cgi?id=200777
+        <rdar://problem/54356331>
+
+        Reviewed by Simon Fraser.
+
+        * fast/events/touch/ios/content-observation/going-from-hidden-to-visible-and-to-hidden2-expected.txt: Added.
+        * fast/events/touch/ios/content-observation/going-from-hidden-to-visible-and-to-hidden2.html: Added.
+
 2019-08-15  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-08-15  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] Keep track of all the visibility candidates.
+        https://bugs.webkit.org/show_bug.cgi?id=200777
+        <rdar://problem/54356331>
+
+        Reviewed by Simon Fraser.
+
+        * wtf/WeakHashSet.h:
+
 2019-08-15  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WTF/wtf/WeakHashSet.h

@@ -113 +113 @@
     }
 
+    void clear() { m_set.clear(); }
+
     template <typename U>
     bool contains(const U& value) const

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-15  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] Keep track of all the visibility candidates.
+        https://bugs.webkit.org/show_bug.cgi?id=200777
+        <rdar://problem/54356331>
+
+        Reviewed by Simon Fraser.
+
+        In order to find out whether a visible (and actionable) content change happened, we need to keep track of all the candidate elements.
+
+        Test: fast/events/touch/ios/content-observation/going-from-hidden-to-visible-and-to-hidden2.html
+
+        * page/ios/ContentChangeObserver.cpp:
+        (WebCore::ContentChangeObserver::reset):
+        (WebCore::ContentChangeObserver::rendererWillBeDestroyed):
+        (WebCore::ContentChangeObserver::contentVisibilityDidChange):
+        (WebCore::ContentChangeObserver::shouldObserveVisibilityChangeForElement):
+        * page/ios/ContentChangeObserver.h:
+
 2019-08-15  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp

@@ -372 +372 @@
     m_observedDomTimerIsBeingExecuted = false;
 
-    m_visibilityCandidateElement = { };
+    m_visibilityCandidateList.clear();
 
     m_contentObservationTimer.stop();
@@ -402 +402 @@
         m_elementsWithDestroyedVisibleRenderer.add(&element);
     // Candidate element is no longer visible.
-    if (m_visibilityCandidateElement == &element) {
+    if (m_visibilityCandidateList.remove(element)) {
         // FIXME: We should also check for other type of visiblity changes.
         ASSERT(hasVisibleChangeState());
-        m_visibilityCandidateElement = { };
-        setHasIndeterminateState();
+        if (m_visibilityCandidateList.computesEmpty())
+            setHasIndeterminateState();
     }
 }
@@ -413 +413 @@
 {
     LOG(ContentObservation, "contentVisibilityDidChange: visible content change did happen.");
-    // FIXME: This should evolve into a list of candidate elements.
-    m_visibilityCandidateElement = makeWeakPtr(element);
+    m_visibilityCandidateList.add(element);
     adjustObservedState(Event::ContentVisibilityChanged);
 }
@@ -624 +623 @@
 bool ContentChangeObserver::shouldObserveVisibilityChangeForElement(const Element& element)
 {
-    return isObservingContentChanges() && !hasVisibleChangeState() && !visibleRendererWasDestroyed(element) && !element.document().quirks().shouldIgnoreContentChange(element);
+    return isObservingContentChanges() && !visibleRendererWasDestroyed(element) && !element.document().quirks().shouldIgnoreContentChange(element);
 }
 

trunk/Source/WebCore/page/ios/ContentChangeObserver.h

@@ -208 +208 @@
     WKContentChange m_observedContentState { WKContentNoChange };
     WeakPtr<Element> m_hiddenTouchTargetElement;
-    WeakPtr<Element> m_visibilityCandidateElement;
+    WeakHashSet<Element> m_visibilityCandidateList;
     bool m_touchEventIsBeingDispatched { false };
     bool m_isWaitingForStyleRecalc { false };