Title: [139115] branches/chromium/1364/Source/WebKit/chromium/src/WebViewImpl.cpp
Revision
139115
Author
[email protected]
Date
2013-01-08 14:49:08 -0800 (Tue, 08 Jan 2013)

Log Message

Merge 139017. Requested by [email protected]
> Don't use double tap zoom if minimum and maximum page scale is the same
> https://bugs.webkit.org/show_bug.cgi?id=106272
> 
> Patch by Yusuf Ozuysal <[email protected]> on 2013-01-07
> Reviewed by James Robinson.
> 
> We should only try to computed relevant scale and scrollOffset and start the animation
> if the page is zoomable. This now creates an undesired animation for mobile pages which
> are not zoomable.
> 
> * src/WebViewImpl.cpp:
> (WebKit::WebViewImpl::handleGestureEvent):

[email protected]
Review URL: https://codereview.chromium.org/11821007

Modified Paths

Diff

Modified: branches/chromium/1364/Source/WebKit/chromium/src/WebViewImpl.cpp (139114 => 139115)


--- branches/chromium/1364/Source/WebKit/chromium/src/WebViewImpl.cpp	2013-01-08 22:19:12 UTC (rev 139114)
+++ branches/chromium/1364/Source/WebKit/chromium/src/WebViewImpl.cpp	2013-01-08 22:49:08 UTC (rev 139115)
@@ -775,7 +775,7 @@
         break;
     }
     case WebInputEvent::GestureDoubleTap:
-        if (m_webSettings->doubleTapToZoomEnabled()) {
+        if (m_webSettings->doubleTapToZoomEnabled() && m_minimumPageScaleFactor != m_maximumPageScaleFactor) {
             m_client->cancelScheduledContentIntents();
             animateZoomAroundPoint(WebPoint(event.x, event.y), DoubleTap);
             eventSwallowed = true;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to