Source/core/page/scrolling/ScrollingCoordinator.h - Issue 406053002: Remove setting for disabling cc touch hit testing.

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

Issue 406053002: Remove setting for disabling cc touch hit testing. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Remove ScrollingCoordinator::touchHitTestingEnabled() Created 6 years, 5 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 | Annotate | Revision Log

« no previous file with comments | « Source/core/frame/Settings.in ('k') | Source/core/page/scrolling/ScrollingCoordinator.cpp » ('j') | no next file with comments »

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 117 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
128 bool m_touchEventTargetRectsAreDirty;	128 bool m_touchEventTargetRectsAreDirty;

129 bool m_shouldScrollOnMainThreadDirty;	129 bool m_shouldScrollOnMainThreadDirty;

130	130

131 private:	131 private:

132 bool shouldUpdateAfterCompositingChange() const { return m_scrollGestureRegi onIsDirty \|\| m_touchEventTargetRectsAreDirty \|\| frameViewIsDirty(); }	132 bool shouldUpdateAfterCompositingChange() const { return m_scrollGestureRegi onIsDirty \|\| m_touchEventTargetRectsAreDirty \|\| frameViewIsDirty(); }

133	133

134 void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReaso ns);	134 void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReaso ns);

135	135

136 bool hasVisibleSlowRepaintViewportConstrainedObjects(FrameView*) const;	136 bool hasVisibleSlowRepaintViewportConstrainedObjects(FrameView*) const;

137	137

138 bool touchHitTestingEnabled() const;

139 void setShouldHandleScrollGestureOnMainThreadRegion(const Region&);	138 void setShouldHandleScrollGestureOnMainThreadRegion(const Region&);

140 void setTouchEventTargetRects(LayerHitTestRects&);	139 void setTouchEventTargetRects(LayerHitTestRects&);

141 void computeTouchEventTargetRects(LayerHitTestRects&);	140 void computeTouchEventTargetRects(LayerHitTestRects&);

142	141

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

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

145 void removeWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation);	144 void removeWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation);

146	145

147 bool frameViewIsDirty() const;	146 bool frameViewIsDirty() const;

148	147

149 typedef HashMap<ScrollableArea*, OwnPtr<blink::WebScrollbarLayer> > Scrollba rMap;	148 typedef HashMap<ScrollableArea*, OwnPtr<blink::WebScrollbarLayer> > Scrollba rMap;

150 ScrollbarMap m_horizontalScrollbars;	149 ScrollbarMap m_horizontalScrollbars;

151 ScrollbarMap m_verticalScrollbars;	150 ScrollbarMap m_verticalScrollbars;

152 HashSet<const RenderLayer*> m_layersWithTouchRects;	151 HashSet<const RenderLayer*> m_layersWithTouchRects;

153 bool m_wasFrameScrollable;	152 bool m_wasFrameScrollable;

154	153

155 // This is retained for testing.	154 // This is retained for testing.

156 MainThreadScrollingReasons m_lastMainThreadScrollingReasons;	155 MainThreadScrollingReasons m_lastMainThreadScrollingReasons;

157 };	156 };

158	157

159 } // namespace WebCore	158 } // namespace WebCore

160	159

161 #endif // ScrollingCoordinator_h	160 #endif // ScrollingCoordinator_h

OLD	NEW