| Index: content/browser/web_contents/web_contents_impl.cc
|
| diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
| index c36e3a7772a42c2db4136b046e7e05f35b378305..3c7eb7f5619557d604b3d58e66cb96d9b544ce7b 100644
|
| --- a/content/browser/web_contents/web_contents_impl.cc
|
| +++ b/content/browser/web_contents/web_contents_impl.cc
|
| @@ -395,6 +395,7 @@ WebContentsImpl::WebContentsImpl(BrowserContext* browser_context)
|
| closed_by_user_gesture_(false),
|
| minimum_zoom_percent_(static_cast<int>(kMinimumZoomFactor * 100)),
|
| maximum_zoom_percent_(static_cast<int>(kMaximumZoomFactor * 100)),
|
| + zoom_scroll_amount_(0),
|
| render_view_message_source_(NULL),
|
| render_frame_message_source_(NULL),
|
| fullscreen_widget_routing_id_(MSG_ROUTING_NONE),
|
| @@ -1591,7 +1592,14 @@ bool WebContentsImpl::HandleWheelEvent(
|
| if (delegate_ && event.wheelTicksY &&
|
| (event.modifiers & blink::WebInputEvent::ControlKey) &&
|
| !event.canScroll) {
|
| - delegate_->ContentsZoomChange(event.wheelTicksY > 0);
|
| + // Count only integer cumulative scrolls as zoom events; this handles
|
| + // smooth scroll and regular scroll device behavior.
|
| + zoom_scroll_amount_ += event.wheelTicksY;
|
| + int whole_zoom_scroll_amount = round(zoom_scroll_amount_);
|
| + zoom_scroll_amount_ -= whole_zoom_scroll_amount;
|
| + if (whole_zoom_scroll_amount != 0) {
|
| + delegate_->ContentsZoomChange(whole_zoom_scroll_amount > 0);
|
| + }
|
| return true;
|
| }
|
| #endif
|
|
|