Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Unified Diff: Source/core/input/EventHandler.cpp

Issue 1057603002: Expose scroll customization for touch to JS (behind REF). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address haraken's comments. Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/input/EventHandler.cpp
diff --git a/Source/core/input/EventHandler.cpp b/Source/core/input/EventHandler.cpp
index ef85ea06c88dc30d293de1ace6dffd172b79b176..72ab11b70fc2ce5b8776050b034ecef5d8c4d357 100644
--- a/Source/core/input/EventHandler.cpp
+++ b/Source/core/input/EventHandler.cpp
@@ -204,14 +204,21 @@ void recomputeScrollChain(const LocalFrame& frame, const Node& startNode,
while (curBox && !curBox->isLayoutView()) {
Node* curNode = curBox->node();
// FIXME: this should reject more elements, as part of crbug.com/410974.
- if (curNode && curNode->isElementNode())
- scrollChain.prepend(toElement(curNode));
+ if (curNode && curNode->isElementNode()) {
+ Element* curElement = toElement(curNode);
+ if (curElement == frame.document()->scrollingElement())
+ break;
+ scrollChain.prepend(curElement);
+ }
curBox = curBox->containingBlock();
}
-
- // FIXME: we should exclude the document in some cases, as part
- // of crbug.com/410974.
- scrollChain.prepend(frame.document()->documentElement());
+ // TODO(tdresser): this should sometimes be excluded, as part of crbug.com/410974.
+ // We need to ensure that the scrollingElement is always part of
+ // the scroll chain. In quirks mode, when the scrollingElement is
+ // the body, some elements may use the documentElement as their
+ // containingBlock, so we ensure the scrollingElement is added
+ // here.
+ scrollChain.prepend(frame.document()->scrollingElement());
}
EventHandler::EventHandler(LocalFrame* frame)
@@ -309,9 +316,8 @@ void EventHandler::clear()
m_targetForTouchID.clear();
m_touchSequenceDocument.clear();
m_touchSequenceUserGestureToken.clear();
- m_scrollGestureHandlingNode = nullptr;
+ clearGestureScrollState();
m_lastGestureScrollOverWidget = false;
- m_previousGestureScrolledNode = nullptr;
m_scrollbarHandlingScrollGesture = nullptr;
m_maxMouseMovedDuration = 0;
m_touchPressed = false;

Powered by Google App Engine
This is Rietveld 408576698