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

Side by Side Diff: Source/core/page/scrolling/ScrollingCoordinator.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) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 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 30 matching lines...) Expand all
41 namespace blink { 41 namespace blink {
42 42
43 typedef unsigned MainThreadScrollingReasons; 43 typedef unsigned MainThreadScrollingReasons;
44 44
45 class LocalFrame; 45 class LocalFrame;
46 class FrameView; 46 class FrameView;
47 class GraphicsLayer; 47 class GraphicsLayer;
48 class Page; 48 class Page;
49 class Region; 49 class Region;
50 class ScrollableArea; 50 class ScrollableArea;
51 class WebCompositorAnimationTimeline;
52 51
53 class CORE_EXPORT ScrollingCoordinator final : public NoBaseWillBeGarbageCollect edFinalized<ScrollingCoordinator> { 52 class CORE_EXPORT ScrollingCoordinator final : public NoBaseWillBeGarbageCollect edFinalized<ScrollingCoordinator> {
54 WTF_MAKE_NONCOPYABLE(ScrollingCoordinator); 53 WTF_MAKE_NONCOPYABLE(ScrollingCoordinator);
55 public: 54 public:
56 static PassOwnPtrWillBeRawPtr<ScrollingCoordinator> create(Page*); 55 static PassOwnPtrWillBeRawPtr<ScrollingCoordinator> create(Page*);
57 56
58 ~ScrollingCoordinator(); 57 ~ScrollingCoordinator();
59 DECLARE_TRACE(); 58 DECLARE_TRACE();
60 59
61 void willBeDestroyed(); 60 void willBeDestroyed();
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 void setShouldHandleScrollGestureOnMainThreadRegion(const Region&); 144 void setShouldHandleScrollGestureOnMainThreadRegion(const Region&);
146 void setTouchEventTargetRects(LayerHitTestRects&); 145 void setTouchEventTargetRects(LayerHitTestRects&);
147 void computeTouchEventTargetRects(LayerHitTestRects&); 146 void computeTouchEventTargetRects(LayerHitTestRects&);
148 147
149 WebScrollbarLayer* addWebScrollbarLayer(ScrollableArea*, ScrollbarOrientatio n, PassOwnPtr<WebScrollbarLayer>); 148 WebScrollbarLayer* addWebScrollbarLayer(ScrollableArea*, ScrollbarOrientatio n, PassOwnPtr<WebScrollbarLayer>);
150 WebScrollbarLayer* getWebScrollbarLayer(ScrollableArea*, ScrollbarOrientatio n); 149 WebScrollbarLayer* getWebScrollbarLayer(ScrollableArea*, ScrollbarOrientatio n);
151 void removeWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation); 150 void removeWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation);
152 151
153 bool frameViewIsDirty() const; 152 bool frameViewIsDirty() const;
154 153
155 OwnPtr<WebCompositorAnimationTimeline> m_programmaticScrollAnimatorTimeline;
156
157 using ScrollbarMap = WillBeHeapHashMap<RawPtrWillBeMember<ScrollableArea>, O wnPtr<WebScrollbarLayer>>; 154 using ScrollbarMap = WillBeHeapHashMap<RawPtrWillBeMember<ScrollableArea>, O wnPtr<WebScrollbarLayer>>;
158 ScrollbarMap m_horizontalScrollbars; 155 ScrollbarMap m_horizontalScrollbars;
159 ScrollbarMap m_verticalScrollbars; 156 ScrollbarMap m_verticalScrollbars;
160 HashSet<const DeprecatedPaintLayer*> m_layersWithTouchRects; 157 HashSet<const DeprecatedPaintLayer*> m_layersWithTouchRects;
161 bool m_wasFrameScrollable; 158 bool m_wasFrameScrollable;
162 159
163 MainThreadScrollingReasons m_lastMainThreadScrollingReasons; 160 MainThreadScrollingReasons m_lastMainThreadScrollingReasons;
164 }; 161 };
165 162
166 } // namespace blink 163 } // namespace blink
167 164
168 #endif // ScrollingCoordinator_h 165 #endif // ScrollingCoordinator_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698