Changeset 163677 in webkit
- Timestamp:
- Feb 7, 2014 6:19:42 PM (10 years ago)
- Location:
- trunk/Source
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r163675 r163677 1 2014-02-07 Simon Fraser <simon.fraser@apple.com> 2 3 Encode requestedScrollPosition on ScrollingStateScrollingNodes to send to the UI process 4 https://bugs.webkit.org/show_bug.cgi?id=128416 5 6 Reviewed by Tim Horton. 7 8 Change requestedScrollPosition() to be a FloatPoint, and export 9 ScrollingStateScrollingNode::setRequestedScrollPosition(WebCore::FloatPoint const&, bool) 10 for WK2. 11 12 * WebCore.exp.in: 13 * page/scrolling/ScrollingStateScrollingNode.cpp: 14 (WebCore::ScrollingStateScrollingNode::setRequestedScrollPosition): 15 * page/scrolling/ScrollingStateScrollingNode.h: 16 1 17 2014-02-07 Beth Dakin <bdakin@apple.com> 2 18 -
trunk/Source/WebCore/WebCore.exp.in
r163654 r163677 3048 3048 __ZN7WebCore27ScrollingStateScrollingNode25setWheelEventHandlerCountEj 3049 3049 __ZN7WebCore27ScrollingStateScrollingNode26setNonFastScrollableRegionERKNS_6RegionE 3050 __ZN7WebCore27ScrollingStateScrollingNode26setRequestedScrollPositionERKNS_10FloatPointEb 3050 3051 __ZN7WebCore27ScrollingStateScrollingNode27setScrollableAreaParametersERKNS_24ScrollableAreaParametersE 3051 3052 __ZN7WebCore27ScrollingStateScrollingNode30setSynchronousScrollingReasonsEj -
trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp
r163231 r163677 187 187 } 188 188 189 void ScrollingStateScrollingNode::setRequestedScrollPosition(const IntPoint& requestedScrollPosition, bool representsProgrammaticScroll)189 void ScrollingStateScrollingNode::setRequestedScrollPosition(const FloatPoint& requestedScrollPosition, bool representsProgrammaticScroll) 190 190 { 191 191 m_requestedScrollPosition = requestedScrollPosition; … … 286 286 if (m_requestedScrollPosition != IntPoint()) { 287 287 writeIndent(ts, indent + 1); 288 ts << "(requested scroll position " << m_requestedScrollPosition.x() << " " << m_requestedScrollPosition.y() << ")\n";288 ts << "(requested scroll position " << TextStream::FormatNumberRespectingIntegers(m_requestedScrollPosition.x()) << " " << TextStream::FormatNumberRespectingIntegers(m_requestedScrollPosition.y()) << ")\n"; 289 289 } 290 290 -
trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h
r163231 r163677 100 100 void setScrollBehaviorForFixedElements(ScrollBehaviorForFixedElements); 101 101 102 const IntPoint& requestedScrollPosition() const { return m_requestedScrollPosition; } 103 void setRequestedScrollPosition(const IntPoint&, bool representsProgrammaticScroll); 104 102 const FloatPoint& requestedScrollPosition() const { return m_requestedScrollPosition; } 103 bool requestedScrollPositionRepresentsProgrammaticScroll() const { return m_requestedScrollPositionRepresentsProgrammaticScroll; } 104 void setRequestedScrollPosition(const FloatPoint&, bool representsProgrammaticScroll); 105 105 106 int headerHeight() const { return m_headerHeight; } 106 107 void setHeaderHeight(int); … … 126 127 #endif 127 128 void setScrollbarPaintersFromScrollbars(Scrollbar* verticalScrollbar, Scrollbar* horizontalScrollbar); 128 129 bool requestedScrollPositionRepresentsProgrammaticScroll() const { return m_requestedScrollPositionRepresentsProgrammaticScroll; }130 129 131 130 virtual void dumpProperties(TextStream&, int indent) const override; … … 157 156 int m_headerHeight; 158 157 int m_footerHeight; 159 IntPoint m_requestedScrollPosition;158 FloatPoint m_requestedScrollPosition; 160 159 bool m_requestedScrollPositionRepresentsProgrammaticScroll; 161 160 }; -
trunk/Source/WebKit2/ChangeLog
r163676 r163677 1 2014-02-07 Simon Fraser <simon.fraser@apple.com> 2 3 Encode requestedScrollPosition on ScrollingStateScrollingNodes to send to the UI process 4 https://bugs.webkit.org/show_bug.cgi?id=128416 5 6 Reviewed by Tim Horton. 7 8 Encode and decode requestedScrollPosition() and requestedScrollPositionRepresentsProgrammaticScroll(), 9 which can't use the macros because the setter takes both arguments. 10 11 The UI process needs this to notice programmatic scrolls. 12 13 * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp: 14 (ArgumentCoder<ScrollingStateScrollingNode>::encode): 15 (ArgumentCoder<ScrollingStateScrollingNode>::decode): 16 1 17 2014-02-07 Simon Fraser <simon.fraser@apple.com> 2 18 -
trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp
r163516 r163677 119 119 SCROLLING_NODE_ENCODE(ScrollableAreaParams, scrollableAreaParameters) 120 120 SCROLLING_NODE_ENCODE_ENUM(BehaviorForFixedElements, scrollBehaviorForFixedElements) 121 // FIXME: encode requestedScrollPosition? 121 SCROLLING_NODE_ENCODE(RequestedScrollPosition, requestedScrollPosition) 122 SCROLLING_NODE_ENCODE(RequestedScrollPosition, requestedScrollPositionRepresentsProgrammaticScroll) 122 123 SCROLLING_NODE_ENCODE(HeaderHeight, headerHeight) 123 124 SCROLLING_NODE_ENCODE(FooterHeight, footerHeight) … … 155 156 SCROLLING_NODE_DECODE(ScrollableAreaParams, ScrollableAreaParameters, setScrollableAreaParameters); 156 157 SCROLLING_NODE_DECODE_ENUM(BehaviorForFixedElements, ScrollBehaviorForFixedElements, setScrollBehaviorForFixedElements); 157 // FIXME: decode requestedScrollPosition? 158 159 if (node.hasChangedProperty(ScrollingStateScrollingNode::RequestedScrollPosition)) { 160 FloatPoint scrollPosition; 161 if (!decoder.decode(scrollPosition)) 162 return false; 163 164 bool representsProgrammaticScroll; 165 if (!decoder.decode(representsProgrammaticScroll)) 166 return false; 167 168 node.setRequestedScrollPosition(scrollPosition, representsProgrammaticScroll); 169 } 170 158 171 SCROLLING_NODE_DECODE(HeaderHeight, int, setHeaderHeight); 159 172 SCROLLING_NODE_DECODE(FooterHeight, int, setFooterHeight);
Note: See TracChangeset
for help on using the changeset viewer.