diff options
| author | Jason Kersey <kerz@google.com> | 2016-03-07 22:40:23 -0800 |
|---|---|---|
| committer | Jason Kersey <kerz@google.com> | 2016-03-08 06:42:26 +0000 |
| commit | 50253582df8776c1f2f778dec3cb20ad9fd40014 (patch) | |
| tree | 026345b49a3c4d41a8c14a1af21c14df7d722bef | |
| parent | 75eb3970f8b5d00b2ad26bb55164f86fbe5d72b4 (diff) | |
| download | chromium_src-50253582df8776c1f2f778dec3cb20ad9fd40014.zip chromium_src-50253582df8776c1f2f778dec3cb20ad9fd40014.tar.gz chromium_src-50253582df8776c1f2f778dec3cb20ad9fd40014.tar.bz2 | |
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}
| -rw-r--r-- | components/plugins/renderer/webview_plugin.cc | 4 |
1 files 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(); } } |