Media Remoting: Add interstitial elements to media element shadow dom.

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

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 3618 matching lines @@
       return true;
   }
 
   return false;
 }
 
 bool HTMLMediaElement::TextTracksVisible() const {
   return text_tracks_visible_;
 }
 
-static void AssertShadowRootChildren(ShadowRoot& shadow_root) {
+// static
+void HTMLMediaElement::AssertShadowRootChildren(ShadowRoot& shadow_root) {
 #if DCHECK_IS_ON()
   // There can be up to two children, either or both of the text

[liberato (no reviews please), 2017/04/12 21:57:44]

s/two/three/

[xjz, 2017/04/13 00:08:48]

Done. Also rewrite the comment. I missed this after rebasing. Thanks for
pointing this out. :)

   // track container and media controls. If both are present, the
   // text track container must be the first child.
   unsigned number_of_children = shadow_root.CountChildren();
-  DCHECK_LE(number_of_children, 2u);
+  DCHECK_LE(number_of_children, 3u);
   Node* first_child = shadow_root.FirstChild();
   Node* last_child = shadow_root.LastChild();
   if (number_of_children == 1) {
     DCHECK(first_child->IsTextTrackContainer() ||
-           first_child->IsMediaControls());
+           first_child->IsMediaControls() ||
+           first_child->IsMediaRemotingInterstitial());
   } else if (number_of_children == 2) {
-    DCHECK(first_child->IsTextTrackContainer());
+    DCHECK(first_child->IsTextTrackContainer() ||
+           first_child->IsMediaRemotingInterstitial());
+    DCHECK(last_child->IsTextTrackContainer() || last_child->IsMediaControls());
+    if (first_child->IsTextTrackContainer())
+      DCHECK(last_child->IsMediaControls());
+  } else if (number_of_children == 3) {
+    Node* second_child = first_child->nextSibling();
+    DCHECK(first_child->IsMediaRemotingInterstitial());
+    DCHECK(second_child->IsTextTrackContainer());
     DCHECK(last_child->IsMediaControls());
   }
 #endif
 }
 
 TextTrackContainer& HTMLMediaElement::EnsureTextTrackContainer() {
   ShadowRoot& shadow_root = EnsureUserAgentShadowRoot();
   AssertShadowRootChildren(shadow_root);
 
   Node* first_child = shadow_root.FirstChild();
   if (first_child && first_child->IsTextTrackContainer())
     return ToTextTrackContainer(*first_child);
+  Node* to_be_inserted = first_child;
+
+  if (first_child && first_child->IsMediaRemotingInterstitial()) {
+    Node* second_child = first_child->nextSibling();
+    if (second_child && second_child->IsTextTrackContainer())
+      return ToTextTrackContainer(*second_child);
+    to_be_inserted = second_child;
+  }
 
   TextTrackContainer* text_track_container = TextTrackContainer::Create(*this);
 
   // The text track container should be inserted before the media controls,
   // so that they are rendered behind them.
-  shadow_root.InsertBefore(text_track_container, first_child);
+  shadow_root.InsertBefore(text_track_container, to_be_inserted);
 
   AssertShadowRootChildren(shadow_root);
 
   return *text_track_container;
 }
 
 void HTMLMediaElement::UpdateTextTrackDisplay() {
   BLINK_MEDIA_LOG << "updateTextTrackDisplay(" << (void*)this << ")";
 
   EnsureTextTrackContainer().UpdateDisplay(
@@ skipping 587 matching lines @@
       kMostlyFillViewportBecomeStableSeconds, BLINK_FROM_HERE);
 }
 
 void HTMLMediaElement::ViewportFillDebouncerTimerFired(TimerBase*) {
   mostly_filling_viewport_ = true;
   if (web_media_player_)
     web_media_player_->BecameDominantVisibleContent(mostly_filling_viewport_);
 }
 
 }  // namespace blink