<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169300] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169300">169300</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-23 20:45:00 -0700 (Fri, 23 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] The page scale factor randomly resets to initial scale when editing
https://bugs.webkit.org/show_bug.cgi?id=133244
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-05-23
Reviewed by Enrica Casucci.
We were never telling the WebProcess that zoom is used triggered. As a result, the ViewportConfiguration was free
to reset the scale whenever it felt like it. The fix is to call willStartUserTriggeredZoom before changing the scale.
This patch also split _willStartUserTriggeredScrollingOrZooming from willStartUserTriggeredZoom
and rename it to willStartPanOrPinchGesture. This is just a tiny cleanup since the only thing left in _willStartUserTriggeredScrollingOrZooming
was gesture related.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _zoomToFocusRect:WebCore::selectionRect:WebCore::fontSize:minimumScale:maximumScale:allowScaling:forceScroll:]):
(-[WKWebView scrollViewWillBeginZooming:withView:]):
(-[WKWebView scrollViewWillBeginDragging:]):
* UIProcess/API/Cocoa/WKWebViewInternal.h:
* UIProcess/API/ios/WKViewIOS.mm:
(-[WKView scrollViewWillBeginDragging:]):
* UIProcess/ios/WKContentView.h:
* UIProcess/ios/WKContentView.mm:
(-[WKContentView willStartUserTriggeredZoom]):
(-[WKContentView willStartUserTriggeredScroll]): Deleted.
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView willStartPanOrPinchGesture]):
(-[WKContentView _willStartUserTriggeredScrollingOrZooming]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosWKViewIOSmm">trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewh">trunk/Source/WebKit2/UIProcess/ios/WKContentView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionh">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169299 => 169300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-24 02:17:59 UTC (rev 169299)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-24 03:45:00 UTC (rev 169300)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-05-23 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS][WK2] The page scale factor randomly resets to initial scale when editing
+ https://bugs.webkit.org/show_bug.cgi?id=133244
+
+ Reviewed by Enrica Casucci.
+
+ We were never telling the WebProcess that zoom is used triggered. As a result, the ViewportConfiguration was free
+ to reset the scale whenever it felt like it. The fix is to call willStartUserTriggeredZoom before changing the scale.
+
+ This patch also split _willStartUserTriggeredScrollingOrZooming from willStartUserTriggeredZoom
+ and rename it to willStartPanOrPinchGesture. This is just a tiny cleanup since the only thing left in _willStartUserTriggeredScrollingOrZooming
+ was gesture related.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _zoomToFocusRect:WebCore::selectionRect:WebCore::fontSize:minimumScale:maximumScale:allowScaling:forceScroll:]):
+ (-[WKWebView scrollViewWillBeginZooming:withView:]):
+ (-[WKWebView scrollViewWillBeginDragging:]):
+ * UIProcess/API/Cocoa/WKWebViewInternal.h:
+ * UIProcess/API/ios/WKViewIOS.mm:
+ (-[WKView scrollViewWillBeginDragging:]):
+ * UIProcess/ios/WKContentView.h:
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView willStartUserTriggeredZoom]):
+ (-[WKContentView willStartUserTriggeredScroll]): Deleted.
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView willStartPanOrPinchGesture]):
+ (-[WKContentView _willStartUserTriggeredScrollingOrZooming]): Deleted.
+
</ins><span class="cx"> 2014-05-23 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (iOS WebKit2): requestAnimationFrame fires more than once between layer tree commits
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (169299 => 169300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-24 02:17:59 UTC (rev 169299)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-24 03:45:00 UTC (rev 169300)
</span><span class="lines">@@ -643,7 +643,7 @@
</span><span class="cx"> CFTimeInterval duration = std::min(fabs(log(zoomScale) - log(scale)) * zoomDurationFactor + minimumZoomDuration, maximumZoomDuration);
</span><span class="cx">
</span><span class="cx"> if (scale != zoomScale)
</span><del>- [_contentView willStartUserTriggeredZoom];
</del><ins>+ _page->willStartUserTriggeredZooming();
</ins><span class="cx">
</span><span class="cx"> [_scrollView _zoomToCenter:point scale:scale duration:duration];
</span><span class="cx"> }
</span><span class="lines">@@ -851,6 +851,9 @@
</span><span class="cx">
</span><span class="cx"> WebCore::FloatPoint newCenter = CGPointMake(topLeft.x + unobscuredScrollViewRectInWebViewCoordinates.size.width / 2.0, topLeft.y + unobscuredScrollViewRectInWebViewCoordinates.size.height / 2.0);
</span><span class="cx">
</span><ins>+ if (scale != contentZoomScale(self))
+ _page->willStartUserTriggeredZooming();
+
</ins><span class="cx"> // The newCenter has been computed in the new scale, but _zoomToCenter expected the center to be in the original scale.
</span><span class="cx"> newCenter.scale(1 / scale, 1 / scale);
</span><span class="cx"> [_scrollView _zoomToCenter:newCenter
</span><span class="lines">@@ -911,8 +914,10 @@
</span><span class="cx"> if (![self usesStandardContentView])
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (scrollView.pinchGestureRecognizer.state == UIGestureRecognizerStateBegan)
- [_contentView willStartUserTriggeredZoom];
</del><ins>+ if (scrollView.pinchGestureRecognizer.state == UIGestureRecognizerStateBegan) {
+ _page->willStartUserTriggeredZooming();
+ [_contentView willStartPanOrPinchGesture];
+ }
</ins><span class="cx"> [_contentView willStartZoomOrScroll];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -922,7 +927,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (scrollView.panGestureRecognizer.state == UIGestureRecognizerStateBegan)
</span><del>- [_contentView willStartUserTriggeredScroll];
</del><ins>+ [_contentView willStartPanOrPinchGesture];
</ins><span class="cx"> [_contentView willStartZoomOrScroll];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h (169299 => 169300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2014-05-24 02:17:59 UTC (rev 169299)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2014-05-24 03:45:00 UTC (rev 169300)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import "WKContentView.h"
</span><ins>+#import "WKContentViewInteraction.h"
</ins><span class="cx"> #import <WebCore/FloatRect.h>
</span><span class="cx"> #import <UIKit/UIScrollView_Private.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm (169299 => 169300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-05-24 02:17:59 UTC (rev 169299)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-05-24 03:45:00 UTC (rev 169300)
</span><span class="lines">@@ -159,15 +159,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(UIView *)view
</span><span class="cx"> {
</span><del>- if (scrollView.pinchGestureRecognizer.state == UIGestureRecognizerStateBegan)
- [_contentView willStartUserTriggeredZoom];
</del><span class="cx"> [_contentView willStartZoomOrScroll];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
</span><span class="cx"> {
</span><del>- if (scrollView.panGestureRecognizer.state == UIGestureRecognizerStateBegan)
- [_contentView willStartUserTriggeredScroll];
</del><span class="cx"> [_contentView willStartZoomOrScroll];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.h (169299 => 169300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.h 2014-05-24 02:17:59 UTC (rev 169299)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.h 2014-05-24 03:45:00 UTC (rev 169300)
</span><span class="lines">@@ -68,8 +68,6 @@
</span><span class="cx"> - (void)didFinishScrolling;
</span><span class="cx"> - (void)didZoomToScale:(CGFloat)scale;
</span><span class="cx"> - (void)willStartZoomOrScroll;
</span><del>-- (void)willStartUserTriggeredScroll;
-- (void)willStartUserTriggeredZoom;
</del><span class="cx">
</span><span class="cx"> - (std::unique_ptr<WebKit::DrawingAreaProxy>)_createDrawingAreaProxy;
</span><span class="cx"> - (void)_processDidExit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (169299 => 169300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-05-24 02:17:59 UTC (rev 169299)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-05-24 03:45:00 UTC (rev 169300)
</span><span class="lines">@@ -327,17 +327,6 @@
</span><span class="cx"> [self _willStartScrollingOrZooming];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)willStartUserTriggeredScroll
-{
- [self _willStartUserTriggeredScrollingOrZooming];
-}
-
-- (void)willStartUserTriggeredZoom
-{
- [self _willStartUserTriggeredScrollingOrZooming];
- _page->willStartUserTriggeredZooming();
-}
-
</del><span class="cx"> - (void)didZoomToScale:(CGFloat)scale
</span><span class="cx"> {
</span><span class="cx"> [self _didEndScrollingOrZooming];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (169299 => 169300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-05-24 02:17:59 UTC (rev 169299)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-05-24 03:45:00 UTC (rev 169300)
</span><span class="lines">@@ -151,6 +151,8 @@
</span><span class="cx"> - (void)setupInteraction;
</span><span class="cx"> - (void)cleanupInteraction;
</span><span class="cx">
</span><ins>+- (void)willStartPanOrPinchGesture;
+
</ins><span class="cx"> - (void)_webTouchEvent:(const WebKit::NativeWebTouchEvent&)touchEvent preventsNativeGestures:(BOOL)preventsDefault;
</span><span class="cx"> - (void)_commitPotentialTapFailed;
</span><span class="cx"> - (void)_didGetTapHighlightForRequest:(uint64_t)requestID color:(const WebCore::Color&)color quads:(const Vector<WebCore::FloatQuad>&)highlightedQuads topLeftRadius:(const WebCore::IntSize&)topLeftRadius topRightRadius:(const WebCore::IntSize&)topRightRadius bottomLeftRadius:(const WebCore::IntSize&)bottomLeftRadius bottomRightRadius:(const WebCore::IntSize&)bottomRightRadius;
</span><span class="lines">@@ -165,7 +167,6 @@
</span><span class="cx"> - (void)_updatePositionInformation;
</span><span class="cx"> - (void)_performAction:(WebKit::SheetAction)action;
</span><span class="cx"> - (void)_willStartScrollingOrZooming;
</span><del>-- (void)_willStartUserTriggeredScrollingOrZooming;
</del><span class="cx"> - (void)_didEndScrollingOrZooming;
</span><span class="cx"> - (void)_didUpdateBlockSelectionWithTouch:(WebKit::SelectionTouch)touch withFlags:(WebKit::SelectionFlags)flags growThreshold:(CGFloat)growThreshold shrinkThreshold:(CGFloat)shrinkThreshold;
</span><span class="cx"> - (void)_showPlaybackTargetPicker:(BOOL)hasVideo fromRect:(const WebCore::IntRect&)elementRect;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (169299 => 169300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-05-24 02:17:59 UTC (rev 169299)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-05-24 03:45:00 UTC (rev 169300)
</span><span class="lines">@@ -879,7 +879,7 @@
</span><span class="cx"> [_textSelectionAssistant willStartScrollingOverflow];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_willStartUserTriggeredScrollingOrZooming
</del><ins>+- (void)willStartPanOrPinchGesture
</ins><span class="cx"> {
</span><span class="cx"> _canSendTouchEventsAsynchronously = YES;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>