| Index: third_party/WebKit/Source/core/events/PointerEventFactory.cpp
|
| diff --git a/third_party/WebKit/Source/core/events/PointerEventFactory.cpp b/third_party/WebKit/Source/core/events/PointerEventFactory.cpp
|
| index 43aace2c5cec559902fcec8a7a561b32072cc9c9..600874c7ae42b4f32662e4179a0b7e46eb7890b6 100644
|
| --- a/third_party/WebKit/Source/core/events/PointerEventFactory.cpp
|
| +++ b/third_party/WebKit/Source/core/events/PointerEventFactory.cpp
|
| @@ -349,7 +349,7 @@ PointerEvent* PointerEventFactory::createPointerCancelEvent(
|
| DCHECK(m_pointerIdMapping.contains(pointerId));
|
| m_pointerIdMapping.set(
|
| pointerId,
|
| - PointerAttributes(m_pointerIdMapping.get(pointerId).incomingId, false));
|
| + PointerAttributes(m_pointerIdMapping.at(pointerId).incomingId, false));
|
|
|
| PointerEventInit pointerEventInit;
|
|
|
| @@ -455,7 +455,7 @@ int PointerEventFactory::addIdAndActiveButtons(const IncomingId p,
|
| }
|
|
|
| if (m_pointerIncomingIdMapping.contains(p)) {
|
| - int mappedId = m_pointerIncomingIdMapping.get(p);
|
| + int mappedId = m_pointerIncomingIdMapping.at(p);
|
| m_pointerIdMapping.set(mappedId, PointerAttributes(p, isActiveButtons));
|
| return mappedId;
|
| }
|
| @@ -475,7 +475,7 @@ bool PointerEventFactory::remove(const int mappedId) {
|
| if (mappedId == s_mouseId || !m_pointerIdMapping.contains(mappedId))
|
| return false;
|
|
|
| - IncomingId p = m_pointerIdMapping.get(mappedId).incomingId;
|
| + IncomingId p = m_pointerIdMapping.at(mappedId).incomingId;
|
| int typeInt = p.pointerTypeInt();
|
| m_pointerIdMapping.erase(mappedId);
|
| m_pointerIncomingIdMapping.erase(p);
|
| @@ -505,7 +505,7 @@ bool PointerEventFactory::isPrimary(int mappedId) const {
|
| if (!m_pointerIdMapping.contains(mappedId))
|
| return false;
|
|
|
| - IncomingId p = m_pointerIdMapping.get(mappedId).incomingId;
|
| + IncomingId p = m_pointerIdMapping.at(mappedId).incomingId;
|
| return m_primaryId[p.pointerTypeInt()] == mappedId;
|
| }
|
|
|
| @@ -515,14 +515,14 @@ bool PointerEventFactory::isActive(const int pointerId) const {
|
|
|
| bool PointerEventFactory::isActiveButtonsState(const int pointerId) const {
|
| return m_pointerIdMapping.contains(pointerId) &&
|
| - m_pointerIdMapping.get(pointerId).isActiveButtons;
|
| + m_pointerIdMapping.at(pointerId).isActiveButtons;
|
| }
|
|
|
| WebPointerProperties::PointerType PointerEventFactory::getPointerType(
|
| int pointerId) const {
|
| if (!isActive(pointerId))
|
| return WebPointerProperties::PointerType::Unknown;
|
| - return m_pointerIdMapping.get(pointerId).incomingId.pointerType();
|
| + return m_pointerIdMapping.at(pointerId).incomingId.pointerType();
|
| }
|
|
|
| int PointerEventFactory::getPointerEventId(
|
| @@ -531,7 +531,7 @@ int PointerEventFactory::getPointerEventId(
|
| return PointerEventFactory::s_mouseId;
|
| IncomingId id(properties.pointerType, properties.id);
|
| if (m_pointerIncomingIdMapping.contains(id))
|
| - return m_pointerIncomingIdMapping.get(id);
|
| + return m_pointerIncomingIdMapping.at(id);
|
| return PointerEventFactory::s_invalidId;
|
| }
|
|
|
|
|