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

third_party/WebKit/Source/core/frame/FrameView.cpp

Index: third_party/WebKit/Source/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 477d666592a2d205d7ae5f939bbba32220908321..ed51fa17fdfab0fe1bb1bd72c898a502c9916795 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -398,10 +398,11 @@ void FrameView::setFrameRect(const IntRect& newRect)
     const bool frameSizeChanged = oldRect.size() != newRect.size();
 
     m_needsScrollbarsUpdate = frameSizeChanged;
-    // If layout is clean then update scrollbars immediately otherwise wait
-    // for layout to ensure content size is correct too.
-    if (!needsLayout())
-        updateScrollbarsIfNeeded();
+    // TODO(wjmaclean): find out why scrollbars fail to resize for complex
+    // subframes after changing the zoom level. For now always calling
+    // updateScrollbarsIfNeeded() here fixes the issue, but it would be good to
+    // discover the deeper cause of this. http://crbug.com/607987.
+    updateScrollbarsIfNeeded();
 
     frameRectsChanged();