Merge willEnter/willExitFullScreen into didEnter/didExitFullScreen

Source/core/dom/Fullscreen.cpp

Index: Source/core/dom/Fullscreen.cpp
diff --git a/Source/core/dom/Fullscreen.cpp b/Source/core/dom/Fullscreen.cpp
index 84473a615656305dfbe5b72854fbf478644f13d4..14dbbd8614dd40befb4c00aefa5aea233ee679a1 100644
--- a/Source/core/dom/Fullscreen.cpp
+++ b/Source/core/dom/Fullscreen.cpp
@@ -409,7 +409,7 @@ bool Fullscreen::fullscreenEnabled(Document& document)
     return fullscreenIsAllowedForAllOwners(document) && fullscreenIsSupported(document);
 }
 
-void Fullscreen::willEnterFullScreenForElement(Element* element)
+void Fullscreen::didEnterFullScreenForElement(Element* element)
 {
     ASSERT(element);
     if (!document()->isActive())
@@ -439,22 +439,13 @@ void Fullscreen::willEnterFullScreenForElement(Element* element)
     // FIXME: This should not call updateStyleIfNeeded.
     document()->setNeedsStyleRecalc(SubtreeStyleChange);
     document()->updateRenderTreeIfNeeded();
-}
-
-void Fullscreen::didEnterFullScreenForElement(Element*)
-{
-    if (!m_fullScreenElement)
-        return;
-
-    if (!document()->isActive())
-        return;
 
     m_fullScreenElement->didBecomeFullscreenElement();
 
     m_eventQueueTimer.startOneShot(0, FROM_HERE);
 }
 
-void Fullscreen::willExitFullScreenForElement(Element*)
+void Fullscreen::didExitFullScreenForElement(Element*)

[falken, 2014/08/25 05:07:54]

Should we remove the unused parameter?

[philipj_slow, 2014/08/25 08:06:30]

Definitely, but I thought it might be cleaner to do it in a CL that moves all
knowledge about pending fullscreen elements from FullscreenController to
Fullscreen. (Need to do that because there can be several pending requests.)

 {
     if (!m_fullScreenElement)
         return;
@@ -463,15 +454,6 @@ void Fullscreen::willExitFullScreenForElement(Element*)
         return;
 
     m_fullScreenElement->willStopBeingFullscreenElement();
-}
-
-void Fullscreen::didExitFullScreenForElement(Element*)
-{
-    if (!m_fullScreenElement)
-        return;
-
-    if (!document()->isActive())
-        return;
 
     m_fullScreenElement->setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(false);