diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-21 14:09:57 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 15:14:36 +0100 |
| commit | eb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch) | |
| tree | 2c7c940e1dbee81b89d935626110816b494aa32c /chromium/ui/surface | |
| parent | 9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff) | |
| download | qtwebengine-chromium-eb32ba6f51d0c21d58cd7d89785285ff8fa64624.tar.gz | |
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/ui/surface')
| -rw-r--r-- | chromium/ui/surface/accelerated_surface_win.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chromium/ui/surface/accelerated_surface_win.cc b/chromium/ui/surface/accelerated_surface_win.cc index 74ebdac6b1f..3b86db01ad4 100644 --- a/chromium/ui/surface/accelerated_surface_win.cc +++ b/chromium/ui/surface/accelerated_surface_win.cc @@ -728,7 +728,6 @@ void AcceleratedPresenter::DoPresentAndAcknowledge( return; } -#if !defined(USE_AURA) // If the window is a different size than the swap chain that is being // presented then drop the frame. gfx::Size window_size = GetWindowSize(); @@ -751,7 +750,7 @@ void AcceleratedPresenter::DoPresentAndAcknowledge( "windowheight", window_size.height()); return; } -#endif + // Round up size so the swap chain is not continuously resized with the // surface, which could lead to memory fragmentation. const int kRound = 64; |