<!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>[212964] branches/safari-603.1.30.1-branch</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/212964">212964</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-24 11:41:59 -0800 (Fri, 24 Feb 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Roll out <a href="http://trac.webkit.org/projects/webkit/changeset/212459">r212459</a> via <a href="http://trac.webkit.org/projects/webkit/changeset/212537">r212537</a>. rdar://problem/30699480</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6031301branchLayoutTestsChangeLog">branches/safari-603.1.30.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6031301branchLayoutTestsscrollingcoordinatoriossynclayerpositionsafterscrollexpectedtxt">branches/safari-603.1.30.1-branch/LayoutTests/scrollingcoordinator/ios/sync-layer-positions-after-scroll-expected.txt</a></li>
<li><a href="#branchessafari6031301branchLayoutTestsscrollingcoordinatoriossynclayerpositionsafterscrollhtml">branches/safari-603.1.30.1-branch/LayoutTests/scrollingcoordinator/ios/sync-layer-positions-after-scroll.html</a></li>
<li><a href="#branchessafari6031301branchSourceWebKit2ChangeLog">branches/safari-603.1.30.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6031301branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari6031301branchSourceWebKit2UIProcessAPICocoaWKWebViewInternalh">branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h</a></li>
<li><a href="#branchessafari6031301branchSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#branchessafari6031301branchSourceWebKit2UIProcessiosWKContentViewmm">branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#branchessafari6031301branchSourceWebKit2UIProcessiosWKContentViewInteractionmm">branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#branchessafari6031301branchSourceWebKit2UIProcessiosWKScrollViewmm">branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/ios/WKScrollView.mm</a></li>
<li><a href="#branchessafari6031301branchToolsChangeLog">branches/safari-603.1.30.1-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari6031301branchToolsDumpRenderTreeiosUIScriptControllerIOSmm">branches/safari-603.1.30.1-branch/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm</a></li>
<li><a href="#branchessafari6031301branchToolsDumpRenderTreemacUIScriptControllerMacmm">branches/safari-603.1.30.1-branch/Tools/DumpRenderTree/mac/UIScriptControllerMac.mm</a></li>
<li><a href="#branchessafari6031301branchToolsTestRunnerSharedUIScriptContextBindingsUIScriptControlleridl">branches/safari-603.1.30.1-branch/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl</a></li>
<li><a href="#branchessafari6031301branchToolsTestRunnerSharedUIScriptContextUIScriptControllercpp">branches/safari-603.1.30.1-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp</a></li>
<li><a href="#branchessafari6031301branchToolsTestRunnerSharedUIScriptContextUIScriptControllerh">branches/safari-603.1.30.1-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h</a></li>
<li><a href="#branchessafari6031301branchToolsWebKitTestRunnercocoaTestRunnerWKWebViewmm">branches/safari-603.1.30.1-branch/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm</a></li>
<li><a href="#branchessafari6031301branchToolsWebKitTestRunneriosUIScriptControllerIOSmm">branches/safari-603.1.30.1-branch/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm</a></li>
<li><a href="#branchessafari6031301branchToolsWebKitTestRunnermacUIScriptControllerMacmm">branches/safari-603.1.30.1-branch/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6031301branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/LayoutTests/ChangeLog (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/LayoutTests/ChangeLog        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/LayoutTests/ChangeLog        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2017-02-24  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
+        Rollout r212537. rdar://problem/30699480
+
</ins><span class="cx"> 2017-02-23  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Rollout r212740. rdar://problem/30636288
</span></span></pre></div>
<a id="branchessafari6031301branchLayoutTestsscrollingcoordinatoriossynclayerpositionsafterscrollexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/LayoutTests/scrollingcoordinator/ios/sync-layer-positions-after-scroll-expected.txt (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/LayoutTests/scrollingcoordinator/ios/sync-layer-positions-after-scroll-expected.txt        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/LayoutTests/scrollingcoordinator/ios/sync-layer-positions-after-scroll-expected.txt        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-visibleRectAfterScroll: {&quot;left&quot;:0,&quot;top&quot;:190,&quot;width&quot;:320,&quot;height&quot;:548}
</del><ins>+visibleRectAfterScroll: {&quot;left&quot;:0,&quot;top&quot;:190,&quot;width&quot;:800,&quot;height&quot;:600}
</ins><span class="cx"> (GraphicsLayer
</span><span class="cx">   (anchor 0.00 0.00)
</span><span class="cx">   (bounds 1308.00 2021.00)
</span></span></pre></div>
<a id="branchessafari6031301branchLayoutTestsscrollingcoordinatoriossynclayerpositionsafterscrollhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/LayoutTests/scrollingcoordinator/ios/sync-layer-positions-after-scroll.html (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/LayoutTests/scrollingcoordinator/ios/sync-layer-positions-after-scroll.html        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/LayoutTests/scrollingcoordinator/ios/sync-layer-positions-after-scroll.html        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -1,8 +1,7 @@
</span><del>-&lt;!DOCTYPE html&gt; &lt;!-- webkit-test-runner [ useFlexibleViewport=true ] --&gt;
</del><ins>+&lt;!DOCTYPE html&gt;
</ins><span class="cx"> 
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><del>-    &lt;meta name=&quot;viewport&quot; content=&quot;initial-scale=1.0&quot;&gt;
</del><span class="cx">     &lt;style&gt;
</span><span class="cx">         body {
</span><span class="cx">             width: 1300px;
</span><span class="lines">@@ -76,9 +75,7 @@
</span><span class="cx">                 };
</span><span class="cx"> 
</span><span class="cx">                 uiController.sendEventStream(JSON.stringify(movedFingerDownStream), function() {
</span><del>-                    uiController.doAfterVisibleContentRectUpdate(function () {
-                        uiController.uiScriptComplete(JSON.stringify(uiController.contentVisibleRect));
-                    });
</del><ins>+                    uiController.uiScriptComplete(JSON.stringify(uiController.contentVisibleRect));
</ins><span class="cx">                 });
</span><span class="cx">             })();`;
</span><span class="cx">         }
</span><span class="lines">@@ -105,7 +102,7 @@
</span><span class="cx">                 testRunner.runUIScript(getDragUIScript(xPos, startY, xPos, endY), function(visibleRectAfterScroll) {
</span><span class="cx">                     var result = 'visibleRectAfterScroll: ' + visibleRectAfterScroll + '\n' + internals.layerTreeAsText(document);
</span><span class="cx">                     document.getElementById('layers').textContent = result;
</span><del>-                    // Now send the final touch up.
</del><ins>+                    // Now send the finel touch up.
</ins><span class="cx">                     testRunner.runUIScript(getFingerUpUIScript(xPos, endY), function() {
</span><span class="cx">                         testRunner.notifyDone();
</span><span class="cx">                     });
</span></span></pre></div>
<a id="branchessafari6031301branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/Source/WebKit2/ChangeLog (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/Source/WebKit2/ChangeLog        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/Source/WebKit2/ChangeLog        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2017-02-24  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
+        Rollout r212537. rdar://problem/30699480
+
</ins><span class="cx"> 2017-02-20  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Rollout r212660. rdar://problem/30553220
</span></span></pre></div>
<a id="branchessafari6031301branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -280,10 +280,6 @@
</span><span class="cx"> 
</span><span class="cx">     Vector&lt;std::function&lt;void ()&gt;&gt; _snapshotsDeferredDuringResize;
</span><span class="cx">     RetainPtr&lt;NSMutableArray&gt; _stableStatePresentationUpdateCallbacks;
</span><del>-
-    BOOL _hasInstalledPreCommitHandlerForVisibleRectUpdate;
-    BOOL _visibleContentRectUpdateScheduledFromScrollViewInStableState;
-    Vector&lt;BlockPtr&lt;void ()&gt;&gt; _visibleContentRectUpdateCallbacks;
</del><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">     std::unique_ptr&lt;WebKit::WebViewImpl&gt; _impl;
</span><span class="lines">@@ -1139,7 +1135,7 @@
</span><span class="cx">     _delayUpdateVisibleContentRects = NO;
</span><span class="cx">     if (_hadDelayedUpdateVisibleContentRects) {
</span><span class="cx">         _hadDelayedUpdateVisibleContentRects = NO;
</span><del>-        [self _scheduleVisibleContentRectUpdate];
</del><ins>+        [self _updateVisibleContentRectAfterScrollInView:_scrollView.get()];
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1401,7 +1397,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (needUpdateVisbleContentRects)
</span><del>-        [self _scheduleVisibleContentRectUpdate];
</del><ins>+        [self _updateVisibleContentRects];
</ins><span class="cx"> 
</span><span class="cx">     if (WebKit::RemoteLayerTreeScrollingPerformanceData* scrollPerfData = _page-&gt;scrollingPerformanceData())
</span><span class="cx">         scrollPerfData-&gt;didCommitLayerTree([self visibleRectInViewCoordinates]);
</span><span class="lines">@@ -1926,7 +1922,7 @@
</span><span class="cx">     if (![self usesStandardContentView])
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    [self _scheduleVisibleContentRectUpdate];
</del><ins>+    [self _updateVisibleContentRectAfterScrollInView:_scrollView.get()];
</ins><span class="cx">     [_contentView didFinishScrolling];
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1980,7 +1976,7 @@
</span><span class="cx">     if (![self usesStandardContentView])
</span><span class="cx">         [_customContentView scrollViewDidScroll:(UIScrollView *)scrollView];
</span><span class="cx"> 
</span><del>-    [self _scheduleVisibleContentRectUpdateAfterScrollInView:scrollView];
</del><ins>+    [self _updateVisibleContentRectAfterScrollInView:scrollView];
</ins><span class="cx">     
</span><span class="cx">     if (WebKit::RemoteLayerTreeScrollingPerformanceData* scrollPerfData = _page-&gt;scrollingPerformanceData())
</span><span class="cx">         scrollPerfData-&gt;didScroll([self visibleRectInViewCoordinates]);
</span><span class="lines">@@ -1989,13 +1985,13 @@
</span><span class="cx"> - (void)scrollViewDidZoom:(UIScrollView *)scrollView
</span><span class="cx"> {
</span><span class="cx">     [self _updateScrollViewBackground];
</span><del>-    [self _scheduleVisibleContentRectUpdateAfterScrollInView:scrollView];
</del><ins>+    [self _updateVisibleContentRectAfterScrollInView:scrollView];
</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 _scheduleVisibleContentRectUpdateAfterScrollInView:scrollView];
</del><ins>+    [self _updateVisibleContentRectAfterScrollInView:scrollView];
</ins><span class="cx">     [_contentView didZoomToScale:scale];
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -2010,7 +2006,7 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     [_contentView didInterruptScrolling];
</span><del>-    [self _scheduleVisibleContentRectUpdateAfterScrollInView:scrollView];
</del><ins>+    [self _updateVisibleContentRectAfterScrollInView:scrollView];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (CGRect)_visibleRectInEnclosingScrollView:(UIScrollView *)enclosingScrollView
</span><span class="lines">@@ -2041,7 +2037,7 @@
</span><span class="cx"> // Called when some ancestor UIScrollView scrolls.
</span><span class="cx"> - (void)_didScroll
</span><span class="cx"> {
</span><del>-    [self _scheduleVisibleContentRectUpdateAfterScrollInView:[self _scroller]];
</del><ins>+    [self _updateVisibleContentRectAfterScrollInView:[self _scroller]];
</ins><span class="cx"> 
</span><span class="cx">     const NSTimeInterval ScrollingEndedTimerInterval = 0.032;
</span><span class="cx">     if (!_enclosingScrollViewScrollTimer) {
</span><span class="lines">@@ -2059,7 +2055,7 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    [self _scheduleVisibleContentRectUpdate];
</del><ins>+    [self _updateVisibleContentRects];
</ins><span class="cx">     [_enclosingScrollViewScrollTimer invalidate];
</span><span class="cx">     _enclosingScrollViewScrollTimer = nil;
</span><span class="cx"> }
</span><span class="lines">@@ -2079,7 +2075,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     [_customContentView web_setMinimumSize:bounds.size];
</span><del>-    [self _scheduleVisibleContentRectUpdate];
</del><ins>+    [self _updateVisibleContentRects];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // Unobscured content rect where the user can interact. When the keyboard is up, this should be the area above or below the keyboard, wherever there is enough space.
</span><span class="lines">@@ -2102,22 +2098,23 @@
</span><span class="cx">     return !pointsEqualInDevicePixels(contentOffset, boundedOffset, deviceScaleFactor);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)_scheduleVisibleContentRectUpdate
</del><ins>+- (void)_updateVisibleContentRects
</ins><span class="cx"> {
</span><del>-    // For visible rect updates not associated with a specific UIScrollView, just consider our own scroller.
-    [self _scheduleVisibleContentRectUpdateAfterScrollInView:_scrollView.get()];
</del><ins>+    // For visible rect updates not associated with a spefic UIScrollView, just consider our own scroller.
+    [self _updateVisibleContentRectAfterScrollInView:_scrollView.get()];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (BOOL)_scrollViewIsInStableState:(UIScrollView *)scrollView
</del><ins>+- (void)_updateVisibleContentRectAfterScrollInView:(UIScrollView *)scrollView
</ins><span class="cx"> {
</span><span class="cx">     BOOL isStableState = !([scrollView isDragging] || [scrollView isDecelerating] || [scrollView isZooming] || [scrollView _isAnimatingZoom] || [scrollView _isScrollingToTop]);
</span><span class="cx"> 
</span><span class="cx">     if (isStableState &amp;&amp; scrollView == _scrollView.get())
</span><span class="cx">         isStableState = !_isChangingObscuredInsetsInteractively;
</span><del>-
</del><ins>+    
</ins><span class="cx">     if (isStableState &amp;&amp; scrollView == _scrollView.get())
</span><span class="cx">         isStableState = ![self _scrollViewIsRubberBanding];
</span><span class="cx"> 
</span><ins>+    // FIXME: this can be made static after we stop supporting iOS 8.x.
</ins><span class="cx">     if (isStableState &amp;&amp; [scrollView respondsToSelector:@selector(_isInterruptingDeceleration)])
</span><span class="cx">         isStableState = ![scrollView performSelector:@selector(_isInterruptingDeceleration)];
</span><span class="cx"> 
</span><span class="lines">@@ -2124,25 +2121,9 @@
</span><span class="cx">     if (NSNumber *stableOverride = self._stableStateOverride)
</span><span class="cx">         isStableState = stableOverride.boolValue;
</span><span class="cx"> 
</span><del>-    return isStableState;
</del><ins>+    [self _updateContentRectsWithState:isStableState];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)_scheduleVisibleContentRectUpdateAfterScrollInView:(UIScrollView *)scrollView
-{
-    _visibleContentRectUpdateScheduledFromScrollViewInStableState = [self _scrollViewIsInStableState:scrollView];
-
-    if (_hasInstalledPreCommitHandlerForVisibleRectUpdate)
-        return;
-
-    _hasInstalledPreCommitHandlerForVisibleRectUpdate = YES;
-
-    [CATransaction addCommitHandler:[retainedSelf = retainPtr(self)] {
-        WKWebView *webView = retainedSelf.get();
-        [webView _updateVisibleContentRects];
-        webView-&gt;_hasInstalledPreCommitHandlerForVisibleRectUpdate = NO;
-    } forPhase:kCATransactionPhasePreCommit];
-}
-
</del><span class="cx"> static bool scrollViewCanScroll(UIScrollView *scrollView)
</span><span class="cx"> {
</span><span class="cx">     if (!scrollView)
</span><span class="lines">@@ -2181,10 +2162,8 @@
</span><span class="cx">     return extendedBounds;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)_updateVisibleContentRects
</del><ins>+- (void)_updateContentRectsWithState:(BOOL)inStableState
</ins><span class="cx"> {
</span><del>-    BOOL inStableState = _visibleContentRectUpdateScheduledFromScrollViewInStableState;
-
</del><span class="cx">     if (![self usesStandardContentView]) {
</span><span class="cx">         [_customContentView web_computedContentInsetDidChange];
</span><span class="cx">         return;
</span><span class="lines">@@ -2242,11 +2221,6 @@
</span><span class="cx">         inStableState:inStableState
</span><span class="cx">         isChangingObscuredInsetsInteractively:_isChangingObscuredInsetsInteractively
</span><span class="cx">         enclosedInScrollableAncestorView:scrollViewCanScroll([self _scroller])];
</span><del>-
-    while (!_visibleContentRectUpdateCallbacks.isEmpty()) {
-        auto callback = _visibleContentRectUpdateCallbacks.takeLast();
-        callback();
-    }
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)_didFinishLoadForMainFrame
</span><span class="lines">@@ -2292,7 +2266,7 @@
</span><span class="cx">             _totalScrollViewBottomInsetAdjustmentForKeyboard += bottomInsetAfterAdjustment - bottomInsetBeforeAdjustment;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    [self _scheduleVisibleContentRectUpdate];
</del><ins>+    [self _updateVisibleContentRects];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (BOOL)_shouldUpdateKeyboardWithInfo:(NSDictionary *)keyboardInfo
</span><span class="lines">@@ -4194,7 +4168,7 @@
</span><span class="cx"> 
</span><span class="cx">     _obscuredInsets = obscuredInsets;
</span><span class="cx"> 
</span><del>-    [self _scheduleVisibleContentRectUpdate];
</del><ins>+    [self _updateVisibleContentRects];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)_setInterfaceOrientationOverride:(UIInterfaceOrientation)interfaceOrientation
</span><span class="lines">@@ -4267,7 +4241,7 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(_isChangingObscuredInsetsInteractively);
</span><span class="cx">     _isChangingObscuredInsetsInteractively = NO;
</span><del>-    [self _scheduleVisibleContentRectUpdate];
</del><ins>+    [self _updateVisibleContentRects];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)_hideContentUntilNextUpdate
</span><span class="lines">@@ -4313,7 +4287,7 @@
</span><span class="cx">             _page-&gt;setMaximumUnobscuredSize(WebCore::FloatSize(newMaximumUnobscuredSize));
</span><span class="cx">         if (_overridesInterfaceOrientation)
</span><span class="cx">             _page-&gt;setDeviceOrientation(newOrientation);
</span><del>-        [self _scheduleVisibleContentRectUpdate];
</del><ins>+        [self _updateVisibleContentRects];
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -4323,7 +4297,7 @@
</span><span class="cx">         &amp;&amp; oldOrientation == newOrientation
</span><span class="cx">         &amp;&amp; UIEdgeInsetsEqualToEdgeInsets(oldObscuredInsets, newObscuredInsets)) {
</span><span class="cx">         _dynamicViewportUpdateMode = DynamicViewportUpdateMode::NotResizing;
</span><del>-        [self _scheduleVisibleContentRectUpdate];
</del><ins>+        [self _updateVisibleContentRects];
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -4440,7 +4414,7 @@
</span><span class="cx"> 
</span><span class="cx">     _dynamicViewportUpdateMode = DynamicViewportUpdateMode::NotResizing;
</span><span class="cx">     [_contentView setHidden:NO];
</span><del>-    [self _scheduleVisibleContentRectUpdate];
</del><ins>+    [self _updateVisibleContentRects];
</ins><span class="cx"> 
</span><span class="cx">     while (!_snapshotsDeferredDuringResize.isEmpty())
</span><span class="cx">         _snapshotsDeferredDuringResize.takeLast()();
</span><span class="lines">@@ -5010,16 +4984,6 @@
</span><span class="cx">     [self _doAfterNextPresentationUpdate:updateBlock];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)_doAfterNextVisibleContentRectUpdate:(void (^)(void))updateBlock
-{
-#if PLATFORM(IOS)
-    _visibleContentRectUpdateCallbacks.append(makeBlockPtr(updateBlock));
-    [self _scheduleVisibleContentRectUpdate];
-#else
-    dispatch_async(dispatch_get_main_queue(), updateBlock);
-#endif
-}
-
</del><span class="cx"> - (void)_disableBackForwardSnapshotVolatilityForTesting
</span><span class="cx"> {
</span><span class="cx">     WebKit::ViewSnapshotStore::singleton().setDisableSnapshotVolatilityForTesting(true);
</span></span></pre></div>
<a id="branchessafari6031301branchSourceWebKit2UIProcessAPICocoaWKWebViewInternalh"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -99,7 +99,9 @@
</span><span class="cx"> - (void)_willInvokeUIScrollViewDelegateCallback;
</span><span class="cx"> - (void)_didInvokeUIScrollViewDelegateCallback;
</span><span class="cx"> 
</span><del>-- (void)_scheduleVisibleContentRectUpdate;
</del><ins>+- (void)_updateVisibleContentRects;
+- (void)_updateVisibleContentRectAfterScrollInView:(UIScrollView *)scrollView;
+- (void)_updateContentRectsWithState:(BOOL)inStableState;
</ins><span class="cx"> 
</span><span class="cx"> - (void)_didFinishLoadForMainFrame;
</span><span class="cx"> - (void)_didFailLoadForMainFrame;
</span></span></pre></div>
<a id="branchessafari6031301branchSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -322,7 +322,6 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)_doAfterNextPresentationUpdate:(void (^)(void))updateBlock WK_API_AVAILABLE(macosx(10.12), ios(10.0));
</span><span class="cx"> - (void)_doAfterNextPresentationUpdateWithoutWaitingForPainting:(void (^)(void))updateBlock WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
</span><del>-- (void)_doAfterNextVisibleContentRectUpdate:(void (^)(void))updateBlock WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
</del><span class="cx"> 
</span><span class="cx"> - (void)_disableBackForwardSnapshotVolatilityForTesting WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari6031301branchSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -572,7 +572,7 @@
</span><span class="cx">         [self updateFixedClippingView:fixedPositionRect];
</span><span class="cx"> 
</span><span class="cx">         // We need to push the new content bounds to the webview to update fixed position rects.
</span><del>-        [_webView _scheduleVisibleContentRectUpdate];
</del><ins>+        [_webView _updateVisibleContentRects];
</ins><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     // Updating the selection requires a full editor state. If the editor state is missing post layout
</span></span></pre></div>
<a id="branchessafari6031301branchSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -3713,7 +3713,7 @@
</span><span class="cx">     
</span><span class="cx">     // The custom fixed position rect behavior is affected by -isAssistingNode, so if that changes we need to recompute rects.
</span><span class="cx">     if (editableChanged)
</span><del>-        [_webView _scheduleVisibleContentRectUpdate];
</del><ins>+        [_webView _updateVisibleContentRects];
</ins><span class="cx">     
</span><span class="cx">     [self _displayFormNodeInputView];
</span><span class="cx"> 
</span><span class="lines">@@ -3747,7 +3747,7 @@
</span><span class="cx"> 
</span><span class="cx">     // The custom fixed position rect behavior is affected by -isAssistingNode, so if that changes we need to recompute rects.
</span><span class="cx">     if (editableChanged)
</span><del>-        [_webView _scheduleVisibleContentRectUpdate];
</del><ins>+        [_webView _updateVisibleContentRects];
</ins><span class="cx"> 
</span><span class="cx">     [_webView didEndFormControlInteraction];
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6031301branchSourceWebKit2UIProcessiosWKScrollViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/ios/WKScrollView.mm (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/ios/WKScrollView.mm        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/ios/WKScrollView.mm        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> {
</span><span class="cx">     [super setContentInset:contentInset];
</span><span class="cx"> 
</span><del>-    [_internalDelegate _scheduleVisibleContentRectUpdate];
</del><ins>+    [_internalDelegate _updateVisibleContentRects];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // Fetch top/left rubberband amounts (as negative values).
</span></span></pre></div>
<a id="branchessafari6031301branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/Tools/ChangeLog (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/Tools/ChangeLog        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/Tools/ChangeLog        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2017-02-24  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
+        Rollout r212537. rdar://problem/30699480
+
</ins><span class="cx"> 2017-02-17  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Rollout r212500. rdar://problem/29904368
</span></span></pre></div>
<a id="branchessafari6031301branchToolsDumpRenderTreeiosUIScriptControllerIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -63,11 +63,6 @@
</span><span class="cx">     doAsyncTask(callback);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void UIScriptController::doAfterVisibleContentRectUpdate(JSValueRef callback)
-{
-    doAsyncTask(callback);
-}
-
</del><span class="cx"> void UIScriptController::zoomToScale(double scale, JSValueRef callback)
</span><span class="cx"> {
</span><span class="cx">     RefPtr&lt;UIScriptController&gt; protectedThis(this);
</span></span></pre></div>
<a id="branchessafari6031301branchToolsDumpRenderTreemacUIScriptControllerMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/Tools/DumpRenderTree/mac/UIScriptControllerMac.mm (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/Tools/DumpRenderTree/mac/UIScriptControllerMac.mm        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/Tools/DumpRenderTree/mac/UIScriptControllerMac.mm        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -59,11 +59,6 @@
</span><span class="cx">     doAsyncTask(callback);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void UIScriptController::doAfterVisibleContentRectUpdate(JSValueRef callback)
-{
-    doAsyncTask(callback);
-}
-
</del><span class="cx"> void UIScriptController::insertText(JSStringRef, int, int)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6031301branchToolsTestRunnerSharedUIScriptContextBindingsUIScriptControlleridl"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx">     void doAfterPresentationUpdate(object callback); // Call the callback after sending a message to the WebProcess and receiving a subsequent update.
</span><span class="cx">     void doAfterNextStablePresentationUpdate(object callback);
</span><span class="cx"> 
</span><del>-    void doAfterVisibleContentRectUpdate(object callback);
-
</del><span class="cx">     void simulateAccessibilitySettingsChangeNotification(object callback);
</span><span class="cx"> 
</span><span class="cx">     // Interaction.
</span></span></pre></div>
<a id="branchessafari6031301branchToolsTestRunnerSharedUIScriptContextUIScriptControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -74,10 +74,6 @@
</span><span class="cx"> void UIScriptController::doAfterNextStablePresentationUpdate(JSValueRef)
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>-
-void UIScriptController::doAfterVisibleContentRectUpdate(JSValueRef)
-{
-}
</del><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> void UIScriptController::setDidStartFormControlInteractionCallback(JSValueRef callback)
</span></span></pre></div>
<a id="branchessafari6031301branchToolsTestRunnerSharedUIScriptContextUIScriptControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -54,7 +54,6 @@
</span><span class="cx">     void doAsyncTask(JSValueRef callback);
</span><span class="cx">     void doAfterPresentationUpdate(JSValueRef callback);
</span><span class="cx">     void doAfterNextStablePresentationUpdate(JSValueRef callback);
</span><del>-    void doAfterVisibleContentRectUpdate(JSValueRef callback);
</del><span class="cx"> 
</span><span class="cx">     void zoomToScale(double scale, JSValueRef callback);
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari6031301branchToolsWebKitTestRunnercocoaTestRunnerWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> - (void)scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(UIView *)view;
</span><span class="cx"> - (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(UIView *)view atScale:(CGFloat)scale;
</span><span class="cx"> - (void)_didFinishScrolling;
</span><del>-- (void)_scheduleVisibleContentRectUpdate;
</del><ins>+- (void)_updateVisibleContentRects;
</ins><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> - (void)_setStableStateOverride:(NSNumber *)overrideBoolean
</span><span class="cx"> {
</span><span class="cx">     m_stableStateOverride = overrideBoolean;
</span><del>-    [self _scheduleVisibleContentRectUpdate];
</del><ins>+    [self _updateVisibleContentRects];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari6031301branchToolsWebKitTestRunneriosUIScriptControllerIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -94,18 +94,6 @@
</span><span class="cx">     }];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void UIScriptController::doAfterVisibleContentRectUpdate(JSValueRef callback)
-{
-    TestRunnerWKWebView *webView = TestController::singleton().mainWebView()-&gt;platformView();
-
-    unsigned callbackID = m_context-&gt;prepareForAsyncTask(callback, CallbackTypeNonPersistent);
-    [webView _doAfterNextVisibleContentRectUpdate:^ {
-        if (!m_context)
-            return;
-        m_context-&gt;asyncTaskComplete(callbackID);
-    }];
-}
-
</del><span class="cx"> void UIScriptController::zoomToScale(double scale, JSValueRef callback)
</span><span class="cx"> {
</span><span class="cx">     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()-&gt;platformView();
</span></span></pre></div>
<a id="branchessafari6031301branchToolsWebKitTestRunnermacUIScriptControllerMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.1-branch/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm (212963 => 212964)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.1-branch/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm        2017-02-24 19:41:51 UTC (rev 212963)
+++ branches/safari-603.1.30.1-branch/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm        2017-02-24 19:41:59 UTC (rev 212964)
</span><span class="lines">@@ -66,11 +66,6 @@
</span><span class="cx">     doAsyncTask(callback);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void UIScriptController::doAfterVisibleContentRectUpdate(JSValueRef callback)
-{
-    doAsyncTask(callback);
-}
-
</del><span class="cx"> void UIScriptController::insertText(JSStringRef text, int location, int length)
</span><span class="cx"> {
</span><span class="cx"> #if WK_API_ENABLED
</span></span></pre>
</div>
</div>

</body>
</html>