diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-24 22:09:35 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-24 22:09:35 +0000 |
| commit | aec12f8270d113642523a8f38a994eb38f06d709 (patch) | |
| tree | efe8998e4d9d7ff736c27889c83fb45574741ae3 /ash/wm/window_animations.h | |
| parent | 8d1b9468adf90a429a3b262a6b1847a26d428032 (diff) | |
| download | chromium_src-aec12f8270d113642523a8f38a994eb38f06d709.zip chromium_src-aec12f8270d113642523a8f38a994eb38f06d709.tar.gz chromium_src-aec12f8270d113642523a8f38a994eb38f06d709.tar.bz2 | |
Revert 153291 - Fixes crash introduced @ 153047 (you can hit crash by maximizing a
window). The cross fade code deletes the layer when the animation
finishes. The newly added code was accessing members after the
animation finished and the animator was deleted, resulting in the
crash. Since I'm sure this will come up more in the future I've
restructured the code to allow for deletion when calling out like
this.
The cross fade test exercises this code path now, but I'll see about a
more focused tests shortly.
BUG=129033
TEST=covered by tests.
R=vollick@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10874064
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10882043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_animations.h')
| -rw-r--r-- | ash/wm/window_animations.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ash/wm/window_animations.h b/ash/wm/window_animations.h index 192b0e7..9ddbbac 100644 --- a/ash/wm/window_animations.h +++ b/ash/wm/window_animations.h @@ -119,6 +119,10 @@ ASH_EXPORT base::TimeDelta GetCrossFadeDuration(const gfx::Rect& old_bounds, ASH_EXPORT bool AnimateOnChildWindowVisibilityChanged( aura::Window* window, bool visible); +// Delay the old layer deletion so that test can verify the behavior of +// old layer. +ASH_EXPORT void SetDelayedOldLayerDeletionInCrossFadeForTest(bool value); + } // namespace internal } // namespace ash |