| Index: cc/blink/web_layer_impl.cc
|
| diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc
|
| index 88601b5b7119ca91219d2bb268bcb4413dc5925a..2adc270dbe5b15103cf1779257f7918f10678957 100644
|
| --- a/cc/blink/web_layer_impl.cc
|
| +++ b/cc/blink/web_layer_impl.cc
|
| @@ -329,12 +329,41 @@ bool WebLayerImpl::userScrollableVertical() const {
|
| return layer_->user_scrollable_vertical();
|
| }
|
|
|
| -void WebLayerImpl::setHaveWheelEventHandlers(bool have_wheel_event_handlers) {
|
| - layer_->SetHaveWheelEventHandlers(have_wheel_event_handlers);
|
| +static_assert(static_cast<cc::EventListenerProperties>(
|
| + blink::WebEventListenerProperties::Nothing) ==
|
| + cc::EventListenerProperties::NONE,
|
| + "EventListener and WebEventListener enums must match");
|
| +static_assert(static_cast<cc::EventListenerProperties>(
|
| + blink::WebEventListenerProperties::Passive) ==
|
| + cc::EventListenerProperties::PASSIVE,
|
| + "EventListener and WebEventListener enums must match");
|
| +static_assert(static_cast<cc::EventListenerProperties>(
|
| + blink::WebEventListenerProperties::Blocking) ==
|
| + cc::EventListenerProperties::BLOCKING,
|
| + "EventListener and WebEventListener enums must match");
|
| +
|
| +void WebLayerImpl::setTouchEventListenerProperties(
|
| + blink::WebEventListenerProperties touch_event_properties) {
|
| + layer_->SetTouchEventProperties(
|
| + static_cast<cc::EventListenerProperties>(touch_event_properties));
|
| +}
|
| +
|
| +blink::WebEventListenerProperties WebLayerImpl::touchEventListenerProperties()
|
| + const {
|
| + return static_cast<blink::WebEventListenerProperties>(
|
| + layer_->touch_event_properties());
|
| +}
|
| +
|
| +void WebLayerImpl::setWheelEventListenerProperties(
|
| + blink::WebEventListenerProperties wheel_event_properties) {
|
| + layer_->SetWheelEventProperties(
|
| + static_cast<cc::EventListenerProperties>(wheel_event_properties));
|
| }
|
|
|
| -bool WebLayerImpl::haveWheelEventHandlers() const {
|
| - return layer_->have_wheel_event_handlers();
|
| +blink::WebEventListenerProperties WebLayerImpl::wheelEventListenerProperties()
|
| + const {
|
| + return static_cast<blink::WebEventListenerProperties>(
|
| + layer_->wheel_event_properties());
|
| }
|
|
|
| void WebLayerImpl::setHaveScrollEventHandlers(bool have_scroll_event_handlers) {
|
|
|