Restore scale even if scroll is not restored

Source/core/page/Page.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All Rights Reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 286 matching lines @@
     if (defers == m_defersLoading)
         return;
 
     m_defersLoading = defers;
     for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (frame->isLocalFrame())
             toLocalFrame(frame)->loader().setDefersLoading(defers);
     }
 }
 
-void Page::setPageScaleFactor(float scale, const IntPoint& origin)
+void Page::setPageScaleFactor(float scale)
 {
     if (!mainFrame()->isLocalFrame())

[Nate Chapin, 2015/08/06 21:02:00]

This early exit looks like it's no longer necessary?

[majidvp, 2015/08/06 21:25:36]

Acknowledged.

         return;
 
-    FrameView* view = deprecatedLocalMainFrame()->view();
     VisualViewport& viewport = frameHost().visualViewport();
-
-    if (scale != viewport.scale()) {
-        viewport.setScale(scale);
-
-        chromeClient().pageScaleFactorChanged();
-
-        deprecatedLocalMainFrame()->loader().saveScrollState();
-    }
-
-    if (view && view->scrollPosition() != origin)
-        view->setScrollPosition(origin, ProgrammaticScroll);
+    viewport.setScale(scale);

[Nate Chapin, 2015/08/06 21:02:00]

I think this function is now only called by Internals.cpp. Can we remove it and
call setScale() directly there?

[majidvp, 2015/08/06 21:25:36]

That is true. The reasons I like to keep it are:
1- symmetry with getter pageScaleFactor()
2- hide visual viewport which is a page impl details from Internal.cpp

[bokan, 2015/08/07 15:08:01]

I agree with Nate, these methods should be removed. Though not necessary for
this patch.

 }
 
 float Page::pageScaleFactor() const
 {
     return frameHost().visualViewport().scale();
 }
 
 void Page::setDeviceScaleFactor(float scaleFactor)
 {
     if (m_deviceScaleFactor == scaleFactor)
@@ skipping 273 matching lines @@
 {
 }
 
 Page::PageClients::~PageClients()
 {
 }
 
 template class CORE_TEMPLATE_EXPORT WillBeHeapSupplement<Page>;
 
 } // namespace blink