<!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>[165088] 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/165088">165088</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-04 18:13:16 -0800 (Tue, 04 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] Consider the entire view state on update to find if a change is stable or not
https://bugs.webkit.org/show_bug.cgi?id=129721
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-03-04
Reviewed by Simon Fraser.
Changes in scroll, zoom and obscuredRect can happen simultaneously. To compute if the current state
is stable or not, we should consider the complete picture from all the type of updates.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _didFinishScrolling]):
(-[WKWebView scrollViewDidScroll:]):
(-[WKWebView scrollViewDidZoom:]):
(-[WKWebView scrollViewDidEndZooming:withView:atScale:]):
(-[WKWebView _frameOrBoundsChanged]):
(-[WKWebView _updateVisibleContentRects]):
(-[WKWebView _setObscuredInsets:]):
(-[WKWebView _endInteractiveObscuredInsetsChange]):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165087 => 165088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-05 01:51:53 UTC (rev 165087)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-05 02:13:16 UTC (rev 165088)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-03-04 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS][WK2] Consider the entire view state on update to find if a change is stable or not
+ https://bugs.webkit.org/show_bug.cgi?id=129721
+
+ Reviewed by Simon Fraser.
+
+ Changes in scroll, zoom and obscuredRect can happen simultaneously. To compute if the current state
+ is stable or not, we should consider the complete picture from all the type of updates.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _didFinishScrolling]):
+ (-[WKWebView scrollViewDidScroll:]):
+ (-[WKWebView scrollViewDidZoom:]):
+ (-[WKWebView scrollViewDidEndZooming:withView:atScale:]):
+ (-[WKWebView _frameOrBoundsChanged]):
+ (-[WKWebView _updateVisibleContentRects]):
+ (-[WKWebView _setObscuredInsets:]):
+ (-[WKWebView _endInteractiveObscuredInsetsChange]):
+
</ins><span class="cx"> 2014-03-04 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> WebVideoFullscreen, should make the hand off of the video layer explicit.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (165087 => 165088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-05 01:51:53 UTC (rev 165087)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-05 02:13:16 UTC (rev 165088)
</span><span class="lines">@@ -483,7 +483,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_didFinishScrolling
</span><span class="cx"> {
</span><del>- [self _updateVisibleContentRectsWithStableState:YES];
</del><ins>+ [self _updateVisibleContentRects];
</ins><span class="cx"> [_contentView didFinishScrolling];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -506,18 +506,18 @@
</span><span class="cx">
</span><span class="cx"> - (void)scrollViewDidScroll:(UIScrollView *)scrollView
</span><span class="cx"> {
</span><del>- [self _updateVisibleContentRectsWithStableState:NO];
</del><ins>+ [self _updateVisibleContentRects];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)scrollViewDidZoom:(UIScrollView *)scrollView
</span><span class="cx"> {
</span><del>- [self _updateVisibleContentRectsWithStableState:NO];
</del><ins>+ [self _updateVisibleContentRects];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(UIView *)view atScale:(CGFloat)scale
</span><span class="cx"> {
</span><span class="cx"> ASSERT(scrollView == _scrollView);
</span><del>- [self _updateVisibleContentRectsWithStableState:YES];
</del><ins>+ [self _updateVisibleContentRects];
</ins><span class="cx"> [_contentView didZoomToScale:scale];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -529,10 +529,10 @@
</span><span class="cx"> [_contentView setMinimumLayoutSize:bounds.size];
</span><span class="cx"> [_scrollView setFrame:bounds];
</span><span class="cx"> [_contentView setMinimumSize:bounds.size];
</span><del>- [self _updateVisibleContentRectsWithStableState:YES];
</del><ins>+ [self _updateVisibleContentRects];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_updateVisibleContentRectsWithStableState:(BOOL)isStateStable
</del><ins>+- (void)_updateVisibleContentRects
</ins><span class="cx"> {
</span><span class="cx"> CGRect fullViewRect = self.bounds;
</span><span class="cx"> CGRect visibleRectInContentCoordinates = [self convertRect:fullViewRect toView:_contentView.get()];
</span><span class="lines">@@ -542,7 +542,8 @@
</span><span class="cx">
</span><span class="cx"> CGFloat scaleFactor = [_scrollView zoomScale];
</span><span class="cx">
</span><del>- [_contentView didUpdateVisibleRect:visibleRectInContentCoordinates unobscuredRect:unobscuredRectInContentCoordinates scale:scaleFactor inStableState:isStateStable];
</del><ins>+ BOOL isStableState = !(_isChangingObscuredInsetsInteractively || [_scrollView isDragging] || [_scrollView isDecelerating] || [_scrollView isZooming] || [_scrollView isZoomBouncing] || [_scrollView _isAnimatingZoom]);
+ [_contentView didUpdateVisibleRect:visibleRectInContentCoordinates unobscuredRect:unobscuredRectInContentCoordinates scale:scaleFactor inStableState:isStableState];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_keyboardChangedWithInfo:(NSDictionary *)keyboardInfo adjustScrollView:(BOOL)adjustScrollView
</span><span class="lines">@@ -805,7 +806,7 @@
</span><span class="cx"> ASSERT(obscuredInsets.bottom >= 0);
</span><span class="cx"> ASSERT(obscuredInsets.right >= 0);
</span><span class="cx"> _obscuredInsets = obscuredInsets;
</span><del>- [self _updateVisibleContentRectsWithStableState:!_isChangingObscuredInsetsInteractively];
</del><ins>+ [self _updateVisibleContentRects];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (UIColor *)_pageExtendedBackgroundColor
</span><span class="lines">@@ -837,7 +838,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(_isChangingObscuredInsetsInteractively);
</span><span class="cx"> _isChangingObscuredInsetsInteractively = NO;
</span><del>- [self _updateVisibleContentRectsWithStableState:YES];
</del><ins>+ [self _updateVisibleContentRects];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #else
</span></span></pre>
</div>
</div>
</body>
</html>