Source/core/page/scrolling/ScrollingCoordinator.h - Issue 76983003: Revert "Ignore should-scroll-on-main-thread if main frame is not scrollable"

Side by Side Diff: Source/core/page/scrolling/ScrollingCoordinator.h

Issue 76983003: Revert "Ignore should-scroll-on-main-thread if main frame is not scrollable" (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log

« no previous file with comments | « LayoutTests/compositing/overflow/ignore-main-thread-scroll-reasons-when-main-frame-not-scrollable-expected.txt ('k') | Source/core/page/scrolling/ScrollingCoordinator.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 134 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
145 bool touchHitTestingEnabled() const;	145 bool touchHitTestingEnabled() const;

146 void setShouldHandleScrollGestureOnMainThreadRegion(const Region&);	146 void setShouldHandleScrollGestureOnMainThreadRegion(const Region&);

147 void setTouchEventTargetRects(const LayerHitTestRects&);	147 void setTouchEventTargetRects(const LayerHitTestRects&);

148 void computeTouchEventTargetRects(LayerHitTestRects&);	148 void computeTouchEventTargetRects(LayerHitTestRects&);

149 void setWheelEventHandlerCount(unsigned);	149 void setWheelEventHandlerCount(unsigned);

150	150

151 blink::WebScrollbarLayer* addWebScrollbarLayer(ScrollableArea*, ScrollbarOri entation, PassOwnPtr<blink::WebScrollbarLayer>);	151 blink::WebScrollbarLayer* addWebScrollbarLayer(ScrollableArea*, ScrollbarOri entation, PassOwnPtr<blink::WebScrollbarLayer>);

152 blink::WebScrollbarLayer* getWebScrollbarLayer(ScrollableArea*, ScrollbarOri entation);	152 blink::WebScrollbarLayer* getWebScrollbarLayer(ScrollableArea*, ScrollbarOri entation);

153 void removeWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation);	153 void removeWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation);

154	154

	155

155 typedef HashMap<ScrollableArea*, OwnPtr<blink::WebScrollbarLayer> > Scrollba rMap;	156 typedef HashMap<ScrollableArea*, OwnPtr<blink::WebScrollbarLayer> > Scrollba rMap;

156 ScrollbarMap m_horizontalScrollbars;	157 ScrollbarMap m_horizontalScrollbars;

157 ScrollbarMap m_verticalScrollbars;	158 ScrollbarMap m_verticalScrollbars;

158 HashSet<const RenderLayer*> m_layersWithTouchRects;	159 HashSet<const RenderLayer*> m_layersWithTouchRects;

159 bool m_wasFrameScrollable;

160

161 // This is retained for testing.

162 MainThreadScrollingReasons m_lastMainThreadScrollingReasons;

163 };	160 };

164	161

165 } // namespace WebCore	162 } // namespace WebCore

166	163

167 #endif // ScrollingCoordinator_h	164 #endif // ScrollingCoordinator_h

OLD	NEW