diff options
author | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 23:46:39 +0000 |
---|---|---|
committer | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 23:46:39 +0000 |
commit | 9ca846258555296ddbd0c61277f9e602d1f5393f (patch) | |
tree | e29dd89f0f4df83798c139fd893d5deedb157ebd /content | |
parent | 9a5045492b5e3645b11fc87ff560ce776edaf569 (diff) | |
download | chromium_src-9ca846258555296ddbd0c61277f9e602d1f5393f.zip chromium_src-9ca846258555296ddbd0c61277f9e602d1f5393f.tar.gz chromium_src-9ca846258555296ddbd0c61277f9e602d1f5393f.tar.bz2 |
Fix "Navigating from accelerated to software rendered pages doesn't repaint."
Do not consider num_swapbuffers_complete_pending when aborting DoDeferredUpdate
BUG=83826
TEST=As described in bug.
Review URL: http://codereview.chromium.org/6982053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87728 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r-- | content/renderer/render_widget.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index 17c70d0..cada95d 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -659,7 +659,8 @@ void RenderWidget::DoDeferredUpdate() { TRACE_EVENT0("renderer", "EarlyOut_UpdateReplyPending"); return; } - if (num_swapbuffers_complete_pending_ >= kMaxSwapBuffersPending) { + if (is_accelerated_compositing_active_ && + num_swapbuffers_complete_pending_ >= kMaxSwapBuffersPending) { TRACE_EVENT0("renderer", "EarlyOut_MaxSwapBuffersPending"); return; } |