Source/core/page/scrolling/ScrollingCoordinator.h - Issue 103583007: Ensure that if FrameView::isScrollable() is false, the assoc WebLayer is, too.

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

Issue 103583007: Ensure that if FrameView::isScrollable() is false, the assoc WebLayer is, too. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: . Created 6 years, 11 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 | « 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 139 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
150 void setShouldHandleScrollGestureOnMainThreadRegion(const Region&);	150 void setShouldHandleScrollGestureOnMainThreadRegion(const Region&);

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

152 void computeTouchEventTargetRects(LayerHitTestRects&);	152 void computeTouchEventTargetRects(LayerHitTestRects&);

153 void setWheelEventHandlerCount(unsigned);	153 void setWheelEventHandlerCount(unsigned);

154	154

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

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

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

158	158

159 bool frameViewIsScrollableIsDirty() const;	159 bool frameViewIsScrollableIsDirty() const;

	160 void updateMainFrameIsScrollable();

160	161

161 typedef HashMap<ScrollableArea*, OwnPtr<blink::WebScrollbarLayer> > Scrollba rMap;	162 typedef HashMap<ScrollableArea*, OwnPtr<blink::WebScrollbarLayer> > Scrollba rMap;

162 ScrollbarMap m_horizontalScrollbars;	163 ScrollbarMap m_horizontalScrollbars;

163 ScrollbarMap m_verticalScrollbars;	164 ScrollbarMap m_verticalScrollbars;

164 HashSet<const RenderLayer*> m_layersWithTouchRects;	165 HashSet<const RenderLayer*> m_layersWithTouchRects;

165 bool m_wasFrameScrollable;	166 bool m_wasFrameScrollable;

166	167

167 // This is retained for testing.	168 // This is retained for testing.

168 MainThreadScrollingReasons m_lastMainThreadScrollingReasons;	169 MainThreadScrollingReasons m_lastMainThreadScrollingReasons;

169 };	170 };

170	171

171 } // namespace WebCore	172 } // namespace WebCore

172	173

173 #endif // ScrollingCoordinator_h	174 #endif // ScrollingCoordinator_h

OLD	NEW