Reland "Sync requestFullscreen() and exitFullscreen() algorithms with the spec"

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

 /*
  * Copyright (C) 2007, 2008, 2009, 2010 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 238 matching lines @@
     // This is only recorded when entering this mode.
     DEFINE_STATIC_LOCAL(EnumerationHistogram, histogram,
                         ("Media.VideoPersistence.ControlsType",
                          kVideoPersistenceControlsTypeCount));
     if (IsFullscreen())
       histogram.Count(kVideoPersistenceControlsTypeNative);
     else
       histogram.Count(kVideoPersistenceControlsTypeCustom);
 
     Element* fullscreen_element =
-        Fullscreen::CurrentFullScreenElementFrom(GetDocument());
+        Fullscreen::FullscreenElementFrom(GetDocument());
     // Only set the video in persistent mode if it is not using native controls
     // and is currently fullscreen.
     if (!fullscreen_element || IsFullscreen())
       return;
 
     is_persistent_ = true;
     PseudoStateChanged(CSSSelector::kPseudoVideoPersistent);
 
     // The video is also marked as containing a persistent video to simplify the
     // internal CSS logic.
     for (Element* element = this; element && element != fullscreen_element;
          element = element->ParentOrShadowHostElement()) {
       element->SetContainsPersistentVideo(true);
     }
     fullscreen_element->SetContainsPersistentVideo(true);
   } else {
     if (!is_persistent_)
       return;
 
     is_persistent_ = false;
     PseudoStateChanged(CSSSelector::kPseudoVideoPersistent);
 
     Element* fullscreen_element =
-        Fullscreen::CurrentFullScreenElementFrom(GetDocument());
+        Fullscreen::FullscreenElementFrom(GetDocument());
     // If the page is no longer fullscreen, the full tree will have to be
     // traversed to make sure things are cleaned up.
     for (Element* element = this; element && element != fullscreen_element;
          element = element->ParentOrShadowHostElement()) {
       element->SetContainsPersistentVideo(false);
     }
     if (fullscreen_element)
       fullscreen_element->SetContainsPersistentVideo(false);
   }
 }
@@ skipping 227 matching lines @@
   remoting_interstitial_->Hide();
 }
 
 void HTMLVideoElement::DisableMediaRemoting() {
   media_remoting_status_ = MediaRemotingStatus::kDisabled;
   if (GetWebMediaPlayer())
     GetWebMediaPlayer()->RequestRemotePlaybackDisabled(true);
 }
 
 }  // namespace blink