OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Neither the name of Google Inc. nor the names of its | 10 * * Neither the name of Google Inc. nor the names of its |
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
331 adjustedTouches.append(&touchEventContext->touches()); | 331 adjustedTouches.append(&touchEventContext->touches()); |
332 adjustedTargetTouches.append(&touchEventContext->targetTouches()); | 332 adjustedTargetTouches.append(&touchEventContext->targetTouches()); |
333 adjustedChangedTouches.append(&touchEventContext->changedTouches()); | 333 adjustedChangedTouches.append(&touchEventContext->changedTouches()); |
334 treeScopes.append(&m_treeScopeEventContexts[i]->treeScope()); | 334 treeScopes.append(&m_treeScopeEventContexts[i]->treeScope()); |
335 } | 335 } |
336 | 336 |
337 adjustTouchList(node, touchEvent.touches(), adjustedTouches, treeScopes); | 337 adjustTouchList(node, touchEvent.touches(), adjustedTouches, treeScopes); |
338 adjustTouchList(node, touchEvent.targetTouches(), adjustedTargetTouches, tre eScopes); | 338 adjustTouchList(node, touchEvent.targetTouches(), adjustedTargetTouches, tre eScopes); |
339 adjustTouchList(node, touchEvent.changedTouches(), adjustedChangedTouches, t reeScopes); | 339 adjustTouchList(node, touchEvent.changedTouches(), adjustedChangedTouches, t reeScopes); |
340 | 340 |
341 // FIXME: Why aren't we updating the event at all? We're building up these | |
342 // adjusted TouchLists and throwing them away! | |
343 | |
rjkroege
2014/05/02 20:33:50
do the layout tests still pass if you comment them
Rick Byers
2014/05/02 21:24:15
Ah, it looks like I misunderstood the oilpannery h
| |
341 #ifndef NDEBUG | 344 #ifndef NDEBUG |
342 for (size_t i = 0; i < m_treeScopeEventContexts.size(); ++i) { | 345 for (size_t i = 0; i < m_treeScopeEventContexts.size(); ++i) { |
343 TreeScope& treeScope = m_treeScopeEventContexts[i]->treeScope(); | 346 TreeScope& treeScope = m_treeScopeEventContexts[i]->treeScope(); |
344 TouchEventContext* touchEventContext = m_treeScopeEventContexts[i]->touc hEventContext(); | 347 TouchEventContext* touchEventContext = m_treeScopeEventContexts[i]->touc hEventContext(); |
345 checkReachability(treeScope, touchEventContext->touches()); | 348 checkReachability(treeScope, touchEventContext->touches()); |
346 checkReachability(treeScope, touchEventContext->targetTouches()); | 349 checkReachability(treeScope, touchEventContext->targetTouches()); |
347 checkReachability(treeScope, touchEventContext->changedTouches()); | 350 checkReachability(treeScope, touchEventContext->changedTouches()); |
348 } | 351 } |
349 #endif | 352 #endif |
350 } | 353 } |
(...skipping 19 matching lines...) Expand all Loading... | |
370 ASSERT(touchList.item(i)->target()->toNode()->treeScope().isInclusiveOld erSiblingShadowRootOrAncestorTreeScopeOf(treeScope)); | 373 ASSERT(touchList.item(i)->target()->toNode()->treeScope().isInclusiveOld erSiblingShadowRootOrAncestorTreeScopeOf(treeScope)); |
371 } | 374 } |
372 #endif | 375 #endif |
373 | 376 |
374 void EventPath::trace(Visitor* visitor) | 377 void EventPath::trace(Visitor* visitor) |
375 { | 378 { |
376 visitor->trace(m_event); | 379 visitor->trace(m_event); |
377 } | 380 } |
378 | 381 |
379 } // namespace | 382 } // namespace |
OLD | NEW |