[Pinch-to-zoom] Moved scale factor into PinchViewport

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 63 matching lines @@
 void FullscreenController::didEnterFullScreen()
 {
     if (!m_fullScreenFrame)
         return;
 
     if (Document* doc = m_fullScreenFrame->document()) {
         if (FullscreenElementStack::isFullScreen(*doc)) {
             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);
             if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()) {
                 Element* element = FullscreenElementStack::currentFullScreenElementFrom(*doc);
                 ASSERT(element);
                 if (isHTMLMediaElement(*element) && m_webViewImpl->layerTreeView())
                     m_webViewImpl->layerTreeView()->setHasTransparentBackground(true);
             }
         }
@@ skipping 24 matching lines @@
 
 void FullscreenController::didExitFullScreen()
 {
     if (!m_fullScreenFrame)
         return;
 
     if (Document* doc = m_fullScreenFrame->document()) {
         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();
                 }
 
                 fullscreen->webkitDidExitFullScreenForElement(0);
             }
         }
     }
 
     m_fullScreenFrame.clear();
@@ skipping 47 matching lines @@
         if (mediaElement->player())
             mediaElement->player()->hideFullscreenOverlay();
         return;
     }
     if (WebViewClient* client = m_webViewImpl->client())
         client->exitFullScreen();
 }
 
 }