Commit 97138635 authored by Hwanseung Lee's avatar Hwanseung Lee Committed by Commit Bot

Use Event& instead of Event* as a parameter of PostDispatchEventHandler

When PostDispatchEventHandler is called,
Event object was passed as a parameter. and it is never nullptr.
so it can be changed to reference instead of pointer.
and DidDispatchClick is also same.

Bug: 874385

Change-Id: I13042aa1eb949007db554d8bb98d8789102dfaba
Reviewed-on: https://chromium-review.googlesource.com/1189324Reviewed-by: default avatarHayato Ito <hayato@chromium.org>
Commit-Queue: Hwanseung Lee <hs1217.lee@samsung.com>
Cr-Commit-Position: refs/heads/master@{#586599}
parent cc3e7e5a
......@@ -293,7 +293,7 @@ inline void EventDispatcher::DispatchEventPostProcess(
// This may dispatch an event, and node_ and event_ might be altered.
if (activation_target) {
activation_target->PostDispatchEventHandler(
event_.Get(), pre_dispatch_event_handler_result);
*event_, pre_dispatch_event_handler_result);
}
// TODO(tkent): Is it safe to kick DefaultEventHandler() with such altered
// event_?
......
......@@ -774,7 +774,7 @@ class CORE_EXPORT Node : public EventTarget {
virtual EventDispatchHandlingState* PreDispatchEventHandler(Event&) {
return nullptr;
}
virtual void PostDispatchEventHandler(Event*, EventDispatchHandlingState*) {}
virtual void PostDispatchEventHandler(Event&, EventDispatchHandlingState*) {}
void DispatchScopedEvent(Event&);
......
......@@ -79,9 +79,9 @@ ClickHandlingState* CheckboxInputType::WillDispatchClick() {
return state;
}
void CheckboxInputType::DidDispatchClick(Event* event,
void CheckboxInputType::DidDispatchClick(Event& event,
const ClickHandlingState& state) {
if (event->defaultPrevented() || event->DefaultHandled()) {
if (event.defaultPrevented() || event.DefaultHandled()) {
GetElement().setIndeterminate(state.indeterminate);
GetElement().setChecked(state.checked);
} else {
......@@ -89,7 +89,7 @@ void CheckboxInputType::DidDispatchClick(Event* event,
}
is_in_click_handler_ = false;
// The work we did in willDispatchClick was default handling.
event->SetDefaultHandled();
event.SetDefaultHandled();
}
bool CheckboxInputType::ShouldAppearIndeterminate() const {
......
......@@ -47,7 +47,7 @@ class CheckboxInputType final : public BaseCheckableInputType {
String ValueMissingText() const override;
void HandleKeyupEvent(KeyboardEvent&) override;
ClickHandlingState* WillDispatchClick() override;
void DidDispatchClick(Event*, const ClickHandlingState&) override;
void DidDispatchClick(Event&, const ClickHandlingState&) override;
bool ShouldAppearIndeterminate() const override;
};
......
......@@ -1246,7 +1246,7 @@ EventDispatchHandlingState* HTMLInputElement::PreDispatchEventHandler(
}
void HTMLInputElement::PostDispatchEventHandler(
Event* event,
Event& event,
EventDispatchHandlingState* state) {
if (!state)
return;
......
......@@ -362,7 +362,7 @@ class CORE_EXPORT HTMLInputElement
bool SupportsAutofocus() const final;
EventDispatchHandlingState* PreDispatchEventHandler(Event&) final;
void PostDispatchEventHandler(Event*, EventDispatchHandlingState*) final;
void PostDispatchEventHandler(Event&, EventDispatchHandlingState*) final;
bool IsURLAttribute(const Attribute&) const final;
bool HasLegalLinkAttribute(const QualifiedName&) const final;
......
......@@ -138,7 +138,7 @@ ClickHandlingState* InputTypeView::WillDispatchClick() {
return nullptr;
}
void InputTypeView::DidDispatchClick(Event*, const ClickHandlingState&) {}
void InputTypeView::DidDispatchClick(Event&, const ClickHandlingState&) {}
void InputTypeView::UpdateView() {}
......
......@@ -81,7 +81,7 @@ class CORE_EXPORT InputTypeView : public GarbageCollectedMixin {
virtual void HandleClickEvent(MouseEvent&);
virtual void HandleMouseDownEvent(MouseEvent&);
virtual ClickHandlingState* WillDispatchClick();
virtual void DidDispatchClick(Event*, const ClickHandlingState&);
virtual void DidDispatchClick(Event&, const ClickHandlingState&);
virtual void HandleKeydownEvent(KeyboardEvent&);
virtual void HandleKeypressEvent(KeyboardEvent&);
virtual void HandleKeyupEvent(KeyboardEvent&);
......
......@@ -198,9 +198,9 @@ ClickHandlingState* RadioInputType::WillDispatchClick() {
return state;
}
void RadioInputType::DidDispatchClick(Event* event,
void RadioInputType::DidDispatchClick(Event& event,
const ClickHandlingState& state) {
if (event->defaultPrevented() || event->DefaultHandled()) {
if (event.defaultPrevented() || event.DefaultHandled()) {
// Restore the original selected radio button if possible.
// Make sure it is still a radio button and only do the restoration if it
// still belongs to our group.
......@@ -216,7 +216,7 @@ void RadioInputType::DidDispatchClick(Event* event,
}
is_in_click_handler_ = false;
// The work we did in willDispatchClick was default handling.
event->SetDefaultHandled();
event.SetDefaultHandled();
}
bool RadioInputType::ShouldAppearIndeterminate() const {
......
......@@ -53,7 +53,7 @@ class RadioInputType final : public BaseCheckableInputType {
bool IsKeyboardFocusable() const override;
bool ShouldSendChangeEventAfterCheckedChanged() override;
ClickHandlingState* WillDispatchClick() override;
void DidDispatchClick(Event*, const ClickHandlingState&) override;
void DidDispatchClick(Event&, const ClickHandlingState&) override;
bool ShouldAppearIndeterminate() const override;
HTMLInputElement* FindNextFocusableRadioButtonInGroup(HTMLInputElement*,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment