Index: third_party/WebKit/Source/core/html/HTMLSelectElement.cpp |
diff --git a/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp b/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp |
index a3ad40d6045e743b750416e47ca154f69bb7cb58..d0f7bc1b128994d7d297ab36085d3be4e2a779c3 100644 |
--- a/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp |
+++ b/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp |
@@ -1335,7 +1335,7 @@ void HTMLSelectElement::menuListDefaultEventHandler(Event* event) |
} |
} |
- if (event->type() == EventTypeNames::mousedown && event->isMouseEvent() && toMouseEvent(event)->button() == LeftButton) { |
+ if (event->type() == EventTypeNames::mousedown && event->isMouseEvent() && toMouseEvent(event)->button() == static_cast<short>(WebPointerProperties::Button::Left)) { |
InputDeviceCapabilities* sourceCapabilities = toMouseEvent(event)->fromTouch() ? InputDeviceCapabilities::firesTouchEventsSourceCapabilities() : InputDeviceCapabilities::doesntFireTouchEventsSourceCapabilities(); |
focus(FocusParams(SelectionBehaviorOnFocus::Restore, WebFocusTypeNone, sourceCapabilities)); |
if (layoutObject() && layoutObject()->isMenuList() && !isDisabledFormControl()) { |
@@ -1463,7 +1463,7 @@ void HTMLSelectElement::listBoxDefaultEventHandler(Event* event) |
event->setDefaultHandled(); |
} |
- } else if (event->type() == EventTypeNames::mousedown && event->isMouseEvent() && toMouseEvent(event)->button() == LeftButton) { |
+ } else if (event->type() == EventTypeNames::mousedown && event->isMouseEvent() && toMouseEvent(event)->button() == static_cast<short>(WebPointerProperties::Button::Left)) { |
focus(); |
// Calling focus() may cause us to lose our layoutObject, in which case |
// do not want to handle the event. |
@@ -1488,7 +1488,7 @@ void HTMLSelectElement::listBoxDefaultEventHandler(Event* event) |
} else if (event->type() == EventTypeNames::mousemove && event->isMouseEvent()) { |
MouseEvent* mouseEvent = toMouseEvent(event); |
- if (mouseEvent->button() != LeftButton || !mouseEvent->buttonDown()) |
+ if (mouseEvent->button() != static_cast<short>(WebPointerProperties::Button::Left) || !mouseEvent->buttonDown()) |
return; |
if (Page* page = document().page()) |
@@ -1514,7 +1514,7 @@ void HTMLSelectElement::listBoxDefaultEventHandler(Event* event) |
} |
} |
- } else if (event->type() == EventTypeNames::mouseup && event->isMouseEvent() && toMouseEvent(event)->button() == LeftButton && layoutObject()) { |
+ } else if (event->type() == EventTypeNames::mouseup && event->isMouseEvent() && toMouseEvent(event)->button() == static_cast<short>(WebPointerProperties::Button::Left) && layoutObject()) { |
if (document().page() && document().page()->autoscrollController().autoscrollInProgress(toLayoutBox(layoutObject()))) |
document().page()->autoscrollController().stopAutoscroll(); |
else |