diff options
| author | vangelis@chromium.org <vangelis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 23:03:37 +0000 |
|---|---|---|
| committer | vangelis@chromium.org <vangelis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 23:03:37 +0000 |
| commit | dcca3aa943ea83a55d0e79e0d751952e7ad54f6c (patch) | |
| tree | cd86eb33cace45bcdb4251278b4c7d40dbc8ac4f /content/renderer/render_widget.cc | |
| parent | 3363fea89d61e1a7f371b38df5da1471ec2bed0f (diff) | |
| download | chromium_src-dcca3aa943ea83a55d0e79e0d751952e7ad54f6c.zip chromium_src-dcca3aa943ea83a55d0e79e0d751952e7ad54f6c.tar.gz chromium_src-dcca3aa943ea83a55d0e79e0d751952e7ad54f6c.tar.bz2 | |
Call UpdateTextInputState() and UpdateSelectionBounds() before doing
any painting in RenderWidget::DoDeferredUpdate() to make sure we're
done with all layout that could switch us over to compositing mode.
BUG=111263
Review URL: https://chromiumcodereview.appspot.com/9419024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_widget.cc')
| -rw-r--r-- | content/renderer/render_widget.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index 99b3731..a981b6b 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -815,6 +815,12 @@ void RenderWidget::DoDeferredUpdate() { // GpuRenderingActivated message. webwidget_->layout(); + // The following two can result in further layout and possibly + // enable GPU acceleration so they need to be called before any painting + // is done. + UpdateTextInputState(); + UpdateSelectionBounds(); + // Suppress painting if nothing is dirty. This has to be done after updating // animations running layout as these may generate further invalidations. if (!paint_aggregator_.HasPendingUpdate()) { @@ -956,9 +962,6 @@ void RenderWidget::DoDeferredUpdate() { pending_update_params_.reset(); } - UpdateTextInputState(); - UpdateSelectionBounds(); - // If we're software rendering then we're done initiating the paint. if (!is_accelerated_compositing_active_) DidInitiatePaint(); |