summaryrefslogtreecommitdiffstats
path: root/cc/animation/animation.h
diff options
context:
space:
mode:
authordbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-17 23:58:53 +0000
committerdbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-17 23:58:53 +0000
commit1ce6fcbe23841127d24e1d12d7fa06584999c5bd (patch)
treec510f209ab9a2e64758f3f4bf8b027053e061505 /cc/animation/animation.h
parentad82d97e9c5945edca34a4542e120b180225dbd6 (diff)
downloadchromium_src-1ce6fcbe23841127d24e1d12d7fa06584999c5bd.zip
chromium_src-1ce6fcbe23841127d24e1d12d7fa06584999c5bd.tar.gz
chromium_src-1ce6fcbe23841127d24e1d12d7fa06584999c5bd.tar.bz2
Revert 245645 "Define WebScrollOffsetAnimationCurveImpl"
Broke compositor_unittests on Linux Aura Tests with error: LayerWithRealCompositorTest.DrawPixels (run #1): [ RUN ] LayerWithRealCompositorTest.DrawPixels ../../ui/compositor/layer_unittest.cc:832: Failure Value of: ReadPixels(&bitmap, gfx::Rect(viewport_size)) Actual: false Expected: true [ FAILED ] LayerWithRealCompositorTest.DrawPixels (246 ms) LayerWithRealCompositorTest.DrawPixels (run #2): [ RUN ] LayerWithRealCompositorTest.DrawPixels ../../ui/compositor/layer_unittest.cc:832: Failure Value of: ReadPixels(&bitmap, gfx::Rect(viewport_size)) Actual: false Expected: true [ FAILED ] LayerWithRealCompositorTest.DrawPixels (272 ms) LayerWithRealCompositorTest.DrawPixels (run #3): [ RUN ] LayerWithRealCompositorTest.DrawPixels ../../ui/compositor/layer_unittest.cc:832: Failure Value of: ReadPixels(&bitmap, gfx::Rect(viewport_size)) Actual: false Expected: true [ FAILED ] LayerWithRealCompositorTest.DrawPixels (259 ms) LayerWithRealCompositorTest.DrawPixels (run #4): [ RUN ] LayerWithRealCompositorTest.DrawPixels ../../ui/compositor/layer_unittest.cc:832: Failure Value of: ReadPixels(&bitmap, gfx::Rect(viewport_size)) Actual: false Expected: true [ FAILED ] LayerWithRealCompositorTest.DrawPixels (229 ms) > Define WebScrollOffsetAnimationCurveImpl > > This defines WebScrollOffsetAnimationCurveImpl, which wraps a > cc::ScrollOffsetAnimationCurve. This is needed for > implementing the CSSOM Smooth Scroll API. > > BUG=243871 > > Review URL: https://codereview.chromium.org/112933005 TBR=ajuma@chromium.org Review URL: https://codereview.chromium.org/141753007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245663 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/animation/animation.h')
-rw-r--r--cc/animation/animation.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/animation/animation.h b/cc/animation/animation.h
index f996c38..c7d53c2 100644
--- a/cc/animation/animation.h
+++ b/cc/animation/animation.h
@@ -42,8 +42,8 @@ class CC_EXPORT Animation {
Transform = 0,
Opacity,
Filter,
- ScrollOffset,
BackgroundColor,
+ ScrollOffset,
// This sentinel must be last.
TargetPropertyEnumSize
};