From 50253582df8776c1f2f778dec3cb20ad9fd40014 Mon Sep 17 00:00:00 2001 From: Jason Kersey Date: Mon, 7 Mar 2016 22:40:23 -0800 Subject: Fix merge conflict cleanup from https://codereview.chromium.org/1770913004 TBR=chrishtr BUG=590856 Fix merge conflict cleanup from https://codereview.chromium.org/1770913004 TBR=chrishtr BUG=590856 Review URL: https://codereview.chromium.org/1775803003 . Cr-Commit-Position: refs/branch-heads/2623@{#599} Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907} --- components/plugins/renderer/webview_plugin.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/plugins/renderer/webview_plugin.cc b/components/plugins/renderer/webview_plugin.cc index e66e821..72ce929 100644 --- a/components/plugins/renderer/webview_plugin.cc +++ b/components/plugins/renderer/webview_plugin.cc @@ -283,7 +283,7 @@ void WebViewPlugin::didInvalidateRect(const WebRect& rect) { void WebViewPlugin::didUpdateLayoutSize(const WebSize&) { if (container_) - container_->setNeedsLayout(); + container_->scheduleAnimation(); } void WebViewPlugin::didChangeCursor(const WebCursorInfo& cursor) { @@ -298,7 +298,7 @@ void WebViewPlugin::scheduleAnimation() { // but after layout is done, and it is illegal to dirty earlier // lifecycle stages during later ones. if (container_) { - container_->setNeedsLayout(); + container_->scheduleAnimation(); } } -- cgit v1.1