diff --git a/lib/ui/window/pointer_data_packet_converter.cc b/lib/ui/window/pointer_data_packet_converter.cc index d523f302b2563..8f90023d5b939 100644 --- a/lib/ui/window/pointer_data_packet_converter.cc +++ b/lib/ui/window/pointer_data_packet_converter.cc @@ -54,7 +54,7 @@ void PointerDataPacketConverter::ConvertPointerData( auto iter = states_.find(pointer_data.device); if (iter != states_.end()) { PointerState state = iter->second; - FML_DCHECK(state.isDown); + FML_DCHECK(state.is_down); UpdatePointerIdentifier(pointer_data, state, false); if (LocationNeedsUpdate(pointer_data, state)) { @@ -67,7 +67,7 @@ void PointerDataPacketConverter::ConvertPointerData( converted_pointers.push_back(synthesized_move_event); } - state.isDown = false; + state.is_down = false; states_[pointer_data.device] = state; converted_pointers.push_back(pointer_data); } @@ -85,14 +85,14 @@ void PointerDataPacketConverter::ConvertPointerData( FML_DCHECK(iter != states_.end()); PointerState state = iter->second; - if (state.isDown) { + if (state.is_down) { // Synthesizes cancel event if the pointer is down. PointerData synthesized_cancel_event = pointer_data; synthesized_cancel_event.change = PointerData::Change::kCancel; synthesized_cancel_event.synthesized = 1; UpdatePointerIdentifier(synthesized_cancel_event, state, false); - state.isDown = false; + state.is_down = false; states_[synthesized_cancel_event.device] = state; converted_pointers.push_back(synthesized_cancel_event); } @@ -126,7 +126,7 @@ void PointerDataPacketConverter::ConvertPointerData( state = iter->second; } - FML_DCHECK(!state.isDown); + FML_DCHECK(!state.is_down); state.buttons = pointer_data.buttons; if (LocationNeedsUpdate(pointer_data, state)) { UpdateDeltaAndState(pointer_data, state); @@ -149,7 +149,7 @@ void PointerDataPacketConverter::ConvertPointerData( state = iter->second; } - FML_DCHECK(!state.isDown); + FML_DCHECK(!state.is_down); if (LocationNeedsUpdate(pointer_data, state)) { // Synthesizes a hover event if the location does not match. PointerData synthesized_hover_event = pointer_data; @@ -162,7 +162,7 @@ void PointerDataPacketConverter::ConvertPointerData( } UpdatePointerIdentifier(pointer_data, state, true); - state.isDown = true; + state.is_down = true; state.buttons = pointer_data.buttons; states_[pointer_data.device] = state; converted_pointers.push_back(pointer_data); @@ -173,7 +173,7 @@ void PointerDataPacketConverter::ConvertPointerData( auto iter = states_.find(pointer_data.device); FML_DCHECK(iter != states_.end()); PointerState state = iter->second; - FML_DCHECK(state.isDown); + FML_DCHECK(state.is_down); UpdatePointerIdentifier(pointer_data, state, false); UpdateDeltaAndState(pointer_data, state); @@ -186,7 +186,7 @@ void PointerDataPacketConverter::ConvertPointerData( auto iter = states_.find(pointer_data.device); FML_DCHECK(iter != states_.end()); PointerState state = iter->second; - FML_DCHECK(state.isDown); + FML_DCHECK(state.is_down); UpdatePointerIdentifier(pointer_data, state, false); @@ -201,7 +201,7 @@ void PointerDataPacketConverter::ConvertPointerData( converted_pointers.push_back(synthesized_move_event); } - state.isDown = false; + state.is_down = false; state.buttons = pointer_data.buttons; states_[pointer_data.device] = state; converted_pointers.push_back(pointer_data); @@ -221,7 +221,7 @@ void PointerDataPacketConverter::ConvertPointerData( PointerState state = iter->second; if (LocationNeedsUpdate(pointer_data, state)) { - if (state.isDown) { + if (state.is_down) { // Synthesizes a move event if the pointer is down. PointerData synthesized_move_event = pointer_data; synthesized_move_event.signal_kind = PointerData::SignalKind::kNone; @@ -260,7 +260,7 @@ PointerState PointerDataPacketConverter::EnsurePointerState( PointerData pointer_data) { PointerState state; state.pointer_identifier = 0; - state.isDown = false; + state.is_down = false; state.physical_x = pointer_data.physical_x; state.physical_y = pointer_data.physical_y; states_[pointer_data.device] = state; diff --git a/lib/ui/window/pointer_data_packet_converter.h b/lib/ui/window/pointer_data_packet_converter.h index 4f4f20a718b81..c5871d5d39915 100644 --- a/lib/ui/window/pointer_data_packet_converter.h +++ b/lib/ui/window/pointer_data_packet_converter.h @@ -29,7 +29,7 @@ namespace flutter { /// struct PointerState { int64_t pointer_identifier; - bool isDown; + bool is_down; double physical_x; double physical_y; int64_t buttons;