Source/core/page/scrolling/ScrollingCoordinator.h - Issue 18083034: Don't set scroll client for main frame

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

Issue 18083034: Don't set scroll client for main frame (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Address jamesr review Created 7 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/WebKit/chromium/tests/GraphicsLayerTest.cpp ('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 90 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
101 static String mainThreadScrollingReasonsAsText(MainThreadScrollingReasons);	101 static String mainThreadScrollingReasonsAsText(MainThreadScrollingReasons);

102 String mainThreadScrollingReasonsAsText() const;	102 String mainThreadScrollingReasonsAsText() const;

103 Region computeShouldHandleScrollGestureOnMainThreadRegion(const Frame*, cons t IntPoint& frameLocation) const;	103 Region computeShouldHandleScrollGestureOnMainThreadRegion(const Frame*, cons t IntPoint& frameLocation) const;

104	104

105 protected:	105 protected:

106 explicit ScrollingCoordinator(Page*);	106 explicit ScrollingCoordinator(Page*);

107	107

108 static GraphicsLayer* scrollLayerForScrollableArea(ScrollableArea*);	108 static GraphicsLayer* scrollLayerForScrollableArea(ScrollableArea*);

109 static GraphicsLayer* horizontalScrollbarLayerForScrollableArea(ScrollableAr ea*);	109 static GraphicsLayer* horizontalScrollbarLayerForScrollableArea(ScrollableAr ea*);

110 static GraphicsLayer* verticalScrollbarLayerForScrollableArea(ScrollableArea *);	110 static GraphicsLayer* verticalScrollbarLayerForScrollableArea(ScrollableArea *);

	111 bool isForMainFrame(ScrollableArea*) const;

111	112

112 unsigned computeCurrentWheelEventHandlerCount();	113 unsigned computeCurrentWheelEventHandlerCount();

113 GraphicsLayer* scrollLayerForFrameView(FrameView*);	114 GraphicsLayer* scrollLayerForFrameView(FrameView*);

114 GraphicsLayer* counterScrollingLayerForFrameView(FrameView*);	115 GraphicsLayer* counterScrollingLayerForFrameView(FrameView*);

115	116

116 Page* m_page;	117 Page* m_page;

117	118

118 private:	119 private:

119 void recomputeWheelEventHandlerCountForFrameView(FrameView*);	120 void recomputeWheelEventHandlerCountForFrameView(FrameView*);

120 void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReaso ns);	121 void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReaso ns);

(...skipping 13 matching lines...) Expand all Loading...
134	135

135 typedef HashMap<ScrollableArea*, OwnPtr<WebKit::WebScrollbarLayer> > Scrollb arMap;	136 typedef HashMap<ScrollableArea*, OwnPtr<WebKit::WebScrollbarLayer> > Scrollb arMap;

136 ScrollbarMap m_horizontalScrollbars;	137 ScrollbarMap m_horizontalScrollbars;

137 ScrollbarMap m_verticalScrollbars;	138 ScrollbarMap m_verticalScrollbars;

138	139

139 };	140 };

140	141

141 } // namespace WebCore	142 } // namespace WebCore

142	143

143 #endif // ScrollingCoordinator_h	144 #endif // ScrollingCoordinator_h

OLD	NEW