Refactor overlay fullscreen video handling into a single callback

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 1176 matching lines @@
 
   m_webMediaPlayer->setPoster(posterImageURL());
 
   m_webMediaPlayer->setPreload(effectivePreloadType());
 
   m_webMediaPlayer->requestRemotePlaybackDisabled(
       fastHasAttribute(disableremoteplaybackAttr));
 
   m_webMediaPlayer->load(loadType(), source, corsMode());
 
-  if (isFullscreen()) {
-    // This handles any transition to or from fullscreen overlay mode.
-    frame->chromeClient().enterFullscreenForElement(this);
-  }
+  if (isFullscreen())
+    m_webMediaPlayer->enteredFullscreen();
 }
 
 void HTMLMediaElement::setPlayerPreload() {
   if (m_webMediaPlayer)
     m_webMediaPlayer->setPreload(effectivePreloadType());
 
   if (loadIsDeferred() && effectivePreloadType() != WebMediaPlayer::PreloadNone)
     startDeferredLoad();
 }
 
@@ skipping 2282 matching lines @@
 
   Fullscreen::requestFullscreen(*this, Fullscreen::PrefixedRequest);
 }
 
 void HTMLMediaElement::exitFullscreen() {
   BLINK_MEDIA_LOG << "exitFullscreen(" << (void*)this << ")";
 
   Fullscreen::exitFullscreen(document());
 }
 
-void HTMLMediaElement::didBecomeFullscreenElement() {
+void HTMLMediaElement::didEnterFullscreen() {
   if (mediaControls())
     mediaControls()->enteredFullscreen();
   // FIXME: There is no embedder-side handling in layout test mode.
   if (webMediaPlayer() && !LayoutTestSupport::isRunningLayoutTest())
     webMediaPlayer()->enteredFullscreen();
   // Cache this in case the player is destroyed before leaving fullscreen.
   m_inOverlayFullscreenVideo = usesOverlayFullscreenVideo();
   if (m_inOverlayFullscreenVideo)
     document().layoutViewItem().compositor()->setNeedsCompositingUpdate(
         CompositingUpdateRebuildTree);
 }
 
-void HTMLMediaElement::willStopBeingFullscreenElement() {
+void HTMLMediaElement::didExitFullscreen() {
   if (mediaControls())
     mediaControls()->exitedFullscreen();
   if (webMediaPlayer())
     webMediaPlayer()->exitedFullscreen();
   if (m_inOverlayFullscreenVideo)
     document().layoutViewItem().compositor()->setNeedsCompositingUpdate(
         CompositingUpdateRebuildTree);
   m_inOverlayFullscreenVideo = false;
 }
 
@@ skipping 675 matching lines @@
 
 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect()
     const {
   IntRect result;
   if (LayoutObject* object = m_element->layoutObject())
     result = object->absoluteBoundingBoxRect();
   return result;
 }
 
 }  // namespace blink