[Master/Overview CL] Make PageScaleFactor work for oopif subframe.

third_party/WebKit/Source/core/loader/FrameLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
@@ skipping 1305 matching lines @@
     RefPtr<SecurityOrigin> securityOrigin =
         SecurityOrigin::create(m_provisionalDocumentLoader->request().url());
     m_provisionalDocumentLoader->timing().setHasSameOriginAsPreviousDocument(
         securityOrigin->canRequest(m_frame->document()->url()));
   }
 
   if (!prepareForCommit())
     return;
 
   if (isLoadingMainFrame()) {
+    // TODO(wjmaclean): Instead of passing |m_frame| here we pass nullptr
+    // instead so the properties will be set on the WebView. We do this since,
+    // while we are loading, the WebFrameWidget for m_frame may not yet
+    // be available.
     m_frame->page()->chromeClient().setEventListenerProperties(
-        WebEventListenerClass::TouchStartOrMove,
+        nullptr, WebEventListenerClass::TouchStartOrMove,
         WebEventListenerProperties::Nothing);
     m_frame->page()->chromeClient().setEventListenerProperties(
-        WebEventListenerClass::MouseWheel, WebEventListenerProperties::Nothing);
+        nullptr, WebEventListenerClass::MouseWheel,
+        WebEventListenerProperties::Nothing);
     m_frame->page()->chromeClient().setEventListenerProperties(
-        WebEventListenerClass::TouchEndOrCancel,
+        nullptr, WebEventListenerClass::TouchEndOrCancel,
         WebEventListenerProperties::Nothing);
   }
 
   client()->transitionToCommittedForNewPage();
   m_frame->navigationScheduler().cancel();
   m_frame->editor().clearLastEditCommand();
 
   // If we are still in the process of initializing an empty document then its
   // frame is not in a consistent state for rendering, so avoid
   // setJSStatusBarText since it may cause clients to attempt to render the
@@ skipping 60 matching lines @@
     // is an old version of HistoryItem so distribute the scroll between
     // the main frame and the visual viewport as best as we can.
     if (visualViewportOffset.width() == -1 &&
         visualViewportOffset.height() == -1) {
       visualViewportOffset =
           m_currentItem->scrollOffset() -
           view->layoutViewportScrollableArea()->scrollOffset();
     }
 
     VisualViewport& visualViewport = m_frame->host()->visualViewport();
+    float originalScale = visualViewport.scale();
     if (shouldRestoreScale && shouldRestoreScroll) {
       visualViewport.setScaleAndLocation(m_currentItem->pageScaleFactor(),
                                          FloatPoint(visualViewportOffset));
     } else if (shouldRestoreScale) {
       visualViewport.setScale(m_currentItem->pageScaleFactor());
     } else if (shouldRestoreScroll) {
       visualViewport.setLocation(FloatPoint(visualViewportOffset));
     }
+    // If necessary, notify client we've restored page scale.
+    if (shouldRestoreScale && (originalScale != visualViewport.scale()))
+      client()->didRestorePageScaleFactorOnLoad(visualViewport.scale());
 
     if (ScrollingCoordinator* scrollingCoordinator =
             m_frame->page()->scrollingCoordinator())
       scrollingCoordinator->frameViewRootLayerDidChange(view);
   }
 
   documentLoader()->initialScrollState().didRestoreFromHistory = true;
 }
 
 String FrameLoader::userAgent() const {
@@ skipping 514 matching lines @@
                          m_documentLoader ? m_documentLoader->url() : String());
   return tracedValue;
 }
 
 inline void FrameLoader::takeObjectSnapshot() const {
   TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
                                       toTracedValue());
 }
 
 }  // namespace blink