Fix page zoom to be frame-centric for out-of-process frames.

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 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 3032 matching lines @@
     // TODO(alexmos): Pass in proper with sourceCapabilities.
     page()->focusController().advanceFocusAcrossFrames(
         type, toWebRemoteFrameImpl(from)->frame(), toWebLocalFrameImpl(to)->frame());
 }
 
 double WebViewImpl::zoomLevel()
 {
     return m_zoomLevel;
 }
 
-double WebViewImpl::setZoomLevel(double zoomLevel)
+double WebViewImpl::setZoomLevelForFrame(WebLocalFrame* frame, double zoomLevel)
+{
+    LocalFrame* localFrame = static_cast<WebLocalFrameImpl*>(frame)->frame();
+    return setZoomLevelForFrame(localFrame, zoomLevel);
+}
+
+double WebViewImpl::setZoomLevelForFrame(LocalFrame* frame, double zoomLevel)
 {
     if (zoomLevel < m_minimumZoomLevel)
         m_zoomLevel = m_minimumZoomLevel;
     else if (zoomLevel > m_maximumZoomLevel)
         m_zoomLevel = m_maximumZoomLevel;
     else
         m_zoomLevel = zoomLevel;
 
-    // TODO(nasko): Setting zoom level needs to be refactored to support
-    // out-of-process iframes. See https://crbug.com/528407.
-    if (mainFrame()->isWebRemoteFrame())
-        return m_zoomLevel;
-
-    LocalFrame* frame = mainFrameImpl()->frame();
     if (!WebLocalFrameImpl::pluginContainerFromFrame(frame)) {
         float zoomFactor = m_zoomFactorOverride ? m_zoomFactorOverride : static_cast<float>(zoomLevelToZoomFactor(m_zoomLevel));
         if (m_zoomFactorForDeviceScaleFactor) {
             if (m_compositorDeviceScaleFactorOverride) {
                 // Adjust the page's DSF so that DevicePixelRatio becomes m_zoomFactorForDeviceScaleFactor.
                 page()->setDeviceScaleFactor(m_zoomFactorForDeviceScaleFactor / m_compositorDeviceScaleFactorOverride);
                 zoomFactor *= m_compositorDeviceScaleFactorOverride;
             } else {
                 page()->setDeviceScaleFactor(1.f);
                 zoomFactor *= m_zoomFactorForDeviceScaleFactor;
             }
         }
         frame->setPageZoomFactor(zoomFactor);
     }
 
     return m_zoomLevel;
 }
 
+double WebViewImpl::setZoomLevel(double zoomLevel)
+{
+    // Code that wishes to set zoom level on local frames when the main frame is
+    // remote should call setZoomLevelForFrame() instead.
+    ASSERT(mainFrame()->isWebLocalFrame());
+
+    if (zoomLevel < m_minimumZoomLevel)
+        m_zoomLevel = m_minimumZoomLevel;
+    else if (zoomLevel > m_maximumZoomLevel)
+        m_zoomLevel = m_maximumZoomLevel;
+    else
+        m_zoomLevel = zoomLevel;
+
+    return setZoomLevelForFrame(mainFrameImpl()->frame(), m_zoomLevel);
+}
+
 void WebViewImpl::zoomLimitsChanged(double minimumZoomLevel,
                                     double maximumZoomLevel)
 {
     m_minimumZoomLevel = minimumZoomLevel;
     m_maximumZoomLevel = maximumZoomLevel;
     m_client->zoomLimitsChanged(m_minimumZoomLevel, m_maximumZoomLevel);
 }
 
 float WebViewImpl::textZoomFactor()
 {
@@ skipping 1496 matching lines @@
 {
     // TODO(oshima): Investigate if this should return the ScreenInfo's scale factor rather than
     // page's scale factor, which can be 1 in use-zoom-for-dsf mode.
     if (!page())
         return 1;
 
     return page()->deviceScaleFactor();
 }
 
 } // namespace blink