Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Side by Side Diff: Source/platform/scroll/ScrollableArea.h

Issue 1254963011: Revert of Animations: Port ProgrammaticScrollAnimator to use compositor timelines (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@linkhigh
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 28 matching lines...) Expand all
39 namespace blink { 39 namespace blink {
40 40
41 class DoubleRect; 41 class DoubleRect;
42 class FloatPoint; 42 class FloatPoint;
43 class GraphicsLayer; 43 class GraphicsLayer;
44 class HostWindow; 44 class HostWindow;
45 class PlatformWheelEvent; 45 class PlatformWheelEvent;
46 class ProgrammaticScrollAnimator; 46 class ProgrammaticScrollAnimator;
47 struct ScrollAlignment; 47 struct ScrollAlignment;
48 class ScrollAnimator; 48 class ScrollAnimator;
49 class WebCompositorAnimationTimeline;
50 49
51 enum ScrollBehavior { 50 enum ScrollBehavior {
52 ScrollBehaviorAuto, 51 ScrollBehaviorAuto,
53 ScrollBehaviorInstant, 52 ScrollBehaviorInstant,
54 ScrollBehaviorSmooth, 53 ScrollBehaviorSmooth,
55 }; 54 };
56 55
57 enum IncludeScrollbarsInRect { 56 enum IncludeScrollbarsInRect {
58 ExcludeScrollbars, 57 ExcludeScrollbars,
59 IncludeScrollbars, 58 IncludeScrollbars,
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 261
263 virtual GraphicsLayer* layerForContainer() const; 262 virtual GraphicsLayer* layerForContainer() const;
264 virtual GraphicsLayer* layerForScrolling() const { return 0; } 263 virtual GraphicsLayer* layerForScrolling() const { return 0; }
265 virtual GraphicsLayer* layerForHorizontalScrollbar() const { return 0; } 264 virtual GraphicsLayer* layerForHorizontalScrollbar() const { return 0; }
266 virtual GraphicsLayer* layerForVerticalScrollbar() const { return 0; } 265 virtual GraphicsLayer* layerForVerticalScrollbar() const { return 0; }
267 virtual GraphicsLayer* layerForScrollCorner() const { return 0; } 266 virtual GraphicsLayer* layerForScrollCorner() const { return 0; }
268 bool hasLayerForHorizontalScrollbar() const; 267 bool hasLayerForHorizontalScrollbar() const;
269 bool hasLayerForVerticalScrollbar() const; 268 bool hasLayerForVerticalScrollbar() const;
270 bool hasLayerForScrollCorner() const; 269 bool hasLayerForScrollCorner() const;
271 270
272 void layerForScrollingDidChange(WebCompositorAnimationTimeline*); 271 void layerForScrollingDidChange();
273 272
274 void cancelScrollAnimation(); 273 void cancelScrollAnimation();
275 void cancelProgrammaticScrollAnimation(); 274 void cancelProgrammaticScrollAnimation();
276 275
277 virtual ~ScrollableArea(); 276 virtual ~ScrollableArea();
278 277
279 virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&) = 0; 278 virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&) = 0;
280 virtual void invalidateScrollCornerRect(const IntRect&) = 0; 279 virtual void invalidateScrollCornerRect(const IntRect&) = 0;
281 280
282 // Returns the default scroll style this area should scroll with when not 281 // Returns the default scroll style this area should scroll with when not
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 // vertical-lr / ltr NO NO 366 // vertical-lr / ltr NO NO
368 // vertical-lr / rtl NO YES 367 // vertical-lr / rtl NO YES
369 // vertical-rl / ltr YES NO 368 // vertical-rl / ltr YES NO
370 // vertical-rl / rtl YES YES 369 // vertical-rl / rtl YES YES
371 IntPoint m_scrollOrigin; 370 IntPoint m_scrollOrigin;
372 }; 371 };
373 372
374 } // namespace blink 373 } // namespace blink
375 374
376 #endif // ScrollableArea_h 375 #endif // ScrollableArea_h
OLDNEW
« no previous file with comments | « Source/platform/scroll/ProgrammaticScrollAnimator.cpp ('k') | Source/platform/scroll/ScrollableArea.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698