Source/WebCore/page/scrolling/chromium/ScrollingCoordinatorChromium.h - Issue 11635024: Merge 137939

Side by Side Diff: Source/WebCore/page/scrolling/chromium/ScrollingCoordinatorChromium.h

Issue 11635024: Merge 137939 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/

Patch Set: Created 8 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« no previous file with comments | « Source/WebCore/page/scrolling/ScrollingCoordinator.cpp ('k') | Source/WebCore/page/scrolling/chromium/ScrollingCoordinatorChromium.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) 2012 Apple Inc. All rights reserved.	2 * Copyright (C) 2012 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 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
61	61

62 // Mark/unmark a layer as a container for fixed position layers.	62 // Mark/unmark a layer as a container for fixed position layers.

63 virtual void setLayerIsContainerForFixedPositionLayers(GraphicsLayer*, bool) ;	63 virtual void setLayerIsContainerForFixedPositionLayers(GraphicsLayer*, bool) ;

64	64

65 // Attach/detach layer position to ancestor fixed position container.	65 // Attach/detach layer position to ancestor fixed position container.

66 virtual void setLayerIsFixedToContainerLayer(GraphicsLayer*, bool);	66 virtual void setLayerIsFixedToContainerLayer(GraphicsLayer*, bool);

67	67

68 // Should be called whenever the scrollable layer for the given scroll area changes.	68 // Should be called whenever the scrollable layer for the given scroll area changes.

69 virtual void scrollableAreaScrollLayerDidChange(ScrollableArea, GraphicsLay er);	69 virtual void scrollableAreaScrollLayerDidChange(ScrollableArea, GraphicsLay er);

70	70

	71 // Should be called whenever touch handlers are registered, removed, or move d.

	72 virtual void touchEventTargetRectsDidChange(const Document*) OVERRIDE;

	73

71 private:	74 private:

72 virtual void recomputeWheelEventHandlerCountForFrameView(FrameView*);	75 virtual void recomputeWheelEventHandlerCountForFrameView(FrameView*);

73 virtual void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScroll ingReasons);	76 virtual void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScroll ingReasons);

74	77

75 void setScrollLayer(GraphicsLayer*);	78 void setScrollLayer(GraphicsLayer*);

76 void setNonFastScrollableRegion(const Region&);	79 void setNonFastScrollableRegion(const Region&);

	80 void setTouchEventTargetRects(const Vector<IntRect>&);

77 void setWheelEventHandlerCount(unsigned);	81 void setWheelEventHandlerCount(unsigned);

78 PassOwnPtr<WebKit::WebScrollbarLayer> createScrollbarLayer(Scrollbar, WebKi t::WebLayer scrollLayer, GraphicsLayer* scrollbarGraphicsLayer, FrameView*);	82 PassOwnPtr<WebKit::WebScrollbarLayer> createScrollbarLayer(Scrollbar, WebKi t::WebLayer scrollLayer, GraphicsLayer* scrollbarGraphicsLayer, FrameView*);

79	83

80 ScrollingCoordinatorPrivate* m_private;	84 ScrollingCoordinatorPrivate* m_private;

81 };	85 };

82	86

83 } // namespace WebCore	87 } // namespace WebCore

84	88

85 #endif // ScrollingCoordinatorChromium_h	89 #endif // ScrollingCoordinatorChromium_h

OLD	NEW