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

Side by Side Diff: third_party/WebKit/Source/core/events/EventTarget.cpp

Issue 2225813004: Added back a dropped event-type check. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
6 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 6 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
7 * (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> 7 * (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 } else if (checkTypeThenUseCount(event, EventTypeNames::unload, UseCounter:: DocumentUnloadFired)) { 572 } else if (checkTypeThenUseCount(event, EventTypeNames::unload, UseCounter:: DocumentUnloadFired)) {
573 } else if (checkTypeThenUseCount(event, EventTypeNames::DOMFocusIn, UseCount er::DOMFocusInOutEvent)) { 573 } else if (checkTypeThenUseCount(event, EventTypeNames::DOMFocusIn, UseCount er::DOMFocusInOutEvent)) {
574 } else if (checkTypeThenUseCount(event, EventTypeNames::DOMFocusOut, UseCoun ter::DOMFocusInOutEvent)) { 574 } else if (checkTypeThenUseCount(event, EventTypeNames::DOMFocusOut, UseCoun ter::DOMFocusInOutEvent)) {
575 } else if (checkTypeThenUseCount(event, EventTypeNames::focusin, UseCounter: :FocusInOutEvent)) { 575 } else if (checkTypeThenUseCount(event, EventTypeNames::focusin, UseCounter: :FocusInOutEvent)) {
576 } else if (checkTypeThenUseCount(event, EventTypeNames::focusout, UseCounter ::FocusInOutEvent)) { 576 } else if (checkTypeThenUseCount(event, EventTypeNames::focusout, UseCounter ::FocusInOutEvent)) {
577 } else if (checkTypeThenUseCount(event, EventTypeNames::textInput, UseCounte r::TextInputFired)) { 577 } else if (checkTypeThenUseCount(event, EventTypeNames::textInput, UseCounte r::TextInputFired)) {
578 } else if (checkTypeThenUseCount(event, EventTypeNames::touchstart, UseCount er::TouchStartFired)) { 578 } else if (checkTypeThenUseCount(event, EventTypeNames::touchstart, UseCount er::TouchStartFired)) {
579 } else if (checkTypeThenUseCount(event, EventTypeNames::mousedown, UseCounte r::MouseDownFired)) { 579 } else if (checkTypeThenUseCount(event, EventTypeNames::mousedown, UseCounte r::MouseDownFired)) {
580 } else if (checkTypeThenUseCount(event, EventTypeNames::pointerdown, UseCoun ter::PointerDownFired)) { 580 } else if (checkTypeThenUseCount(event, EventTypeNames::pointerdown, UseCoun ter::PointerDownFired)) {
581 if (LocalDOMWindow* executingWindow = this->executingWindow()) { 581 if (LocalDOMWindow* executingWindow = this->executingWindow()) {
582 if (static_cast<PointerEvent*>(event)->pointerType() == "touch") 582 if (event->isPointerEvent() && static_cast<PointerEvent*>(event)->po interType() == "touch")
583 UseCounter::count(executingWindow->document(), UseCounter::Point erDownFiredForTouch); 583 UseCounter::count(executingWindow->document(), UseCounter::Point erDownFiredForTouch);
584 } 584 }
585 } 585 }
586 586
587 ExecutionContext* context = getExecutionContext(); 587 ExecutionContext* context = getExecutionContext();
588 if (!context) 588 if (!context)
589 return false; 589 return false;
590 590
591 size_t i = 0; 591 size_t i = 0;
592 size_t size = entry.size(); 592 size_t size = entry.size();
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 // they have one less listener to invoke. 691 // they have one less listener to invoke.
692 if (d->firingEventIterators) { 692 if (d->firingEventIterators) {
693 for (size_t i = 0; i < d->firingEventIterators->size(); ++i) { 693 for (size_t i = 0; i < d->firingEventIterators->size(); ++i) {
694 d->firingEventIterators->at(i).iterator = 0; 694 d->firingEventIterators->at(i).iterator = 0;
695 d->firingEventIterators->at(i).end = 0; 695 d->firingEventIterators->at(i).end = 0;
696 } 696 }
697 } 697 }
698 } 698 }
699 699
700 } // namespace blink 700 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698