Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / FullscreenController.cpp

diff --git a/src/third_party/WebKit/Source/web/FullscreenController.cpp b/src/third_party/WebKit/Source/web/FullscreenController.cpp
index 46314ce..44a6b33 100644 (file)
--- a/src/third_party/WebKit/Source/web/FullscreenController.cpp
+++ b/src/third_party/WebKit/Source/web/FullscreenController.cpp
@@ -29,17 +29,17 @@
  */
 
 #include "config.h"
-#include "FullscreenController.h"
+#include "web/FullscreenController.h"
 
 #include "RuntimeEnabledFeatures.h"
-#include "WebFrame.h"
-#include "WebViewClient.h"
-#include "WebViewImpl.h"
 #include "core/dom/Document.h"
 #include "core/dom/FullscreenElementStack.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLMediaElement.h"
 #include "platform/LayoutTestSupport.h"
+#include "public/web/WebFrame.h"
+#include "public/web/WebViewClient.h"
+#include "web/WebViewImpl.h"
 
 using namespace WebCore;
 
@@ -81,7 +81,8 @@ void FullscreenController::didEnterFullScreen()
             if (!m_exitFullscreenPageScaleFactor) {
                 m_exitFullscreenPageScaleFactor = m_webViewImpl->pageScaleFactor();
                 m_exitFullscreenScrollOffset = m_webViewImpl->mainFrame()->scrollOffset();
-                m_webViewImpl->setPageScaleFactorPreservingScrollOffset(1.0f);
+                m_exitFullscreenPinchViewportOffset = m_webViewImpl->pinchViewportOffset();
+                m_webViewImpl->setPageScaleFactor(1.0f);
             }
 
             FullscreenElementStack::from(*doc).webkitDidEnterFullScreenForElement(0);
@@ -126,8 +127,9 @@ void FullscreenController::didExitFullScreen()
         if (FullscreenElementStack* fullscreen = FullscreenElementStack::fromIfExists(*doc)) {
             if (fullscreen->webkitIsFullScreen()) {
                 if (m_exitFullscreenPageScaleFactor) {
-                    m_webViewImpl->setPageScaleFactor(m_exitFullscreenPageScaleFactor,
-                        WebPoint(m_exitFullscreenScrollOffset.width(), m_exitFullscreenScrollOffset.height()));
+                    m_webViewImpl->setPageScaleFactor(m_exitFullscreenPageScaleFactor);
+                    m_webViewImpl->setMainFrameScrollOffset(IntPoint(m_exitFullscreenScrollOffset));
+                    m_webViewImpl->setPinchViewportOffset(m_exitFullscreenPinchViewportOffset);
                     m_exitFullscreenPageScaleFactor = 0;
                     m_exitFullscreenScrollOffset = IntSize();
                 }