Merge branch 'upstream-master' into 58-based

Change-Id: I8c280ca9068fdda9cf6276725bfb8608eccb497a

1 files changed, 10 insertions, 3 deletions

diff --git a/chromium/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp b/chromium/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
index 8a1e33f315a..ebce92cd103 100644
--- a/chromium/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
+++ b/chromium/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
@@ -197,9 +197,11 @@ void WebFrameWidgetImpl::sendResizeEventAndRepaint() {
 
 void WebFrameWidgetImpl::resizeVisualViewport(const WebSize& newSize) {
   // TODO(alexmos, kenrb): resizing behavior such as this should be changed
-  // to use Page messages.  https://crbug.com/599688.
-  page()->frameHost().visualViewport().setSize(newSize);
-  page()->frameHost().visualViewport().clampToBoundaries();
+  // to use Page messages.  This uses the visual viewport size to set size on
+  // both the WebViewImpl size and the Page's VisualViewport. If there are
+  // multiple OOPIFs on a page, this will currently be set redundantly by
+  // each of them. See https://crbug.com/599688.
+  view()->resize(newSize);
 
   view()->didUpdateFullscreenSize();
 }
@@ -226,6 +228,11 @@ void WebFrameWidgetImpl::didExitFullscreen() {
   view()->didExitFullscreen();
 }
 
+void WebFrameWidgetImpl::setSuppressFrameRequestsWorkaroundFor704763Only(
+    bool suppressFrameRequests) {
+  page()->animator().setSuppressFrameRequestsWorkaroundFor704763Only(
+      suppressFrameRequests);
+}
 void WebFrameWidgetImpl::beginFrame(double lastFrameTimeMonotonic) {
   TRACE_EVENT1("blink", "WebFrameWidgetImpl::beginFrame", "frameTime",
                lastFrameTimeMonotonic);