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-18 00:28:22 +0000
committerdbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-18 00:28:22 +0000
commit429b58813bde651b4c674ddde14d2b6a575ebe6e (patch)
tree88dbe2d20b04ee2353b534f8a5314237cff7c1dd /cc/animation/animation.h
parent3f52559fdacbf3ce374b03550f3a5c63280e70a9 (diff)
downloadchromium_src-429b58813bde651b4c674ddde14d2b6a575ebe6e.zip
chromium_src-429b58813bde651b4c674ddde14d2b6a575ebe6e.tar.gz
chromium_src-429b58813bde651b4c674ddde14d2b6a575ebe6e.tar.bz2
Revert 245663 "Revert 245645 "Define WebScrollOffsetAnimationCur..."
> Revert 245645 "Define WebScrollOffsetAnimationCurveImpl" > > Broke compositor_unittests on Linux Aura Tests with error: I'm a dirty liar. > > 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 TBR=dbeam@chromium.org Review URL: https://codereview.chromium.org/141953013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245674 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 c7d53c2..f996c38 100644
--- a/cc/animation/animation.h
+++ b/cc/animation/animation.h
@@ -42,8 +42,8 @@ class CC_EXPORT Animation {
Transform = 0,
Opacity,
Filter,
- BackgroundColor,
ScrollOffset,
+ BackgroundColor,
// This sentinel must be last.
TargetPropertyEnumSize
};