diff options
| author | Jason Kersey <kerz@google.com> | 2016-03-07 21:34:16 -0800 |
|---|---|---|
| committer | Jason Kersey <kerz@google.com> | 2016-03-08 05:36:04 +0000 |
| commit | 809c63a4361b94a5bb1db7eb5de47cbf64adbe5d (patch) | |
| tree | c6fa384781c1e6d836d3fcbc7a25c120123e2fa1 | |
| parent | 847372adb15c426f3e89dddbff5d68ce823e30a5 (diff) | |
| download | chromium_src-809c63a4361b94a5bb1db7eb5de47cbf64adbe5d.zip chromium_src-809c63a4361b94a5bb1db7eb5de47cbf64adbe5d.tar.gz chromium_src-809c63a4361b94a5bb1db7eb5de47cbf64adbe5d.tar.bz2 | |
Fix merge conflict cleanup from https://codereview.chromium.org/1770913004
TBR=chrishtr
BUG=590856
Review URL: https://codereview.chromium.org/1778433002 .
Cr-Commit-Position: refs/branch-heads/2623@{#597}
Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
| -rw-r--r-- | components/plugins/renderer/webview_plugin.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/components/plugins/renderer/webview_plugin.cc b/components/plugins/renderer/webview_plugin.cc index 6ab7899..e66e821 100644 --- a/components/plugins/renderer/webview_plugin.cc +++ b/components/plugins/renderer/webview_plugin.cc @@ -298,9 +298,7 @@ void WebViewPlugin::scheduleAnimation() { // but after layout is done, and it is illegal to dirty earlier // lifecycle stages during later ones. if (container_) { - // This should never happen; see also crbug.com/545039 for context. - CHECK(!is_painting_); - container_->scheduleAnimation(); + container_->setNeedsLayout(); } } |