Diff
Modified: trunk/Source/WebCore/ChangeLog (220000 => 220001)
--- trunk/Source/WebCore/ChangeLog 2017-07-28 10:27:03 UTC (rev 220000)
+++ trunk/Source/WebCore/ChangeLog 2017-07-28 15:38:04 UTC (rev 220001)
@@ -1,3 +1,16 @@
+2017-07-28 Frederic Wang <fw...@igalia.cpm>
+
+ Fix typo in scrollPositionChangedViaDelegatedScrolling
+ https://bugs.webkit.org/show_bug.cgi?id=174937
+
+ Reviewed by Wenson Hsieh.
+
+ No new tests, fix typo in the inUserInteraction parameter.
+
+ * page/scrolling/ScrollingTree.cpp:
+ (WebCore::ScrollingTree::scrollPositionChangedViaDelegatedScrolling):
+ * page/scrolling/ScrollingTree.h:
+
2017-07-28 Wenson Hsieh <wenson_hs...@apple.com>
[iOS DnD] [WK1] Snapshots generated using -[DOMRange renderImageForcingBlackText:] are upside down
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (220000 => 220001)
--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2017-07-28 10:27:03 UTC (rev 220000)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2017-07-28 15:38:04 UTC (rev 220001)
@@ -102,7 +102,7 @@
downcast<ScrollingTreeScrollingNode>(*node).updateLayersAfterViewportChange(fixedPositionRect, scale);
}
-void ScrollingTree::scrollPositionChangedViaDelegatedScrolling(ScrollingNodeID nodeID, const WebCore::FloatPoint& scrollPosition, bool inUserInteration)
+void ScrollingTree::scrollPositionChangedViaDelegatedScrolling(ScrollingNodeID nodeID, const WebCore::FloatPoint& scrollPosition, bool inUserInteraction)
{
ScrollingTreeNode* node = nodeForID(nodeID);
if (!is<ScrollingTreeOverflowScrollingNode>(node))
@@ -112,7 +112,7 @@
downcast<ScrollingTreeOverflowScrollingNode>(*node).updateLayersAfterDelegatedScroll(scrollPosition);
// Update GraphicsLayers and scroll state.
- scrollingTreeNodeDidScroll(nodeID, scrollPosition, std::nullopt, inUserInteration ? ScrollingLayerPositionAction::Sync : ScrollingLayerPositionAction::Set);
+ scrollingTreeNodeDidScroll(nodeID, scrollPosition, std::nullopt, inUserInteraction ? ScrollingLayerPositionAction::Sync : ScrollingLayerPositionAction::Set);
}
void ScrollingTree::commitTreeState(std::unique_ptr<ScrollingStateTree> scrollingStateTree)
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (220000 => 220001)
--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2017-07-28 10:27:03 UTC (rev 220000)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2017-07-28 15:38:04 UTC (rev 220001)
@@ -89,7 +89,7 @@
// Delegated scrolling has scrolled a node. Update layer positions on descendant tree nodes,
// and call scrollingTreeNodeDidScroll().
- WEBCORE_EXPORT virtual void scrollPositionChangedViaDelegatedScrolling(ScrollingNodeID, const WebCore::FloatPoint& scrollPosition, bool inUserInteration);
+ WEBCORE_EXPORT virtual void scrollPositionChangedViaDelegatedScrolling(ScrollingNodeID, const WebCore::FloatPoint& scrollPosition, bool inUserInteraction);
WEBCORE_EXPORT virtual void currentSnapPointIndicesDidChange(ScrollingNodeID, unsigned horizontal, unsigned vertical) = 0;
Modified: trunk/Source/WebKit/ChangeLog (220000 => 220001)
--- trunk/Source/WebKit/ChangeLog 2017-07-28 10:27:03 UTC (rev 220000)
+++ trunk/Source/WebKit/ChangeLog 2017-07-28 15:38:04 UTC (rev 220001)
@@ -1,3 +1,14 @@
+2017-07-28 Frederic Wang <fw...@igalia.cpm>
+
+ Fix typo in scrollPositionChangedViaDelegatedScrolling
+ https://bugs.webkit.org/show_bug.cgi?id=174937
+
+ Reviewed by Wenson Hsieh.
+
+ * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h:
+ * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
+ (WebKit::ScrollingTreeOverflowScrollingNodeIOS::scrollViewDidScroll):
+
2017-07-28 Jeremy Jones <jere...@apple.com>
Remove Web prefix from WebVideoFullscreen and WebPlaybackSession classes.
Modified: trunk/Source/WebKit/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h (220000 => 220001)
--- trunk/Source/WebKit/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h 2017-07-28 10:27:03 UTC (rev 220000)
+++ trunk/Source/WebKit/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h 2017-07-28 15:38:04 UTC (rev 220001)
@@ -44,7 +44,7 @@
void overflowScrollWillStart();
void overflowScrollDidEnd();
void overflowScrollViewWillStartPanGesture();
- void scrollViewDidScroll(const WebCore::FloatPoint&, bool inUserInteration);
+ void scrollViewDidScroll(const WebCore::FloatPoint&, bool inUserInteraction);
void currentSnapPointIndicesDidChange(unsigned horizontal, unsigned vertical);
CALayer *scrollLayer() const { return m_scrollLayer.get(); }
Modified: trunk/Source/WebKit/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm (220000 => 220001)
--- trunk/Source/WebKit/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2017-07-28 10:27:03 UTC (rev 220000)
+++ trunk/Source/WebKit/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2017-07-28 15:38:04 UTC (rev 220001)
@@ -294,12 +294,12 @@
scrollingTree().scrollingTreeNodeWillStartPanGesture();
}
-void ScrollingTreeOverflowScrollingNodeIOS::scrollViewDidScroll(const FloatPoint& scrollPosition, bool inUserInteration)
+void ScrollingTreeOverflowScrollingNodeIOS::scrollViewDidScroll(const FloatPoint& scrollPosition, bool inUserInteraction)
{
if (m_updatingFromStateNode)
return;
- scrollingTree().scrollPositionChangedViaDelegatedScrolling(scrollingNodeID(), scrollPosition, inUserInteration);
+ scrollingTree().scrollPositionChangedViaDelegatedScrolling(scrollingNodeID(), scrollPosition, inUserInteraction);
}
void ScrollingTreeOverflowScrollingNodeIOS::currentSnapPointIndicesDidChange(unsigned horizontal, unsigned vertical)
