Refactor overlay fullscreen video handling into a single callback

third_party/WebKit/Source/core/dom/Fullscreen.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 533 matching lines @@
 bool Fullscreen::fullscreenEnabled(Document& document) {
   // The fullscreenEnabled attribute's getter must return true if the context
   // object is allowed to use the feature indicated by attribute name
   // allowfullscreen and fullscreen is supported, and false otherwise.
   return allowedToUseFullscreen(document.frame()) &&
          fullscreenIsSupported(document);
 }
 
 void Fullscreen::didEnterFullscreenForElement(Element* element) {
   DCHECK(element);
-  if (!document()->isActive())
+  if (!document()->isActive() || !document()->frame())
+    return;
+
+  if (m_currentFullScreenElement == element)
     return;
 
   if (m_fullScreenLayoutObject)
     m_fullScreenLayoutObject->unwrapLayoutObject();
 
+  Element* previousElement = m_currentFullScreenElement;
   m_currentFullScreenElement = element;
 
   // Create a placeholder block for a the full-screen element, to keep the page
   // from reflowing when the element is removed from the normal flow. Only do
   // this for a LayoutBox, as only a box will have a frameRect. The placeholder
   // will be created in setFullScreenLayoutObject() during layout.
   LayoutObject* layoutObject = m_currentFullScreenElement->layoutObject();
   bool shouldCreatePlaceholder = layoutObject && layoutObject->isBox();
   if (shouldCreatePlaceholder) {
     m_savedPlaceholderFrameRect = toLayoutBox(layoutObject)->frameRect();
@@ skipping 23 matching lines @@
 
   m_currentFullScreenElement
       ->setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(true);
 
   document()->styleEngine().ensureUAStyleForFullscreen();
   m_currentFullScreenElement->pseudoStateChanged(CSSSelector::PseudoFullScreen);
 
   // FIXME: This should not call updateStyleAndLayoutTree.
   document()->updateStyleAndLayoutTree();
 
-  m_currentFullScreenElement->didBecomeFullscreenElement();
-
-  if (document()->frame())
-    document()->frame()->eventHandler().scheduleHoverStateUpdate();
+  document()->frame()->eventHandler().scheduleHoverStateUpdate();
 
   m_eventQueueTimer.startOneShot(0, BLINK_FROM_HERE);
+
+  document()->frame()->chromeClient().fullscreenElementChanged(previousElement,
+                                                               element);
 }
 
 void Fullscreen::didExitFullscreen() {
+  if (!document()->isActive() || !document()->frame())
+    return;
+
   if (!m_currentFullScreenElement)
     return;
 
-  if (!document()->isActive())
-    return;
-
-  m_currentFullScreenElement->willStopBeingFullscreenElement();
-
   if (m_forCrossProcessDescendant)
     m_currentFullScreenElement->setContainsFullScreenElement(false);
 
   m_currentFullScreenElement
       ->setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(false);
 
   if (m_fullScreenLayoutObject)
     LayoutFullScreenItem(m_fullScreenLayoutObject).unwrapLayoutObject();
 
   document()->styleEngine().ensureUAStyleForFullscreen();
   m_currentFullScreenElement->pseudoStateChanged(CSSSelector::PseudoFullScreen);
+  Element* previousElement = m_currentFullScreenElement;
   m_currentFullScreenElement = nullptr;
 
-  if (document()->frame())
-    document()->frame()->eventHandler().scheduleHoverStateUpdate();
+  document()->frame()->eventHandler().scheduleHoverStateUpdate();
 
   // When fullyExitFullscreen is called, we call exitFullscreen on the
   // topDocument(). That means that the events will be queued there. So if we
   // have no events here, start the timer on the exiting document.
   Document* exitingDocument = document();
   if (m_eventQueue.isEmpty())
     exitingDocument = &topmostLocalAncestor(*document());
   DCHECK(exitingDocument);
   from(*exitingDocument).m_eventQueueTimer.startOneShot(0, BLINK_FROM_HERE);
 
   m_forCrossProcessDescendant = false;
+
+  document()->frame()->chromeClient().fullscreenElementChanged(previousElement,
+                                                               nullptr);
 }
 
 void Fullscreen::setFullScreenLayoutObject(LayoutFullScreen* layoutObject) {
   if (layoutObject == m_fullScreenLayoutObject)
     return;
 
   if (layoutObject && m_savedPlaceholderComputedStyle) {
     layoutObject->createPlaceholder(m_savedPlaceholderComputedStyle.release(),
                                     m_savedPlaceholderFrameRect);
   } else if (layoutObject && m_fullScreenLayoutObject &&
@@ skipping 106 matching lines @@
 
 DEFINE_TRACE(Fullscreen) {
   visitor->trace(m_currentFullScreenElement);
   visitor->trace(m_fullscreenElementStack);
   visitor->trace(m_eventQueue);
   Supplement<Document>::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
 }
 
 }  // namespace blink