[webkit-changes] [212964] branches/safari-603.1.30.1-branch

Fri, 24 Feb 2017 11:41:13 -0800

Title: [212964] branches/safari-603.1.30.1-branch
Revision
212964
Author
matthew_han...@apple.com
Date
2017-02-24 11:41:59 -0800 (Fri, 24 Feb 2017)

Log Message

Roll out r212459 via r212537. rdar://problem/30699480


Modified Paths

Diff

Modified: branches/safari-603.1.30.1-branch/LayoutTests/ChangeLog (212963 => 212964)


--- 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)
@@ -1,3 +1,7 @@
+2017-02-24  Matthew Hanson  <matthew_han...@apple.com>
+
+        Rollout r212537. rdar://problem/30699480
+
 2017-02-23  Matthew Hanson  <matthew_han...@apple.com>
 
         Rollout r212740. rdar://problem/30636288

Modified: branches/safari-603.1.30.1-branch/LayoutTests/scrollingcoordinator/ios/sync-layer-positions-after-scroll-expected.txt (212963 => 212964)


--- 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)
@@ -1,4 +1,4 @@
-visibleRectAfterScroll: {"left":0,"top":190,"width":320,"height":548}
+visibleRectAfterScroll: {"left":0,"top":190,"width":800,"height":600}
 (GraphicsLayer
   (anchor 0.00 0.00)
   (bounds 1308.00 2021.00)

Modified: branches/safari-603.1.30.1-branch/LayoutTests/scrollingcoordinator/ios/sync-layer-positions-after-scroll.html (212963 => 212964)


--- 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)
@@ -1,8 +1,7 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
+<!DOCTYPE html>
 
 <html>
 <head>
