Title: [238879] tags/Safari-607.1.16/Source/WebKit
- Revision
- 238879
- Author
- [email protected]
- Date
- 2018-12-04 15:48:11 -0800 (Tue, 04 Dec 2018)
Log Message
Revert r238869. rdar://problem/45928708
Modified Paths
Diff
Modified: tags/Safari-607.1.16/Source/WebKit/ChangeLog (238878 => 238879)
--- tags/Safari-607.1.16/Source/WebKit/ChangeLog 2018-12-04 23:48:07 UTC (rev 238878)
+++ tags/Safari-607.1.16/Source/WebKit/ChangeLog 2018-12-04 23:48:11 UTC (rev 238879)
@@ -1,5 +1,9 @@
2018-12-04 Alan Coon <[email protected]>
+ Revert r238869. rdar://problem/45928708
+
+2018-12-04 Alan Coon <[email protected]>
+
Revert r238870. rdar://problem/46456681
2018-12-04 Alan Coon <[email protected]>
Modified: tags/Safari-607.1.16/Source/WebKit/UIProcess/Cocoa/ViewGestureController.cpp (238878 => 238879)
--- tags/Safari-607.1.16/Source/WebKit/UIProcess/Cocoa/ViewGestureController.cpp 2018-12-04 23:48:07 UTC (rev 238878)
+++ tags/Safari-607.1.16/Source/WebKit/UIProcess/Cocoa/ViewGestureController.cpp 2018-12-04 23:48:11 UTC (rev 238879)
@@ -148,9 +148,6 @@
void ViewGestureController::didStartProvisionalLoadForMainFrame()
{
m_snapshotRemovalTracker.resume();
-
- if (auto provisionalLoadCallback = WTFMove(m_provisionalLoadCallback))
- provisionalLoadCallback();
}
void ViewGestureController::didFirstVisuallyNonEmptyLayoutForMainFrame()
Modified: tags/Safari-607.1.16/Source/WebKit/UIProcess/Cocoa/ViewGestureController.h (238878 => 238879)
--- tags/Safari-607.1.16/Source/WebKit/UIProcess/Cocoa/ViewGestureController.h 2018-12-04 23:48:07 UTC (rev 238878)
+++ tags/Safari-607.1.16/Source/WebKit/UIProcess/Cocoa/ViewGestureController.h 2018-12-04 23:48:11 UTC (rev 238879)
@@ -312,7 +312,6 @@
bool m_isConnectedToProcess { false };
SnapshotRemovalTracker m_snapshotRemovalTracker;
- WTF::Function<void()> m_provisionalLoadCallback;
};
} // namespace WebKit
Modified: tags/Safari-607.1.16/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm (238878 => 238879)
--- tags/Safari-607.1.16/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm 2018-12-04 23:48:07 UTC (rev 238878)
+++ tags/Safari-607.1.16/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm 2018-12-04 23:48:11 UTC (rev 238879)
@@ -300,6 +300,19 @@
return;
}
+ if (auto drawingArea = m_webPageProxy.drawingArea()) {
+ uint64_t pageID = m_webPageProxy.pageID();
+ GestureID gestureID = m_currentGestureID;
+ drawingArea->dispatchAfterEnsuringDrawing([pageID, gestureID] (CallbackBase::Error error) {
+ if (auto gestureController = controllerForGesture(pageID, gestureID))
+ gestureController->willCommitPostSwipeTransitionLayerTree(error == CallbackBase::Error::None);
+ });
+ drawingArea->hideContentUntilPendingUpdate();
+ } else {
+ removeSwipeSnapshot();
+ return;
+ }
+
// FIXME: Should we wait for VisuallyNonEmptyLayout like we do on Mac?
m_snapshotRemovalTracker.start(SnapshotRemovalTracker::RenderTreeSizeThreshold
| SnapshotRemovalTracker::RepaintAfterNavigation
@@ -313,22 +326,6 @@
m_backgroundColorForCurrentSnapshot = snapshot->backgroundColor();
m_webPageProxy.didChangeBackgroundColor();
}
-
- uint64_t pageID = m_webPageProxy.pageID();
- GestureID gestureID = m_currentGestureID;
- m_provisionalLoadCallback = [this, pageID, gestureID] {
- auto drawingArea = m_webPageProxy.drawingArea();
- if (!drawingArea) {
- removeSwipeSnapshot();
- return;
- }
-
- drawingArea->dispatchAfterEnsuringDrawing([pageID, gestureID] (CallbackBase::Error error) {
- if (auto gestureController = controllerForGesture(pageID, gestureID))
- gestureController->willCommitPostSwipeTransitionLayerTree(error == CallbackBase::Error::None);
- });
- drawingArea->hideContentUntilPendingUpdate();
- };
}
void ViewGestureController::setRenderTreeSize(uint64_t renderTreeSize)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
