Revert "Simplify ElementVisibilityObserver implementation."

third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

Index: third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
index 477cbbbd0a63ee29b73920abdcffb48bba5588b0..9ae340c3bbdf09ee5911ec1dc743e49b303f8f2e 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
@@ -1659,8 +1659,10 @@ void HTMLMediaElement::setReadyState(ReadyState state)
                     // We might end up in a situation where the previous
                     // observer didn't had time to fire yet. We can avoid
                     // creating a new one in this case.
-                    if (!m_autoplayVisibilityObserver)
-                        m_autoplayVisibilityObserver = ElementVisibilityObserver::create(this, this);
+                    if (!m_autoplayVisibilityObserver) {
+                        m_autoplayVisibilityObserver = new ElementVisibilityObserver(this, WTF::bind(&HTMLMediaElement::onVisibilityChangedForAutoplay, wrapWeakPersistent(this)));
+                        m_autoplayVisibilityObserver->start();
+                    }
                 } else {
                     m_paused = false;
                     invalidateCachedTime();
@@ -3673,8 +3675,8 @@ DEFINE_TRACE(HTMLMediaElement)
     visitor->trace(m_srcObject);
     visitor->trace(m_autoplayVisibilityObserver);
     visitor->template registerWeakMembers<HTMLMediaElement, &HTMLMediaElement::clearWeakMembers>(this);
-    HTMLElement::trace(visitor);
     Supplementable<HTMLMediaElement>::trace(visitor);
+    HTMLElement::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
@@ -3912,7 +3914,7 @@ void HTMLMediaElement::recordAutoplayUnmuteStatus(AutoplayUnmuteActionStatus sta
     autoplayUnmuteHistogram.count(status);
 }
 
-void HTMLMediaElement::onVisibilityChanged(bool isVisible)
+void HTMLMediaElement::onVisibilityChangedForAutoplay(bool isVisible)
 {
     if (!isVisible)
         return;