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

Unified Diff: sky/engine/core/events/EventPath.cpp

Issue 868133003: Remove touch events from Sky (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « sky/engine/core/events/EventPath.h ('k') | sky/engine/core/events/EventTypeNames.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/events/EventPath.cpp
diff --git a/sky/engine/core/events/EventPath.cpp b/sky/engine/core/events/EventPath.cpp
index cf1ef534db1e6b2716466501d844c8542360e750..b94bc538d3cac50fe7b01a2cf97e971a98f445d7 100644
--- a/sky/engine/core/events/EventPath.cpp
+++ b/sky/engine/core/events/EventPath.cpp
@@ -29,12 +29,9 @@
#include "gen/sky/core/EventNames.h"
#include "sky/engine/core/dom/Document.h"
-#include "sky/engine/core/dom/Touch.h"
-#include "sky/engine/core/dom/TouchList.h"
#include "sky/engine/core/dom/shadow/InsertionPoint.h"
#include "sky/engine/core/dom/shadow/ShadowRoot.h"
-#include "sky/engine/core/events/TouchEvent.h"
-#include "sky/engine/core/events/TouchEventContext.h"
+#include "sky/engine/core/events/Event.h"
namespace blink {
@@ -273,56 +270,4 @@ void EventPath::shrinkIfNeeded(const Node* target, const EventTarget* relatedTar
}
}
-void EventPath::adjustForTouchEvent(Node* node, TouchEvent& touchEvent)
-{
- Vector<RawPtr<TouchList> > adjustedTouches;
- Vector<RawPtr<TouchList> > adjustedTargetTouches;
- Vector<RawPtr<TouchList> > adjustedChangedTouches;
- Vector<RawPtr<TreeScope> > treeScopes;
-
- for (size_t i = 0; i < m_treeScopeEventContexts.size(); ++i) {
- TouchEventContext* touchEventContext = m_treeScopeEventContexts[i]->ensureTouchEventContext();
- adjustedTouches.append(&touchEventContext->touches());
- adjustedTargetTouches.append(&touchEventContext->targetTouches());
- adjustedChangedTouches.append(&touchEventContext->changedTouches());
- treeScopes.append(&m_treeScopeEventContexts[i]->treeScope());
- }
-
- adjustTouchList(node, touchEvent.touches(), adjustedTouches, treeScopes);
- adjustTouchList(node, touchEvent.targetTouches(), adjustedTargetTouches, treeScopes);
- adjustTouchList(node, touchEvent.changedTouches(), adjustedChangedTouches, treeScopes);
-
-#if ENABLE(ASSERT)
- for (size_t i = 0; i < m_treeScopeEventContexts.size(); ++i) {
- TreeScope& treeScope = m_treeScopeEventContexts[i]->treeScope();
- TouchEventContext* touchEventContext = m_treeScopeEventContexts[i]->touchEventContext();
- checkReachability(treeScope, touchEventContext->touches());
- checkReachability(treeScope, touchEventContext->targetTouches());
- checkReachability(treeScope, touchEventContext->changedTouches());
- }
-#endif
-}
-
-void EventPath::adjustTouchList(const Node* node, const TouchList* touchList, Vector<RawPtr<TouchList> > adjustedTouchList, const Vector<RawPtr<TreeScope> >& treeScopes)
-{
- if (!touchList)
- return;
- for (size_t i = 0; i < touchList->length(); ++i) {
- const Touch& touch = *touchList->item(i);
- RelatedTargetMap relatedNodeMap;
- buildRelatedNodeMap(touch.target()->toNode(), relatedNodeMap);
- for (size_t j = 0; j < treeScopes.size(); ++j) {
- adjustedTouchList[j]->append(touch.cloneWithNewTarget(findRelatedNode(treeScopes[j], relatedNodeMap)));
- }
- }
-}
-
-#if ENABLE(ASSERT)
-void EventPath::checkReachability(TreeScope& treeScope, TouchList& touchList)
-{
- for (size_t i = 0; i < touchList.length(); ++i)
- ASSERT(touchList.item(i)->target()->toNode()->treeScope().isInclusiveOlderSiblingShadowRootOrAncestorTreeScopeOf(treeScope));
-}
-#endif
-
} // namespace
« no previous file with comments | « sky/engine/core/events/EventPath.h ('k') | sky/engine/core/events/EventTypeNames.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698