-    <meta name="viewport" content="initial-scale=1.0">
     <style>
         body {
             width: 1300px;
@@ -76,9 +75,7 @@
                 };
 
                 uiController.sendEventStream(JSON.stringify(movedFingerDownStream), function() {
-                    uiController.doAfterVisibleContentRectUpdate(function () {
-                        uiController.uiScriptComplete(JSON.stringify(uiController.contentVisibleRect));
-                    });
+                    uiController.uiScriptComplete(JSON.stringify(uiController.contentVisibleRect));
                 });
             })();`;
         }
@@ -105,7 +102,7 @@
                 testRunner.runUIScript(getDragUIScript(xPos, startY, xPos, endY), function(visibleRectAfterScroll) {
                     var result = 'visibleRectAfterScroll: ' + visibleRectAfterScroll + '\n' + internals.layerTreeAsText(document);
                     document.getElementById('layers').textContent = result;
-                    // Now send the final touch up.
+                    // Now send the finel touch up.
                     testRunner.runUIScript(getFingerUpUIScript(xPos, endY), function() {
                         testRunner.notifyDone();
                     });

Modified: branches/safari-603.1.30.1-branch/Source/WebKit2/ChangeLog (212963 => 212964)


--- 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)
@@ -1,3 +1,7 @@
+2017-02-24  Matthew Hanson  <matthew_han...@apple.com>
+
+        Rollout r212537. rdar://problem/30699480
+
 2017-02-20  Matthew Hanson  <matthew_han...@apple.com>
 
         Rollout r212660. rdar://problem/30553220

Modified: branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (212963 => 212964)


--- 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)
@@ -280,10 +280,6 @@
 
     Vector<std::function<void ()>> _snapshotsDeferredDuringResize;
     RetainPtr<NSMutableArray> _stableStatePresentationUpdateCallbacks;
-
-    BOOL _hasInstalledPreCommitHandlerForVisibleRectUpdate;
-    BOOL _visibleContentRectUpdateScheduledFromScrollViewInStableState;
-    Vector<BlockPtr<void ()>> _visibleContentRectUpdateCallbacks;
 #endif
 #if PLATFORM(MAC)
     std::unique_ptr<WebKit::WebViewImpl> _impl;
@@ -1139,7 +1135,7 @@
     _delayUpdateVisibleContentRects = NO;
     if (_hadDelayedUpdateVisibleContentRects) {
         _hadDelayedUpdateVisibleContentRects = NO;
-        [self _scheduleVisibleContentRectUpdate];
+        [self _updateVisibleContentRectAfterScrollInView:_scrollView.get()];
     }
 }
 
@@ -1401,7 +1397,7 @@
     }
 
     if (needUpdateVisbleContentRects)
-        [self _scheduleVisibleContentRectUpdate];
+        [self _updateVisibleContentRects];
 
     if (WebKit::RemoteLayerTreeScrollingPerformanceData* scrollPerfData = _page->scrollingPerformanceData())
         scrollPerfData->didCommitLayerTree([self visibleRectInViewCoordinates]);
@@ -1926,7 +1922,7 @@
     if (![self usesStandardContentView])
         return;
 
-    [self _scheduleVisibleContentRectUpdate];
+    [self _updateVisibleContentRectAfterScrollInView:_scrollView.get()];
     [_contentView didFinishScrolling];
 }
 
@@ -1980,7 +1976,7 @@
     if (![self usesStandardContentView])
         [_customContentView scrollViewDidScroll:(UIScrollView *)scrollView];
 
-    [self _scheduleVisibleContentRectUpdateAfterScrollInView:scrollView];
+    [self _updateVisibleContentRectAfterScrollInView:scrollView];
     
     if (WebKit::RemoteLayerTreeScrollingPerformanceData* scrollPerfData = _page->scrollingPerformanceData())
         scrollPerfData->didScroll([self visibleRectInViewCoordinates]);
@@ -1989,13 +1985,13 @@
 - (void)scrollViewDidZoom:(UIScrollView *)scrollView
 {
     [self _updateScrollViewBackground];
-    [self _scheduleVisibleContentRectUpdateAfterScrollInView:scrollView];
+    [self _updateVisibleContentRectAfterScrollInView:scrollView];
 }
 
 - (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(UIView *)view atScale:(CGFloat)scale
 {
     ASSERT(scrollView == _scrollView);
-    [self _scheduleVisibleContentRectUpdateAfterScrollInView:scrollView];
+    [self _updateVisibleContentRectAfterScrollInView:scrollView];
     [_contentView didZoomToScale:scale];
 }
 
@@ -2010,7 +2006,7 @@
         return;
 
     [_contentView didInterruptScrolling];
-    [self _scheduleVisibleContentRectUpdateAfterScrollInView:scrollView];
+    [self _updateVisibleContentRectAfterScrollInView:scrollView];
 }
 
 - (CGRect)_visibleRectInEnclosingScrollView:(UIScrollView *)enclosingScrollView
@@ -2041,7 +2037,7 @@
 // Called when some ancestor UIScrollView scrolls.
 - (void)_didScroll
 {
-    [self _scheduleVisibleContentRectUpdateAfterScrollInView:[self _scroller]];
+    [self _updateVisibleContentRectAfterScrollInView:[self _scroller]];
 
     const NSTimeInterval ScrollingEndedTimerInterval = 0.032;
     if (!_enclosingScrollViewScrollTimer) {
@@ -2059,7 +2055,7 @@
         return;
     }
 
-    [self _scheduleVisibleContentRectUpdate];
+    [self _updateVisibleContentRects];
     [_enclosingScrollViewScrollTimer invalidate];
     _enclosingScrollViewScrollTimer = nil;
 }
@@ -2079,7 +2075,7 @@
     }
 
     [_customContentView web_setMinimumSize:bounds.size];
-    [self _scheduleVisibleContentRectUpdate];
+    [self _updateVisibleContentRects];
 }
 
 // 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.
@@ -2102,22 +2098,23 @@
     return !pointsEqualInDevicePixels(contentOffset, boundedOffset, deviceScaleFactor);
 }
 
-- (void)_scheduleVisibleContentRectUpdate
+- (void)_updateVisibleContentRects
 {
-    // For visible rect updates not associated with a specific UIScrollView, just consider our own scroller.
-    [self _scheduleVisibleContentRectUpdateAfterScrollInView:_scrollView.get()];
+    // For visible rect updates not associated with a spefic UIScrollView, just consider our own scroller.
+    [self _updateVisibleContentRectAfterScrollInView:_scrollView.get()];
 }
 
-- (BOOL)_scrollViewIsInStableState:(UIScrollView *)scrollView
+- (void)_updateVisibleContentRectAfterScrollInView:(UIScrollView *)scrollView
 {
     BOOL isStableState = !([scrollView isDragging] || [scrollView isDecelerating] || [scrollView isZooming] || [scrollView _isAnimatingZoom] || [scrollView _isScrollingToTop]);
 
     if (isStableState && scrollView == _scrollView.get())
         isStableState = !_isChangingObscuredInsetsInteractively;
-
+    
     if (isStableState && scrollView == _scrollView.get())
         isStableState = ![self _scrollViewIsRubberBanding];
 
+    // FIXME: this can be made static after we stop supporting iOS 8.x.
     if (isStableState && [scrollView respondsToSelector:@selector(_isInterruptingDeceleration)])
         isStableState = ![scrollView performSelector:@selector(_isInterruptingDeceleration)];
 
@@ -2124,25 +2121,9 @@
     if (NSNumber *stableOverride = self._stableStateOverride)
         isStableState = stableOverride.boolValue;
 
-    return isStableState;
+    [self _updateContentRectsWithState:isStableState];
 }
 
-- (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->_hasInstalledPreCommitHandlerForVisibleRectUpdate = NO;
-    } forPhase:kCATransactionPhasePreCommit];
-}
-
 static bool scrollViewCanScroll(UIScrollView *scrollView)
 {
     if (!scrollView)
@@ -2181,10 +2162,8 @@
     return extendedBounds;
 }
 
-- (void)_updateVisibleContentRects
+- (void)_updateContentRectsWithState:(BOOL)inStableState
 {
-    BOOL inStableState = _visibleContentRectUpdateScheduledFromScrollViewInStableState;
-
     if (![self usesStandardContentView]) {
         [_customContentView web_computedContentInsetDidChange];
         return;
@@ -2242,11 +2221,6 @@
         inStableState:inStableState
         isChangingObscuredInsetsInteractively:_isChangingObscuredInsetsInteractively
         enclosedInScrollableAncestorView:scrollViewCanScroll([self _scroller])];
-
-    while (!_visibleContentRectUpdateCallbacks.isEmpty()) {
-        auto callback = _visibleContentRectUpdateCallbacks.takeLast();
-        callback();
-    }
 }
 
 - (void)_didFinishLoadForMainFrame
@@ -2292,7 +2266,7 @@
             _totalScrollViewBottomInsetAdjustmentForKeyboard += bottomInsetAfterAdjustment - bottomInsetBeforeAdjustment;
     }
 
-    [self _scheduleVisibleContentRectUpdate];
+    [self _updateVisibleContentRects];
 }
 
 - (BOOL)_shouldUpdateKeyboardWithInfo:(NSDictionary *)keyboardInfo
@@ -4194,7 +4168,7 @@
 
     _obscuredInsets = obscuredInsets;
 
-    [self _scheduleVisibleContentRectUpdate];
+    [self _updateVisibleContentRects];
 }
 
 - (void)_setInterfaceOrientationOverride:(UIInterfaceOrientation)interfaceOrientation
@@ -4267,7 +4241,7 @@
 {
     ASSERT(_isChangingObscuredInsetsInteractively);
     _isChangingObscuredInsetsInteractively = NO;
-    [self _scheduleVisibleContentRectUpdate];
+    [self _updateVisibleContentRects];
 }
 
 - (void)_hideContentUntilNextUpdate
@@ -4313,7 +4287,7 @@
             _page->setMaximumUnobscuredSize(WebCore::FloatSize(newMaximumUnobscuredSize));
         if (_overridesInterfaceOrientation)
             _page->setDeviceOrientation(newOrientation);
-        [self _scheduleVisibleContentRectUpdate];
+        [self _updateVisibleContentRects];
         return;
     }
 
@@ -4323,7 +4297,7 @@
         && oldOrientation == newOrientation
         && UIEdgeInsetsEqualToEdgeInsets(oldObscuredInsets, newObscuredInsets)) {
         _dynamicViewportUpdateMode = DynamicViewportUpdateMode::NotResizing;
-        [self _scheduleVisibleContentRectUpdate];
+        [self _updateVisibleContentRects];
         return;
     }
 
@@ -4440,7 +4414,7 @@
 
     _dynamicViewportUpdateMode = DynamicViewportUpdateMode::NotResizing;
     [_contentView setHidden:NO];
-    [self _scheduleVisibleContentRectUpdate];
+    [self _updateVisibleContentRects];
 
     while (!_snapshotsDeferredDuringResize.isEmpty())
         _snapshotsDeferredDuringResize.takeLast()();
@@ -5010,16 +4984,6 @@
     [self _doAfterNextPresentationUpdate:updateBlock];
 }
 
-- (void)_doAfterNextVisibleContentRectUpdate:(void (^)(void))updateBlock
-{
-#if PLATFORM(IOS)
-    _visibleContentRectUpdateCallbacks.append(makeBlockPtr(updateBlock));
-    [self _scheduleVisibleContentRectUpdate];
-#else
-    dispatch_async(dispatch_get_main_queue(), updateBlock);
-#endif
-}
-
 - (void)_disableBackForwardSnapshotVolatilityForTesting
 {
     WebKit::ViewSnapshotStore::singleton().setDisableSnapshotVolatilityForTesting(true);

Modified: branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h (212963 => 212964)


--- 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)
@@ -99,7 +99,9 @@
 - (void)_willInvokeUIScrollViewDelegateCallback;
 - (void)_didInvokeUIScrollViewDelegateCallback;
 
-- (void)_scheduleVisibleContentRectUpdate;
+- (void)_updateVisibleContentRects;
+- (void)_updateVisibleContentRectAfterScrollInView:(UIScrollView *)scrollView;
+- (void)_updateContentRectsWithState:(BOOL)inStableState;
 
 - (void)_didFinishLoadForMainFrame;
 - (void)_didFailLoadForMainFrame;

Modified: branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (212963 => 212964)


--- 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)
@@ -322,7 +322,6 @@
 
 - (void)_doAfterNextPresentationUpdate:(void (^)(void))updateBlock WK_API_AVAILABLE(macosx(10.12), ios(10.0));
 - (void)_doAfterNextPresentationUpdateWithoutWaitingForPainting:(void (^)(void))updateBlock WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
-- (void)_doAfterNextVisibleContentRectUpdate:(void (^)(void))updateBlock WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 
 - (void)_disableBackForwardSnapshotVolatilityForTesting WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));

Modified: branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm (212963 => 212964)


--- 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)
@@ -572,7 +572,7 @@
         [self updateFixedClippingView:fixedPositionRect];
 
         // We need to push the new content bounds to the webview to update fixed position rects.
-        [_webView _scheduleVisibleContentRectUpdate];
+        [_webView _updateVisibleContentRects];
     }
     
     // Updating the selection requires a full editor state. If the editor state is missing post layout

Modified: branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (212963 => 212964)


--- 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)
@@ -3713,7 +3713,7 @@
     
     // The custom fixed position rect behavior is affected by -isAssistingNode, so if that changes we need to recompute rects.
     if (editableChanged)
-        [_webView _scheduleVisibleContentRectUpdate];
+        [_webView _updateVisibleContentRects];
     
     [self _displayFormNodeInputView];
 
@@ -3747,7 +3747,7 @@
 
     // The custom fixed position rect behavior is affected by -isAssistingNode, so if that changes we need to recompute rects.
     if (editableChanged)
-        [_webView _scheduleVisibleContentRectUpdate];
+        [_webView _updateVisibleContentRects];
 
     [_webView didEndFormControlInteraction];
 }

Modified: branches/safari-603.1.30.1-branch/Source/WebKit2/UIProcess/ios/WKScrollView.mm (212963 => 212964)


--- 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)
@@ -222,7 +222,7 @@
 {
     [super setContentInset:contentInset];
 
-    [_internalDelegate _scheduleVisibleContentRectUpdate];
+    [_internalDelegate _updateVisibleContentRects];
 }
 
 // Fetch top/left rubberband amounts (as negative values).

Modified: branches/safari-603.1.30.1-branch/Tools/ChangeLog (212963 => 212964)


--- 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)
@@ -1,3 +1,7 @@
+2017-02-24  Matthew Hanson  <matthew_han...@apple.com>
+
+        Rollout r212537. rdar://problem/30699480
+
 2017-02-17  Matthew Hanson  <matthew_han...@apple.com>
 
         Rollout r212500. rdar://problem/29904368

Modified: branches/safari-603.1.30.1-branch/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm (212963 => 212964)


--- 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)
@@ -63,11 +63,6 @@
     doAsyncTask(callback);
 }
 
-void UIScriptController::doAfterVisibleContentRectUpdate(JSValueRef callback)
-{
-    doAsyncTask(callback);
-}
-
 void UIScriptController::zoomToScale(double scale, JSValueRef callback)
 {
     RefPtr<UIScriptController> protectedThis(this);

Modified: branches/safari-603.1.30.1-branch/Tools/DumpRenderTree/mac/UIScriptControllerMac.mm (212963 => 212964)


--- 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)
@@ -59,11 +59,6 @@
     doAsyncTask(callback);
 }
 
-void UIScriptController::doAfterVisibleContentRectUpdate(JSValueRef callback)
-{
-    doAsyncTask(callback);
-}
-
 void UIScriptController::insertText(JSStringRef, int, int)
 {
 }

Modified: branches/safari-603.1.30.1-branch/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl (212963 => 212964)


--- 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)
@@ -31,8 +31,6 @@
     void doAfterPresentationUpdate(object callback); // Call the callback after sending a message to the WebProcess and receiving a subsequent update.
     void doAfterNextStablePresentationUpdate(object callback);
 
-    void doAfterVisibleContentRectUpdate(object callback);
-
     void simulateAccessibilitySettingsChangeNotification(object callback);
 
     // Interaction.

Modified: branches/safari-603.1.30.1-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp (212963 => 212964)


--- 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)
@@ -74,10 +74,6 @@
 void UIScriptController::doAfterNextStablePresentationUpdate(JSValueRef)
 {
 }
-
-void UIScriptController::doAfterVisibleContentRectUpdate(JSValueRef)
-{
-}
 #endif
 
 void UIScriptController::setDidStartFormControlInteractionCallback(JSValueRef callback)

Modified: branches/safari-603.1.30.1-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h (212963 => 212964)


--- 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)
@@ -54,7 +54,6 @@
     void doAsyncTask(JSValueRef callback);
     void doAfterPresentationUpdate(JSValueRef callback);
     void doAfterNextStablePresentationUpdate(JSValueRef callback);
-    void doAfterVisibleContentRectUpdate(JSValueRef callback);
 
     void zoomToScale(double scale, JSValueRef callback);

Modified: branches/safari-603.1.30.1-branch/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm (212963 => 212964)


--- 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)
@@ -37,7 +37,7 @@
 - (void)scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(UIView *)view;
 - (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(UIView *)view atScale:(CGFloat)scale;
 - (void)_didFinishScrolling;
-- (void)_scheduleVisibleContentRectUpdate;
+- (void)_updateVisibleContentRects;
 
 @end
 #endif
@@ -184,7 +184,7 @@
 - (void)_setStableStateOverride:(NSNumber *)overrideBoolean
 {
     m_stableStateOverride = overrideBoolean;
-    [self _scheduleVisibleContentRectUpdate];
+    [self _updateVisibleContentRects];
 }
 
 #endif

Modified: branches/safari-603.1.30.1-branch/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm (212963 => 212964)


--- 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)
@@ -94,18 +94,6 @@
     }];
 }
 
-void UIScriptController::doAfterVisibleContentRectUpdate(JSValueRef callback)
-{
-    TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
-
-    unsigned callbackID = m_context->prepareForAsyncTask(callback, CallbackTypeNonPersistent);
-    [webView _doAfterNextVisibleContentRectUpdate:^ {
-        if (!m_context)
-            return;
-        m_context->asyncTaskComplete(callbackID);
-    }];
-}
-
 void UIScriptController::zoomToScale(double scale, JSValueRef callback)
 {
     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();

Modified: branches/safari-603.1.30.1-branch/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm (212963 => 212964)


--- 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)
@@ -66,11 +66,6 @@
     doAsyncTask(callback);
 }
 
-void UIScriptController::doAfterVisibleContentRectUpdate(JSValueRef callback)
-{
-    doAsyncTask(callback);
-}
-
 void UIScriptController::insertText(JSStringRef text, int location, int length)
 {
 #if WK_API_ENABLED

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to