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

Unified Diff: ui/events/blink/web_input_event_traits.cc

Issue 2573073003: Collapse the API surface on WebInputEvent via accessor functions. (Closed)
Patch Set: Created 4 years 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: ui/events/blink/web_input_event_traits.cc
diff --git a/ui/events/blink/web_input_event_traits.cc b/ui/events/blink/web_input_event_traits.cc
index 58d95c9e2f3d75c41e38644a9ce096f60c813cea..0751b1dbc13373ecd4f20696a1f03f7f393fe3ea 100644
--- a/ui/events/blink/web_input_event_traits.cc
+++ b/ui/events/blink/web_input_event_traits.cc
@@ -108,8 +108,8 @@ struct WebInputEventToString {
template <class EventType>
bool Execute(const WebInputEvent& event, std::string* result) const {
SStringPrintf(result, "%s (Time: %lf, Modifiers: %d)\n",
- WebInputEvent::GetName(event.type), event.timeStampSeconds,
- event.modifiers);
+ WebInputEvent::GetName(event.type()),
+ event.timeStampSeconds(), event.modifiers());
const EventType& typed_event = static_cast<const EventType&>(event);
ApppendEventDetails(typed_event, result);
return true;
@@ -128,7 +128,7 @@ struct WebInputEventClone {
template <class EventType>
bool Execute(const WebInputEvent& event,
ScopedWebInputEvent* scoped_event) const {
- DCHECK_EQ(sizeof(EventType), event.size);
+ DCHECK_EQ(sizeof(EventType), event.size());
*scoped_event = ScopedWebInputEvent(
new EventType(static_cast<const EventType&>(event)));
return true;
@@ -140,7 +140,7 @@ struct WebInputEventDelete {
bool Execute(WebInputEvent* event, bool* /* dummy_var */) const {
if (!event)
return false;
- DCHECK_EQ(sizeof(EventType), event->size);
+ DCHECK_EQ(sizeof(EventType), event->size());
delete static_cast<EventType*>(event);
return true;
}
@@ -170,7 +170,7 @@ bool Apply(Operator op,
std::string WebInputEventTraits::ToString(const WebInputEvent& event) {
std::string result;
- Apply(WebInputEventToString(), event.type, event, &result);
+ Apply(WebInputEventToString(), event.type(), event, &result);
return result;
}
@@ -182,7 +182,7 @@ size_t WebInputEventTraits::GetSize(WebInputEvent::Type type) {
ScopedWebInputEvent WebInputEventTraits::Clone(const WebInputEvent& event) {
ScopedWebInputEvent scoped_event;
- Apply(WebInputEventClone(), event.type, event, &scoped_event);
+ Apply(WebInputEventClone(), event.type(), event, &scoped_event);
return scoped_event;
}
@@ -190,11 +190,11 @@ void WebInputEventTraits::Delete(WebInputEvent* event) {
if (!event)
return;
bool dummy_var = false;
- Apply(WebInputEventDelete(), event->type, event, &dummy_var);
+ Apply(WebInputEventDelete(), event->type(), event, &dummy_var);
}
bool WebInputEventTraits::ShouldBlockEventStream(const WebInputEvent& event) {
- switch (event.type) {
+ switch (event.type()) {
case WebInputEvent::MouseDown:
case WebInputEvent::MouseUp:
case WebInputEvent::MouseEnter:
@@ -238,7 +238,7 @@ bool WebInputEventTraits::CanCauseScroll(
// Scroll events generated from the mouse wheel when the control key is held
// don't trigger scrolling. Instead, they may cause zooming.
return event.hasPreciseScrollingDeltas ||
- (event.modifiers & blink::WebInputEvent::ControlKey) == 0;
+ (event.modifiers() & blink::WebInputEvent::ControlKey) == 0;
#else
return true;
#endif
@@ -246,7 +246,7 @@ bool WebInputEventTraits::CanCauseScroll(
uint32_t WebInputEventTraits::GetUniqueTouchEventId(
const WebInputEvent& event) {
- if (WebInputEvent::isTouchEventType(event.type)) {
+ if (WebInputEvent::isTouchEventType(event.type())) {
return static_cast<const WebTouchEvent&>(event).uniqueTouchEventId;
}
return 0U;

Powered by Google App Engine
This is Rietveld 408576698