<!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>[171080] 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/171080">171080</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-14 14:07:43 -0700 (Mon, 14 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] On rotation, RemoteLayerTreeDrawingArea renders one extra frame at the wrong orientation
https://bugs.webkit.org/show_bug.cgi?id=134875
Reviewed by Tim Horton.
On animated resize, the size of the DrawingAreaProxy was changed before the layout parameters were
changed. This in turn caused the WebProcess's DrawingArea to flush the layer tree while still
at the wrong orientation.
This patch fixes the issue by making a special case for animated resize:
-While starting animated resize, _frameOrBoundsChanged can be called several times in response to
the API's client changing the WKWebView. In that case, we do not update the drawing area.
-After the "updateBlock" is executed and the size have been changed, the dynamic viewport update
is computed, the dynamicViewportSizeUpdate is sent to the WebProcess, followed by the message
DrawingArea::updateGeometry(). Since both messages are asynchronous, they are received in that
order, and the updateGeometry() is always done after the viewport configuration has been updated.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _frameOrBoundsChanged]):
(-[WKWebView _beginAnimatedResizeWithUpdates:]):
* UIProcess/ios/WKContentView.h:
* UIProcess/ios/WKContentView.mm:
(-[WKContentView setMinimumSize:]): 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="#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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (171079 => 171080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-14 21:06:02 UTC (rev 171079)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-14 21:07:43 UTC (rev 171080)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-07-14 Benjamin Poulain <benjamin@webkit.org>
+
+ [iOS][WK2] On rotation, RemoteLayerTreeDrawingArea renders one extra frame at the wrong orientation
+ https://bugs.webkit.org/show_bug.cgi?id=134875
+
+ Reviewed by Tim Horton.
+
+ On animated resize, the size of the DrawingAreaProxy was changed before the layout parameters were
+ changed. This in turn caused the WebProcess's DrawingArea to flush the layer tree while still
+ at the wrong orientation.
+
+ This patch fixes the issue by making a special case for animated resize:
+ -While starting animated resize, _frameOrBoundsChanged can be called several times in response to
+ the API's client changing the WKWebView. In that case, we do not update the drawing area.
+ -After the "updateBlock" is executed and the size have been changed, the dynamic viewport update
+ is computed, the dynamicViewportSizeUpdate is sent to the WebProcess, followed by the message
+ DrawingArea::updateGeometry(). Since both messages are asynchronous, they are received in that
+ order, and the updateGeometry() is always done after the viewport configuration has been updated.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _frameOrBoundsChanged]):
+ (-[WKWebView _beginAnimatedResizeWithUpdates:]):
+ * UIProcess/ios/WKContentView.h:
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView setMinimumSize:]): Deleted.
+
</ins><span class="cx"> 2014-07-14 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] Fix withinEpsilon()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (171079 => 171080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-07-14 21:06:02 UTC (rev 171079)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-07-14 21:07:43 UTC (rev 171080)
</span><span class="lines">@@ -1309,6 +1309,8 @@
</span><span class="cx"> - (void)_frameOrBoundsChanged
</span><span class="cx"> {
</span><span class="cx"> CGRect bounds = self.bounds;
</span><ins>+ [_scrollView setFrame:bounds];
+
</ins><span class="cx"> if (!_isAnimatingResize) {
</span><span class="cx"> if (!_overridesMinimumLayoutSize)
</span><span class="cx"> _page->setViewportConfigurationMinimumLayoutSize(WebCore::FloatSize(bounds.size));
</span><span class="lines">@@ -1316,10 +1318,9 @@
</span><span class="cx"> _page->setViewportConfigurationMinimumLayoutSizeForMinimalUI(WebCore::FloatSize(bounds.size));
</span><span class="cx"> if (!_overridesMaximumUnobscuredSize)
</span><span class="cx"> _page->setMaximumUnobscuredSize(WebCore::FloatSize(bounds.size));
</span><ins>+ _page->drawingArea()->setSize(IntSize(size), IntSize(), IntSize());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- [_scrollView setFrame:bounds];
- [_contentView setMinimumSize:bounds.size];
</del><span class="cx"> [_customContentView web_setMinimumSize:bounds.size];
</span><span class="cx"> [self _updateVisibleContentRects];
</span><span class="cx"> }
</span><span class="lines">@@ -2198,6 +2199,7 @@
</span><span class="cx"> CGRect unobscuredRectInContentCoordinates = [self convertRect:futureUnobscuredRectInSelfCoordinates toView:_contentView.get()];
</span><span class="cx">
</span><span class="cx"> _page->dynamicViewportSizeUpdate(newMinimumLayoutSize, newMinimumLayoutSizeForMinimalUI, newMaximumUnobscuredSize, visibleRectInContentCoordinates, unobscuredRectInContentCoordinates, futureUnobscuredRectInSelfCoordinates, targetScale, newOrientation);
</span><ins>+ _page->drawingArea()->setSize(IntSize(newBounds.size), IntSize(), IntSize());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_endAnimatedResize
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm (171079 => 171080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-07-14 21:06:02 UTC (rev 171079)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-07-14 21:07:43 UTC (rev 171080)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> webPageProxy->setMaximumUnobscuredSize(size);
</span><span class="cx">
</span><span class="cx"> [_scrollView setFrame:bounds];
</span><del>- [_contentView setMinimumSize:bounds.size];
</del><ins>+ webPageProxy->drawingArea()->setSize(IntSize(bounds.size), IntSize(), IntSize());
</ins><span class="cx"> [self _updateVisibleContentRects];
</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 (171079 => 171080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.h 2014-07-14 21:06:02 UTC (rev 171079)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.h 2014-07-14 21:07:43 UTC (rev 171080)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithFrame:(CGRect)frame context:(WebKit::WebContext&)context configuration:(WebKit::WebPageConfiguration)webPageConfiguration webView:(WKWebView *)webView;
</span><span class="cx">
</span><del>-- (void)setMinimumSize:(CGSize)size;
</del><span class="cx"> - (void)didUpdateVisibleRect:(CGRect)visibleRect unobscuredRect:(CGRect)unobscuredRect
</span><span class="cx"> unobscuredRectInScrollViewCoordinates:(CGRect)unobscuredRectInScrollViewCoordinates
</span><span class="cx"> scale:(CGFloat)scale minimumScale:(CGFloat)minimumScale
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (171079 => 171080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-07-14 21:06:02 UTC (rev 171079)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-07-14 21:07:43 UTC (rev 171080)
</span><span class="lines">@@ -356,11 +356,6 @@
</span><span class="cx"> [self updateFixedClippingView:fixedPositionRect];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setMinimumSize:(CGSize)size
-{
- _page->drawingArea()->setSize(IntSize(size), IntSize(), IntSize());
-}
-
</del><span class="cx"> - (void)didFinishScrolling
</span><span class="cx"> {
</span><span class="cx"> [self _didEndScrollingOrZooming];
</span></span></pre>
</div>
</div>
</body>
</html>