Add enterFullscreen/exitFullscreen to WebFrameClient.

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 20 matching lines @@
 #include "config.h"
 #include "web/FullscreenController.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Fullscreen.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/RuntimeEnabledFeatures.h"
-#include "public/web/WebFrame.h"
+#include "public/web/WebFrameClient.h"
 #include "public/web/WebViewClient.h"
+#include "web/WebLocalFrameImpl.h"
 #include "web/WebSettingsImpl.h"
 #include "web/WebViewImpl.h"
 
 namespace blink {
 
 PassOwnPtrWillBeRawPtr<FullscreenController> FullscreenController::create(WebViewImpl* webViewImpl)
 {
     return adoptPtrWillBeNoop(new FullscreenController(webViewImpl));
 }
 
@@ skipping 86 matching lines @@
     }
 
     // We are already in fullscreen mode.
     if (m_fullScreenFrame) {
         m_provisionalFullScreenElement = element;
         didEnterFullScreen();
         return;
     }
 
     // We need to transition to fullscreen mode.
-    if (WebViewClient* client = m_webViewImpl->client()) {
+    // FIXME: temporarily try to use WebFrameClient and WebViewClient while
+    // Chromium switches from one to the other, see https://crbug.com/374854
+    WebLocalFrameImpl* frame = WebLocalFrameImpl::fromFrame(element->document().frame());
+    if (frame && frame->client() && frame->client()->enterFullscreen()) {
+        m_provisionalFullScreenElement = element;
+    } else if (WebViewClient* client = m_webViewImpl->client()) {
         if (client->enterFullScreen())
             m_provisionalFullScreenElement = element;
     }
 }
 
 void FullscreenController::exitFullScreenForElement(Element* element)
 {
     // The client is exiting full screen, so don't send a notification.
     if (m_isCancelingFullScreen)
         return;
+
+    // FIXME: temporarily try to use WebFrameClient and WebViewClient while
+    // Chromium switches from one to the other, see https://crbug.com/374854
+    WebLocalFrameImpl* frame = WebLocalFrameImpl::fromFrame(element->document().frame());
+    if (frame && frame->client() && frame->client()->exitFullscreen())
+        return;
+
     if (WebViewClient* client = m_webViewImpl->client())
         client->exitFullScreen();
 }
 
 void FullscreenController::updateSize()
 {
     if (!isFullscreen())
         return;
 
     RenderFullScreen* renderer = Fullscreen::from(*m_fullScreenFrame->document()).fullScreenRenderer();
     if (renderer)
         renderer->updateStyle();
 }
 
 void FullscreenController::trace(Visitor* visitor)
 {
     visitor->trace(m_provisionalFullScreenElement);
     visitor->trace(m_fullScreenFrame);
 }
 
 } // namespace blink