Fix the conditions when fullscreen detector listeners are registered

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

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/html/MediaCustomControlsFullscreenDetector.h"
 
 #include "core/EventTypeNames.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/RuntimeEnabledFeatures.h"
@@ skipping 16 matching lines @@
 class MediaCustomControlsFullscreenDetectorTest : public ::testing::Test {
  protected:
   void SetUp() override {
     m_originalVideoFullscreenDetectionEnabled =
         RuntimeEnabledFeatures::videoFullscreenDetectionEnabled();
 
     RuntimeEnabledFeatures::setVideoFullscreenDetectionEnabled(true);
 
     m_pageHolder = DummyPageHolder::create();
     m_newPageHolder = DummyPageHolder::create();
-
-    m_video = HTMLVideoElement::create(m_pageHolder->document());
-    document().body()->appendChild(&videoElement());
   }
 
   void TearDown() override {
     RuntimeEnabledFeatures::setVideoFullscreenDetectionEnabled(
         m_originalVideoFullscreenDetectionEnabled);
   }
 
-  HTMLVideoElement& videoElement() const { return *m_video; }
-  MediaCustomControlsFullscreenDetector& fullscreenDetector() const {
-    return *videoElement().m_customControlsFullscreenDetector;
+  HTMLVideoElement* videoElement() const {
+    return toHTMLVideoElement(document().querySelector("video"));
+  }
+
+  static MediaCustomControlsFullscreenDetector* fullscreenDetectorFor(
+      HTMLVideoElement* videoElement) {
+    return videoElement->m_customControlsFullscreenDetector;
+  }
+
+  MediaCustomControlsFullscreenDetector* fullscreenDetector() const {
+    return fullscreenDetectorFor(videoElement());
   }
 
   Document& document() const { return m_pageHolder->document(); }
   Document& newDocument() const { return m_newPageHolder->document(); }
 
   bool checkEventListenerRegistered(EventTarget& target,
                                     const AtomicString& eventType,
                                     EventListener* listener) {
     EventListenerVector* listeners = target.getEventListeners(eventType);
     if (!listeners)
@@ skipping 43 matching lines @@
 
   for (const TestParam& testParam : testParams) {
     const IntRect& targetRect = testParam.targetRect;
     IntRect intersectionRect = intersection(targetRect, rootRect);
     EXPECT_EQ(testParam.expectedResult,
               computeIsDominantVideo(targetRect, rootRect, intersectionRect))
         << testParam.description << " failed";
   }
 }
 
-TEST_F(MediaCustomControlsFullscreenDetectorTest, documentMove) {
+TEST_F(MediaCustomControlsFullscreenDetectorTest,
+       hasNoListenersBeforeAddingToDocument) {
+  HTMLVideoElement* video =
+      toHTMLVideoElement(document().createElement("video"));
+
+  EXPECT_FALSE(checkEventListenerRegistered(document(),
+                                            EventTypeNames::fullscreenchange,
+                                            fullscreenDetectorFor(video)));
+  EXPECT_FALSE(checkEventListenerRegistered(
+      document(), EventTypeNames::webkitfullscreenchange,
+      fullscreenDetectorFor(video)));
+  EXPECT_FALSE(checkEventListenerRegistered(
+      *video, EventTypeNames::loadedmetadata, fullscreenDetectorFor(video)));
+}
+
+TEST_F(MediaCustomControlsFullscreenDetectorTest,
+       hasListenersAfterAddToDocumentByScript) {
+  HTMLVideoElement* video =
+      toHTMLVideoElement(document().createElement("video"));
+  document().body()->appendChild(video);
+
   EXPECT_TRUE(checkEventListenerRegistered(
-      document(), EventTypeNames::fullscreenchange, &fullscreenDetector()));
+      document(), EventTypeNames::fullscreenchange, fullscreenDetector()));
   EXPECT_TRUE(checkEventListenerRegistered(
       document(), EventTypeNames::webkitfullscreenchange,
-      &fullscreenDetector()));
-  EXPECT_FALSE(checkEventListenerRegistered(
-      newDocument(), EventTypeNames::fullscreenchange, &fullscreenDetector()));
-  EXPECT_FALSE(checkEventListenerRegistered(
-      newDocument(), EventTypeNames::webkitfullscreenchange,
-      &fullscreenDetector()));
+      fullscreenDetector()));
+  EXPECT_TRUE(checkEventListenerRegistered(
+      *videoElement(), EventTypeNames::loadedmetadata, fullscreenDetector()));
+}
 
-  newDocument().body()->appendChild(&videoElement());
+TEST_F(MediaCustomControlsFullscreenDetectorTest,
+       hasListenersAfterAddToDocumentByParser) {
+  document().body()->setInnerHTML("<body><video></video></body>");
 
-  EXPECT_FALSE(checkEventListenerRegistered(
-      document(), EventTypeNames::fullscreenchange, &fullscreenDetector()));
+  EXPECT_TRUE(checkEventListenerRegistered(
+      document(), EventTypeNames::fullscreenchange, fullscreenDetector()));
+  EXPECT_TRUE(checkEventListenerRegistered(
+      document(), EventTypeNames::webkitfullscreenchange,
+      fullscreenDetector()));
+  EXPECT_TRUE(checkEventListenerRegistered(
+      *videoElement(), EventTypeNames::loadedmetadata, fullscreenDetector()));
+}
+
+TEST_F(MediaCustomControlsFullscreenDetectorTest,
+       hasListenersAfterDocumentMove) {
+  HTMLVideoElement* video =
+      toHTMLVideoElement(document().createElement("video"));
+  document().body()->appendChild(video);
+
+  newDocument().body()->appendChild(videoElement());
+
+  EXPECT_FALSE(checkEventListenerRegistered(document(),
+                                            EventTypeNames::fullscreenchange,
+                                            fullscreenDetectorFor(video)));
   EXPECT_FALSE(checkEventListenerRegistered(
       document(), EventTypeNames::webkitfullscreenchange,
-      &fullscreenDetector()));
-  EXPECT_TRUE(checkEventListenerRegistered(
-      newDocument(), EventTypeNames::fullscreenchange, &fullscreenDetector()));
+      fullscreenDetectorFor(video)));
+
+  EXPECT_TRUE(checkEventListenerRegistered(newDocument(),
+                                           EventTypeNames::fullscreenchange,
+                                           fullscreenDetectorFor(video)));
   EXPECT_TRUE(checkEventListenerRegistered(
       newDocument(), EventTypeNames::webkitfullscreenchange,
-      &fullscreenDetector()));
+      fullscreenDetectorFor(video)));
+
+  EXPECT_TRUE(checkEventListenerRegistered(
+      *video, EventTypeNames::loadedmetadata, fullscreenDetectorFor(video)));
 }
 
 }  // namespace blink