<!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>[169549] 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/169549">169549</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-02 15:18:54 -0700 (Mon, 02 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] Round the UIScrollView content size to device pixel
https://bugs.webkit.org/show_bug.cgi?id=133417
<rdar://problem/15922440>
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-06-02
Reviewed by Simon Fraser.
We should really have the scaled content size floored to device pixels, but that will be for another
time.
This patch ensure the content size as seen by the API is rounded to device pixels. The value is floored
to avoid showing partial pixels when the content is stable.
* UIProcess/API/Cocoa/WKWebView.mm:
(floorFloatToPixels):
(roundScrollViewCountentSize):
(-[WKWebView _setHasCustomContentView:loadedMIMEType:WTF::]):
(-[WKWebView _didCommitLayerTree:WebKit::]):
(-[WKWebView scrollView:contentSizeForZoomScale:withProposedSize:]):
(-[WKWebView _beginAnimatedResizeWithUpdates:]):
(-[WKWebView _endAnimatedResize]):</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 (169548 => 169549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-02 22:13:43 UTC (rev 169548)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-02 22:18:54 UTC (rev 169549)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-06-02 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS][WK2] Round the UIScrollView content size to device pixel
+ https://bugs.webkit.org/show_bug.cgi?id=133417
+ <rdar://problem/15922440>
+
+ Reviewed by Simon Fraser.
+
+ We should really have the scaled content size floored to device pixels, but that will be for another
+ time.
+ This patch ensure the content size as seen by the API is rounded to device pixels. The value is floored
+ to avoid showing partial pixels when the content is stable.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (floorFloatToPixels):
+ (roundScrollViewCountentSize):
+ (-[WKWebView _setHasCustomContentView:loadedMIMEType:WTF::]):
+ (-[WKWebView _didCommitLayerTree:WebKit::]):
+ (-[WKWebView scrollView:contentSizeForZoomScale:withProposedSize:]):
+ (-[WKWebView _beginAnimatedResizeWithUpdates:]):
+ (-[WKWebView _endAnimatedResize]):
+
</ins><span class="cx"> 2014-06-02 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Move ifdef to the right place.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (169548 => 169549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-06-02 22:13:43 UTC (rev 169548)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-06-02 22:18:54 UTC (rev 169549)
</span><span class="lines">@@ -452,6 +452,17 @@
</span><span class="cx"> return [_contentView browsingContextController];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline CGFloat floorToDevicePixel(CGFloat input, float deviceScaleFactor)
+{
+ return CGFloor(input * deviceScaleFactor) / deviceScaleFactor;
+}
+
+static CGSize roundScrollViewContentSize(const WebKit::WebPageProxy& page, CGSize contentSize)
+{
+ float deviceScaleFactor = page.deviceScaleFactor();
+ return CGSizeMake(floorToDevicePixel(contentSize.width, deviceScaleFactor), floorToDevicePixel(contentSize.height, deviceScaleFactor));
+}
+
</ins><span class="cx"> - (void)_setHasCustomContentView:(BOOL)pageHasCustomContentView loadedMIMEType:(const WTF::String&)mimeType
</span><span class="cx"> {
</span><span class="cx"> if (pageHasCustomContentView) {
</span><span class="lines">@@ -480,7 +491,7 @@
</span><span class="cx"> _customContentFixedOverlayView = nullptr;
</span><span class="cx">
</span><span class="cx"> [_scrollView addSubview:_contentView.get()];
</span><del>- [_scrollView setContentSize:[_contentView frame].size];
</del><ins>+ [_scrollView setContentSize:roundScrollViewContentSize(*_page, [_contentView frame].size)];
</ins><span class="cx">
</span><span class="cx"> [_customContentFixedOverlayView setFrame:self.bounds];
</span><span class="cx"> [self addSubview:_customContentFixedOverlayView.get()];
</span><span class="lines">@@ -599,7 +610,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- [_scrollView setContentSize:[_contentView frame].size];
</del><ins>+ [_scrollView setContentSize:roundScrollViewContentSize(*_page, [_contentView frame].size)];
</ins><span class="cx"> [_scrollView setMinimumZoomScale:layerTreeTransaction.minimumScaleFactor()];
</span><span class="cx"> [_scrollView setMaximumZoomScale:layerTreeTransaction.maximumScaleFactor()];
</span><span class="cx"> [_scrollView setZoomEnabled:layerTreeTransaction.allowsUserScaling()];
</span><span class="lines">@@ -928,6 +939,11 @@
</span><span class="cx"> return !_customContentView;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (CGSize)scrollView:(UIScrollView*)scrollView contentSizeForZoomScale:(CGFloat)scale withProposedSize:(CGSize)proposedSize
+{
+ return roundScrollViewContentSize(*_page, proposedSize);
+}
+
</ins><span class="cx"> - (UIView *)viewForZoomingInScrollView:(UIScrollView *)scrollView
</span><span class="cx"> {
</span><span class="cx"> ASSERT(_scrollView == scrollView);
</span><span class="lines">@@ -1772,7 +1788,7 @@
</span><span class="cx"> contentOffset.y = -_obscuredInsets.top;
</span><span class="cx">
</span><span class="cx"> // FIXME: if we have content centered after double tap to zoom, we should also try to keep that rect in view.
</span><del>- [_scrollView setContentSize:futureContentSizeInSelfCoordinates];
</del><ins>+ [_scrollView setContentSize:roundScrollViewContentSize(*_page, futureContentSizeInSelfCoordinates)];
</ins><span class="cx"> [_scrollView setContentOffset:contentOffset];
</span><span class="cx">
</span><span class="cx"> CGRect visibleRectInContentCoordinates = [self convertRect:newBounds toView:_contentView.get()];
</span><span class="lines">@@ -1824,7 +1840,7 @@
</span><span class="cx"> double horizontalScrollAdjustement = _resizeAnimationTransformAdjustments.m41 * animatingScaleTarget;
</span><span class="cx"> double verticalScrollAdjustment = _resizeAnimationTransformAdjustments.m42 * animatingScaleTarget;
</span><span class="cx">
</span><del>- [_scrollView setContentSize:[_contentView frame].size];
</del><ins>+ [_scrollView setContentSize:roundScrollViewContentSize(*_page, [_contentView frame].size)];
</ins><span class="cx"> [_scrollView setContentOffset:CGPointMake(currentScrollOffset.x - horizontalScrollAdjustement, currentScrollOffset.y - verticalScrollAdjustment)];
</span><span class="cx">
</span><span class="cx"> [_resizeAnimationView removeFromSuperview];
</span></span></pre>
</div>
</div>
</body>
</html>