<!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>[166188] 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/166188">166188</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-24 13:51:02 -0700 (Mon, 24 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] Micro-optimize view state updates on the UIProcess side
https://bugs.webkit.org/show_bug.cgi?id=130631
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-03-24
Reviewed by Darin Adler.
* UIProcess/API/Cocoa/WKWebView.mm:
(contentZoomScale):
[UIScrollView zoomScale] is not fast enough for -[WKWebView _updateVisibleContentRects]. Since we know what the zoom view is,
make a fast version hardcoding that.
(-[WKWebView _updateScrollViewBackground]):
(-[WKWebView _zoomToPoint:WebCore::atScale:]):
(-[WKWebView _scrollToRect:WebCore::origin:WebCore::minimumScrollDistance:]):
(-[WKWebView _zoomToRect:WebCore::withOrigin:WebCore::fitEntireRect:minimumScale:maximumScale:minimumScrollDistance:]):
(-[WKWebView _updateVisibleContentRects]):
* UIProcess/ios/WKContentView.mm:
(fixedPositionRectFromExposedRect):
(-[WKContentView didUpdateVisibleRect:unobscuredRect:scale:inStableState:]):</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="#trunkSourceWebKit2UIProcessiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166187 => 166188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-24 20:29:54 UTC (rev 166187)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-24 20:51:02 UTC (rev 166188)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-03-24 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS][WK2] Micro-optimize view state updates on the UIProcess side
+ https://bugs.webkit.org/show_bug.cgi?id=130631
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (contentZoomScale):
+ [UIScrollView zoomScale] is not fast enough for -[WKWebView _updateVisibleContentRects]. Since we know what the zoom view is,
+ make a fast version hardcoding that.
+
+ (-[WKWebView _updateScrollViewBackground]):
+ (-[WKWebView _zoomToPoint:WebCore::atScale:]):
+ (-[WKWebView _scrollToRect:WebCore::origin:WebCore::minimumScrollDistance:]):
+ (-[WKWebView _zoomToRect:WebCore::withOrigin:WebCore::fitEntireRect:minimumScale:maximumScale:minimumScrollDistance:]):
+ (-[WKWebView _updateVisibleContentRects]):
+ * UIProcess/ios/WKContentView.mm:
+ (fixedPositionRectFromExposedRect):
+ (-[WKContentView didUpdateVisibleRect:unobscuredRect:scale:inStableState:]):
+
</ins><span class="cx"> 2014-03-24 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove WebGL asset entitlement
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (166187 => 166188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-24 20:29:54 UTC (rev 166187)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-24 20:51:02 UTC (rev 166188)
</span><span class="lines">@@ -385,13 +385,28 @@
</span><span class="cx"> return [UIColor colorWithRed:(color.red() / 255.0) green:(color.green() / 255.0) blue:(color.blue() / 255.0) alpha:(color.alpha() / 255.0)];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static CGFloat contentZoomScale(WKWebView* webView)
+{
+ UIView *zoomView;
+ if (webView->_customContentView)
+ zoomView = webView->_customContentView.get();
+ else
+ zoomView = webView->_contentView.get();
+
+ CGFloat scale = [[zoomView layer] affineTransform].a;
+ ASSERT(scale == [webView->_scrollView zoomScale]);
+ return scale;
+}
+
</ins><span class="cx"> - (void)_updateScrollViewBackground
</span><span class="cx"> {
</span><span class="cx"> UIColor *pageExtendedBackgroundColor = [self pageExtendedBackgroundColor];
</span><span class="cx">
</span><del>- if ([_scrollView zoomScale] < [_scrollView minimumZoomScale]) {
</del><ins>+ CGFloat zoomScale = contentZoomScale(self);
+ CGFloat minimumZoomScale = [_scrollView minimumZoomScale];
+ if (zoomScale < minimumZoomScale) {
</ins><span class="cx"> CGFloat slope = 12;
</span><del>- CGFloat opacity = std::max(1 - slope * ([_scrollView minimumZoomScale] - [_scrollView zoomScale]), static_cast<CGFloat>(0));
</del><ins>+ CGFloat opacity = std::max(1 - slope * (minimumZoomScale - zoomScale), static_cast<CGFloat>(0));
</ins><span class="cx"> pageExtendedBackgroundColor = [pageExtendedBackgroundColor colorWithAlphaComponent:opacity];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -438,9 +453,10 @@
</span><span class="cx"> double minimumZoomDuration = 0.1;
</span><span class="cx"> double zoomDurationFactor = 0.3;
</span><span class="cx">
</span><del>- CFTimeInterval duration = std::min(fabs(log([_scrollView zoomScale]) - log(scale)) * zoomDurationFactor + minimumZoomDuration, maximumZoomDuration);
</del><ins>+ CGFloat zoomScale = contentZoomScale(self);
+ CFTimeInterval duration = std::min(fabs(log(zoomScale) - log(scale)) * zoomDurationFactor + minimumZoomDuration, maximumZoomDuration);
</ins><span class="cx">
</span><del>- if (scale != [_scrollView zoomScale])
</del><ins>+ if (scale != zoomScale)
</ins><span class="cx"> [_contentView willStartUserTriggeredZoom];
</span><span class="cx">
</span><span class="cx"> [_scrollView _zoomToCenter:point scale:scale duration:duration];
</span><span class="lines">@@ -500,7 +516,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebCore::FloatSize scrollViewOffsetDelta = newUnobscuredContentOffset - unobscuredContentOffset;
</span><del>- scrollViewOffsetDelta.scale([_scrollView zoomScale]);
</del><ins>+ scrollViewOffsetDelta.scale(contentZoomScale(self));
</ins><span class="cx">
</span><span class="cx"> float scrollDistance = scrollViewOffsetDelta.diagonalLength();
</span><span class="cx"> if (scrollDistance < minimumScrollDistance)
</span><span class="lines">@@ -519,7 +535,7 @@
</span><span class="cx"> {
</span><span class="cx"> const float maximumScaleFactorDeltaForPanScroll = 0.02;
</span><span class="cx">
</span><del>- double currentScale = [_scrollView zoomScale];
</del><ins>+ double currentScale = contentZoomScale(self);
</ins><span class="cx">
</span><span class="cx"> WebCore::FloatSize unobscuredContentSize([self _contentRectForUserInteraction].size);
</span><span class="cx"> double horizontalScale = unobscuredContentSize.width() * currentScale / targetRect.width();
</span><span class="lines">@@ -654,7 +670,7 @@
</span><span class="cx"> CGRect unobscuredRect = UIEdgeInsetsInsetRect(fullViewRect, _obscuredInsets);
</span><span class="cx"> CGRect unobscuredRectInContentCoordinates = [self convertRect:unobscuredRect toView:_contentView.get()];
</span><span class="cx">
</span><del>- CGFloat scaleFactor = [_scrollView zoomScale];
</del><ins>+ CGFloat scaleFactor = contentZoomScale(self);
</ins><span class="cx">
</span><span class="cx"> BOOL isStableState = !(_isChangingObscuredInsetsInteractively || [_scrollView isDragging] || [_scrollView isDecelerating] || [_scrollView isZooming] || [_scrollView isZoomBouncing] || [_scrollView _isAnimatingZoom]);
</span><span class="cx"> [_contentView didUpdateVisibleRect:visibleRectInContentCoordinates unobscuredRect:unobscuredRectInContentCoordinates scale:scaleFactor inStableState:isStableState];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (166187 => 166188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-03-24 20:29:54 UTC (rev 166187)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-03-24 20:51:02 UTC (rev 166188)
</span><span class="lines">@@ -235,6 +235,11 @@
</span><span class="cx"> return [self isEditable];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline FloatRect fixedPositionRectFromExposedRect(CGRect unobscuredRect, CGSize documentSize, CGFloat scale)
+{
+ return FrameView::rectForViewportConstrainedObjects(enclosingLayoutRect(unobscuredRect), roundedLayoutSize(FloatSize(documentSize)), scale, false, StickToViewportBounds);
+}
+
</ins><span class="cx"> - (void)didUpdateVisibleRect:(CGRect)visibleRect unobscuredRect:(CGRect)unobscuredRect scale:(CGFloat)zoomScale inStableState:(BOOL)isStableState
</span><span class="cx"> {
</span><span class="cx"> double timestamp = monotonicallyIncreasingTime();
</span><span class="lines">@@ -252,7 +257,7 @@
</span><span class="cx"> filteredScale = _page->displayedContentScale();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CGRect customFixedPositionRect = [self fixedPositionRectFromExposedRect:unobscuredRect scale:zoomScale];
</del><ins>+ FloatRect customFixedPositionRect = fixedPositionRectFromExposedRect(unobscuredRect, [self bounds].size, zoomScale);
</ins><span class="cx"> _page->updateVisibleContentRects(VisibleContentRectUpdateInfo(_page->nextVisibleContentRectUpdateID(), visibleRect, unobscuredRect, customFixedPositionRect, filteredScale, isStableState, timestamp, velocity.width, velocity.height));
</span><span class="cx">
</span><span class="cx"> RemoteScrollingCoordinatorProxy* scrollingCoordinator = _page->scrollingCoordinatorProxy();
</span><span class="lines">@@ -267,11 +272,6 @@
</span><span class="cx"> _page->drawingArea()->setSize(IntSize(size), IntSize(), IntSize());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (CGRect)fixedPositionRectFromExposedRect:(CGRect)unobscuredRect scale:(CGFloat)scale
-{
- return (FloatRect)FrameView::rectForViewportConstrainedObjects(enclosingLayoutRect(unobscuredRect), roundedLayoutSize(FloatSize([self bounds].size)), scale, false, StickToViewportBounds);
-}
-
</del><span class="cx"> - (void)setMinimumLayoutSize:(CGSize)size
</span><span class="cx"> {
</span><span class="cx"> _page->setViewportConfigurationMinimumLayoutSize(IntSize(CGCeiling(size.width), CGCeiling(size.height)));
</span></span></pre>
</div>
</div>
</body>
</html>