diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-12 19:25:17 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-12 19:25:17 +0000 |
| commit | d059942239cea4e43435f12ee781f36ea955ac3b (patch) | |
| tree | 6fa61a5b3960d41df503575934cf9c5520716b82 /ui/compositor | |
| parent | 318a6c7f41368480504cd258bf1d3ade8079b8f8 (diff) | |
| download | chromium_src-d059942239cea4e43435f12ee781f36ea955ac3b.zip chromium_src-d059942239cea4e43435f12ee781f36ea955ac3b.tar.gz chromium_src-d059942239cea4e43435f12ee781f36ea955ac3b.tar.bz2 | |
Revert of https://codereview.chromium.org/132903003/
Reason for revert: browser_test crashes on Linux ChromiumOS Tests (dbg)(2)
TBR=sky@chromium.org,vollick@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=None
Review URL: https://codereview.chromium.org/131473003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/compositor')
| -rw-r--r-- | ui/compositor/layer_animation_element.cc | 2 | ||||
| -rw-r--r-- | ui/compositor/layer_animator.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/compositor/layer_animation_element.cc b/ui/compositor/layer_animation_element.cc index f6b91f4..76f8ab7 100644 --- a/ui/compositor/layer_animation_element.cc +++ b/ui/compositor/layer_animation_element.cc @@ -219,7 +219,7 @@ class VisibilityTransition : public LayerAnimationElement { protected: virtual void OnStart(LayerAnimationDelegate* delegate) OVERRIDE { - start_ = delegate ? delegate->GetVisibilityForAnimation() : !target_; + start_ = delegate->GetVisibilityForAnimation(); } virtual bool OnProgress(double t, LayerAnimationDelegate* delegate) OVERRIDE { diff --git a/ui/compositor/layer_animator.h b/ui/compositor/layer_animator.h index a1ce619..ad3754d 100644 --- a/ui/compositor/layer_animator.h +++ b/ui/compositor/layer_animator.h @@ -34,7 +34,7 @@ class ScopedLayerAnimationSettings; // When a property of layer needs to be changed it is set by way of // LayerAnimator. This enables LayerAnimator to animate property changes. // NB: during many tests, set_disable_animations_for_test is used and causes -// all animations to complete immediately. The layer animator is ref counted +// all animations to complete immediately. The layer animation is ref counted // so that if its owning layer is deleted (and the owning layer is only other // class that should ever hold a ref ptr to a LayerAnimator), the animator can // ensure that it is not disposed of until it finishes executing. It does this |