diff options
author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-17 23:58:53 +0000 |
---|---|---|
committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-17 23:58:53 +0000 |
commit | 1ce6fcbe23841127d24e1d12d7fa06584999c5bd (patch) | |
tree | c510f209ab9a2e64758f3f4bf8b027053e061505 /webkit/renderer/compositor_bindings/web_compositor_support_impl.cc | |
parent | ad82d97e9c5945edca34a4542e120b180225dbd6 (diff) | |
download | chromium_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 'webkit/renderer/compositor_bindings/web_compositor_support_impl.cc')
-rw-r--r-- | webkit/renderer/compositor_bindings/web_compositor_support_impl.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/webkit/renderer/compositor_bindings/web_compositor_support_impl.cc b/webkit/renderer/compositor_bindings/web_compositor_support_impl.cc index 51bb621..a49de09 100644 --- a/webkit/renderer/compositor_bindings/web_compositor_support_impl.cc +++ b/webkit/renderer/compositor_bindings/web_compositor_support_impl.cc @@ -19,7 +19,6 @@ #include "webkit/renderer/compositor_bindings/web_image_layer_impl.h" #include "webkit/renderer/compositor_bindings/web_layer_impl.h" #include "webkit/renderer/compositor_bindings/web_nine_patch_layer_impl.h" -#include "webkit/renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.h" #include "webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.h" #include "webkit/renderer/compositor_bindings/web_solid_color_layer_impl.h" #include "webkit/renderer/compositor_bindings/web_transform_animation_curve_impl.h" @@ -41,9 +40,6 @@ using blink::WebScrollbar; using blink::WebScrollbarLayer; using blink::WebScrollbarThemeGeometry; using blink::WebScrollbarThemePainter; -#if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED -using blink::WebScrollOffsetAnimationCurve; -#endif using blink::WebSolidColorLayer; using blink::WebTransformAnimationCurve; using blink::WebTransformOperations; @@ -110,15 +106,6 @@ WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() { return new WebFloatAnimationCurveImpl(); } -#if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED -WebScrollOffsetAnimationCurve* -WebCompositorSupportImpl::createScrollOffsetAnimationCurve( - blink::WebFloatPoint target_value, - blink::WebAnimationCurve::TimingFunctionType timing_function) { - return new WebScrollOffsetAnimationCurveImpl(target_value, timing_function); -} -#endif - WebTransformAnimationCurve* WebCompositorSupportImpl::createTransformAnimationCurve() { return new WebTransformAnimationCurveImpl(); |