[UseZoomForDSF] Guest view support

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 3067 matching lines @@
     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)) {
+    LocalFrame* frame = mainFrameImpl() ? mainFrameImpl()->frame() : nullptr;

[kenrb, 2016/01/15 20:09:12]

It isn't clear to me why mainFrameImpl() would return nullptr here, given that
the previous check guarantees there is not a remote main frame. If this is
needed, though, then we can remove lines 3085 and 3086, which become redundant.

[oshima, 2016/01/15 22:24:10]

It was crashing when I made the original version of this CL, but that seems to
be fixed in https://codereview.chromium.org/1546603003.
Reverted this file, thanks.

+    if (frame && !WebLocalFrameImpl::pluginContainerFromFrame(frame)) {
         float zoomFactor = m_zoomFactorOverride ? m_zoomFactorOverride : static_cast<float>(zoomLevelToZoomFactor(m_zoomLevel));
         zoomFactor *= m_zoomFactorForDeviceScaleFactor;
         frame->setPageZoomFactor(zoomFactor);
     }
 
     return m_zoomLevel;
 }
 
 void WebViewImpl::zoomLimitsChanged(double minimumZoomLevel,
                                     double maximumZoomLevel)
@@ skipping 1520 matching lines @@
 void WebViewImpl::detachPaintArtifactCompositor()
 {
     if (!m_layerTreeView)
         return;
 
     m_layerTreeView->setDeferCommits(true);
     m_layerTreeView->clearRootLayer();
 }
 
 } // namespace blink