Clean up around methods to enter/exit fullscreen

third_party/WebKit/Source/web/FullscreenController.cpp

 /*
  * Copyright (C) 2013 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 42 matching lines @@
 }
 
 FullscreenController::FullscreenController(WebViewImpl* webViewImpl)
     : m_webViewImpl(webViewImpl)
     , m_haveEnteredFullscreen(false)
     , m_exitFullscreenPageScaleFactor(0)
     , m_isCancelingFullScreen(false)
 {
 }
 
-void FullscreenController::didEnterFullScreen()
+void FullscreenController::didEnterFullscreen()
 {
     if (!m_provisionalFullScreenElement)
         return;
 
     Element* element = m_provisionalFullScreenElement.release();
     Document& document = element->document();
     m_fullScreenFrame = document.frame();
 
     if (!m_fullScreenFrame)
         return;
 
     if (!m_haveEnteredFullscreen) {
         updatePageScaleConstraints(false);
         m_webViewImpl->setPageScaleFactor(1.0f);
         if (m_webViewImpl->mainFrame()->isWebLocalFrame())
             m_webViewImpl->mainFrame()->setScrollOffset(WebSize());
         m_webViewImpl->setVisualViewportOffset(FloatPoint());
         m_haveEnteredFullscreen = true;
     }
 
-    Fullscreen::from(document).didEnterFullScreenForElement(element);
+    Fullscreen::from(document).didEnterFullscreenForElement(element);
     DCHECK_EQ(Fullscreen::currentFullScreenElementFrom(document), element);
 
     if (isHTMLVideoElement(element)) {
         HTMLVideoElement* videoElement = toHTMLVideoElement(element);
         if (videoElement->usesOverlayFullscreenVideo() && m_webViewImpl->layerTreeView())
             m_webViewImpl->layerTreeView()->setHasTransparentBackground(true);
     }
 }
 
-void FullscreenController::didExitFullScreen()
+void FullscreenController::didExitFullscreen()
 {
     if (!m_fullScreenFrame)
         return;
 
     if (m_haveEnteredFullscreen)
         updatePageScaleConstraints(true);
 
     if (Document* document = m_fullScreenFrame->document()) {
         if (Fullscreen* fullscreen = Fullscreen::fromIfExists(*document)) {
             Element* element = fullscreen->webkitCurrentFullScreenElement();
             if (element) {
                 // When the client exits from full screen we have to call fullyExitFullscreen to notify
                 // the document. While doing that, suppress notifications back to the client.
                 m_isCancelingFullScreen = true;
                 Fullscreen::fullyExitFullscreen(*document);
                 m_isCancelingFullScreen = false;
 
                 // If the video used overlay fullscreen mode, the background was made transparent. Restore the transparency.
                 if (isHTMLVideoElement(element) && m_webViewImpl->layerTreeView())
                     m_webViewImpl->layerTreeView()->setHasTransparentBackground(m_webViewImpl->isTransparent());
 
                 if (m_haveEnteredFullscreen) {
                     m_webViewImpl->setPageScaleFactor(m_exitFullscreenPageScaleFactor);
                     if (m_webViewImpl->mainFrame()->isWebLocalFrame())
                         m_webViewImpl->mainFrame()->setScrollOffset(WebSize(m_exitFullscreenScrollOffset));
                     m_webViewImpl->setVisualViewportOffset(m_exitFullscreenVisualViewportOffset);
                 }
 
-                fullscreen->didExitFullScreenForElement();
+                fullscreen->didExitFullscreen();
             }
         }
     }
 
     m_haveEnteredFullscreen = false;
     m_fullScreenFrame.clear();
 }
 
 void FullscreenController::enterFullScreenForElement(Element* element)
 {
     // We are already transitioning to fullscreen for a different element.
     if (m_provisionalFullScreenElement) {
         m_provisionalFullScreenElement = element;
         return;
     }
 
     // We are already in fullscreen mode.
     if (m_fullScreenFrame) {
         m_provisionalFullScreenElement = element;
-        didEnterFullScreen();
+        didEnterFullscreen();
         return;
     }
 
-    // We need to store these values here rather than didEnterFullScreen since
+    // We need to store these values here rather than didEnterFullscreen since
     // by the time the latter is called, a Resize has already occured, clamping
     // the scroll offset.
     if (!m_haveEnteredFullscreen) {
         m_exitFullscreenPageScaleFactor = m_webViewImpl->pageScaleFactor();
         m_exitFullscreenScrollOffset = m_webViewImpl->mainFrame()->isWebLocalFrame() ? m_webViewImpl->mainFrame()->scrollOffset() : WebSize();
         m_exitFullscreenVisualViewportOffset = m_webViewImpl->visualViewportOffset();
     }
 
     // We need to transition to fullscreen mode.
     WebLocalFrameImpl* frame = WebLocalFrameImpl::fromFrame(element->document().frame());
@@ skipping 51 matching lines @@
     m_webViewImpl->updateMainFrameLayoutSize();
 }
 
 DEFINE_TRACE(FullscreenController)
 {
     visitor->trace(m_provisionalFullScreenElement);
     visitor->trace(m_fullScreenFrame);
 }
 
 } // namespace blink
-