<!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>[168941] branches/safari-538.34.5-branch/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/168941">168941</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-05-16 00:37:49 -0700 (Fri, 16 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/168568">r168568</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari538345branchSourceWebKit2ChangeLog">branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2UIProcessAPICocoaWKWebViewInternalh">branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2UIProcessiosWKContentViewmm">branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari538345branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog (168940 => 168941)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog 2014-05-16 07:35:25 UTC (rev 168940)
+++ branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog 2014-05-16 07:37:49 UTC (rev 168941)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2014-05-16 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r168568
+
+ 2014-05-09 Benjamin Poulain <benjamin@webkit.org>
+
+ [iOS][WK2] Reset the scroll position on the first frame after didCommitLoad
+ https://bugs.webkit.org/show_bug.cgi?id=132765
+
+ Reviewed by Tim Horton.
+
+ Since WebCore does not update our scroll view on load, we need to do that ourself.
+
+ In case where we need to restore the state from the history, RemoteLayerTreeDrawingAreaProxy
+ will always invoke the scrolling after didCommitLayerTree() (since r167916).
+ Consequently, it is now safe again to reset the scroll position ourself on the first frame.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _didCommitLoadForMainFrame]):
+ (-[WKWebView _didCommitLayerTree:WebKit::]):
+ * UIProcess/API/Cocoa/WKWebViewInternal.h:
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView _didCommitLoadForMainFrame]):
+
+2014-05-16 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r168563
</span><span class="cx">
</span><span class="cx"> 2014-05-09 Enrica Casucci <enrica@apple.com>
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (168940 => 168941)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-16 07:35:25 UTC (rev 168940)
+++ branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-16 07:37:49 UTC (rev 168941)
</span><span class="lines">@@ -114,6 +114,7 @@
</span><span class="cx"> UIView *_extendedBackgroundLayerTopInset;
</span><span class="cx"> UIView *_extendedBackgroundLayerBottomInset;
</span><span class="cx">
</span><ins>+ BOOL _needsResetViewStateAfterCommitLoadForMainFrame;
</ins><span class="cx"> BOOL _isAnimatingResize;
</span><span class="cx"> CATransform3D _resizeAnimationTransformAdjustments;
</span><span class="cx"> RetainPtr<UIView> _resizeAnimationView;
</span><span class="lines">@@ -456,6 +457,11 @@
</span><span class="cx"> _extendedBackgroundLayerBottomInset.backgroundColor = uiBackgroundColor.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_didCommitLoadForMainFrame
+{
+ _needsResetViewStateAfterCommitLoadForMainFrame = YES;
+}
+
</ins><span class="cx"> - (void)_didCommitLayerTree:(const WebKit::RemoteLayerTreeTransaction&)layerTreeTransaction
</span><span class="cx"> {
</span><span class="cx"> if (_customContentView)
</span><span class="lines">@@ -477,6 +483,11 @@
</span><span class="cx">
</span><span class="cx"> if (_gestureController)
</span><span class="cx"> _gestureController->setRenderTreeSize(layerTreeTransaction.renderTreeSize());
</span><ins>+
+ if (_needsResetViewStateAfterCommitLoadForMainFrame) {
+ _needsResetViewStateAfterCommitLoadForMainFrame = NO;
+ [_scrollView setContentOffset:CGPointMake(-_obscuredInsets.left, -_obscuredInsets.top)];
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_dynamicViewportUpdateChangedTargetToScale:(double)newScale position:(CGPoint)newScrollPosition
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2UIProcessAPICocoaWKWebViewInternalh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h (168940 => 168941)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2014-05-16 07:35:25 UTC (rev 168940)
+++ branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2014-05-16 07:37:49 UTC (rev 168941)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+- (void)_didCommitLoadForMainFrame;
</ins><span class="cx"> - (void)_didCommitLayerTree:(const WebKit::RemoteLayerTreeTransaction&)layerTreeTransaction;
</span><span class="cx">
</span><span class="cx"> - (void)_dynamicViewportUpdateChangedTargetToScale:(double)newScale position:(CGPoint)newScrollPosition;
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm (168940 => 168941)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-05-16 07:35:25 UTC (rev 168940)
+++ branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-05-16 07:37:49 UTC (rev 168941)
</span><span class="lines">@@ -413,6 +413,7 @@
</span><span class="cx"> - (void)_didCommitLoadForMainFrame
</span><span class="cx"> {
</span><span class="cx"> [self _stopAssistingNode];
</span><ins>+ [_webView _didCommitLoadForMainFrame];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_didCommitLayerTree:(const WebKit::RemoteLayerTreeTransaction&)layerTreeTransaction
</span></span></pre>
</div>
</div>
</body>
</html>