Diff
Modified: trunk/LayoutTests/ChangeLog (258183 => 258184)
--- trunk/LayoutTests/ChangeLog 2020-03-10 04:04:06 UTC (rev 258183)
+++ trunk/LayoutTests/ChangeLog 2020-03-10 04:07:04 UTC (rev 258184)
@@ -1,3 +1,20 @@
+2020-03-09 Zalan Bujtas <[email protected]>
+
+ [LayoutTests] Do not expose didAddHorizontal/VerticalScrollbar and willRemoveHorizontal/VerticalScrollbar
+ https://bugs.webkit.org/show_bug.cgi?id=208833
+ <rdar://problem/60244801>
+
+ Reviewed by Simon Fraser.
+
+ * fast/scrolling/scroll-animator-basic-events-expected.txt:
+ * fast/scrolling/scroll-animator-basic-events.html:
+ * fast/scrolling/scroll-animator-overlay-scrollbars-clicked-expected.txt:
+ * fast/scrolling/scroll-animator-overlay-scrollbars-clicked.html:
+ * fast/scrolling/scroll-animator-overlay-scrollbars-hovered-expected.txt:
+ * fast/scrolling/scroll-animator-select-list-events-expected.txt:
+ * fast/scrolling/scroll-animator-select-list-events.html:
+ * platform/mac-wk2/TestExpectations:
+
2020-03-09 Jason Lawrence <[email protected]>
REGRESSION: (257072) [ Mac wk2 Release ] fast/harness/uiscriptcontroller/concurrent-ui-side-scripts.html is flaky failing.
Modified: trunk/LayoutTests/fast/scrolling/scroll-animator-basic-events-expected.txt (258183 => 258184)
--- trunk/LayoutTests/fast/scrolling/scroll-animator-basic-events-expected.txt 2020-03-10 04:04:06 UTC (rev 258183)
+++ trunk/LayoutTests/fast/scrolling/scroll-animator-basic-events-expected.txt 2020-03-10 04:07:04 UTC (rev 258184)
@@ -1,18 +1,16 @@
-CONSOLE MESSAGE: line 24: MainFrameView: didAddVerticalScrollbar
-CONSOLE MESSAGE: line 24: RenderLayer: didAddVerticalScrollbar
-CONSOLE MESSAGE: line 24: MainFrameView: mouseEnteredContentArea
-CONSOLE MESSAGE: line 24: MainFrameView: mouseMovedInContentArea
-CONSOLE MESSAGE: line 25: RenderLayer: mouseEnteredContentArea
-CONSOLE MESSAGE: line 25: RenderLayer: mouseMovedInContentArea
-CONSOLE MESSAGE: line 25: MainFrameView: mouseMovedInContentArea
-CONSOLE MESSAGE: line 26: RenderLayer: mouseEnteredVerticalScrollbar
-CONSOLE MESSAGE: line 26: RenderLayer: mouseMovedInContentArea
+CONSOLE MESSAGE: line 26: MainFrameView: mouseEnteredContentArea
CONSOLE MESSAGE: line 26: MainFrameView: mouseMovedInContentArea
-CONSOLE MESSAGE: line 27: RenderLayer: mouseIsDownInVerticalScrollbar
-CONSOLE MESSAGE: line 28: RenderLayer: mouseIsUpInVerticalScrollbar
-CONSOLE MESSAGE: line 29: RenderLayer: mouseExitedVerticalScrollbar
-CONSOLE MESSAGE: line 29: RenderLayer: mouseExitedContentArea
-CONSOLE MESSAGE: line 29: MainFrameView: mouseMovedInContentArea
+CONSOLE MESSAGE: line 27: RenderLayer: mouseEnteredContentArea
+CONSOLE MESSAGE: line 27: RenderLayer: mouseMovedInContentArea
+CONSOLE MESSAGE: line 27: MainFrameView: mouseMovedInContentArea
+CONSOLE MESSAGE: line 28: RenderLayer: mouseEnteredVerticalScrollbar
+CONSOLE MESSAGE: line 28: RenderLayer: mouseMovedInContentArea
+CONSOLE MESSAGE: line 28: MainFrameView: mouseMovedInContentArea
+CONSOLE MESSAGE: line 29: RenderLayer: mouseIsDownInVerticalScrollbar
+CONSOLE MESSAGE: line 30: RenderLayer: mouseIsUpInVerticalScrollbar
+CONSOLE MESSAGE: line 31: RenderLayer: mouseExitedVerticalScrollbar
+CONSOLE MESSAGE: line 31: RenderLayer: mouseExitedContentArea
+CONSOLE MESSAGE: line 31: MainFrameView: mouseMovedInContentArea
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/scrolling/scroll-animator-basic-events.html (258183 => 258184)
--- trunk/LayoutTests/fast/scrolling/scroll-animator-basic-events.html 2020-03-10 04:04:06 UTC (rev 258183)
+++ trunk/LayoutTests/fast/scrolling/scroll-animator-basic-events.html 2020-03-10 04:07:04 UTC (rev 258184)
@@ -19,6 +19,8 @@
testRunner.dumpAsText();
}
window._onload_ = function () {
+ if (window.internals)
+ internals.updateLayoutAndStyleForAllFrames();
var div = document.querySelector('#scrollme');
if (window.eventSender) {
eventSender.mouseMoveTo(0, 0);
Modified: trunk/LayoutTests/fast/scrolling/scroll-animator-overlay-scrollbars-clicked-expected.txt (258183 => 258184)
--- trunk/LayoutTests/fast/scrolling/scroll-animator-overlay-scrollbars-clicked-expected.txt 2020-03-10 04:04:06 UTC (rev 258183)
+++ trunk/LayoutTests/fast/scrolling/scroll-animator-overlay-scrollbars-clicked-expected.txt 2020-03-10 04:07:04 UTC (rev 258184)
@@ -1,19 +1,13 @@
-CONSOLE MESSAGE: MainFrameView: didAddVerticalScrollbar
-CONSOLE MESSAGE: MainFrameView: didAddHorizontalScrollbar
-CONSOLE MESSAGE: FrameView: didAddVerticalScrollbar
-CONSOLE MESSAGE: FrameView: willRemoveVerticalScrollbar
-CONSOLE MESSAGE: FrameView: didAddVerticalScrollbar
-CONSOLE MESSAGE: FrameView: willRemoveVerticalScrollbar
-CONSOLE MESSAGE: line 19: MainFrameView: mouseEnteredContentArea
-CONSOLE MESSAGE: line 19: MainFrameView: mouseMovedInContentArea
-CONSOLE MESSAGE: line 21: MainFrameView: mouseEnteredVerticalScrollbar
-CONSOLE MESSAGE: line 21: FrameView: mouseEnteredContentArea
-CONSOLE MESSAGE: line 21: MainFrameView: mouseMovedInContentArea
-CONSOLE MESSAGE: line 22: MainFrameView: mouseIsDownInVerticalScrollbar
-CONSOLE MESSAGE: line 23: MainFrameView: mouseIsUpInVerticalScrollbar
-CONSOLE MESSAGE: line 24: MainFrameView: mouseExitedVerticalScrollbar
-CONSOLE MESSAGE: line 24: FrameView: mouseExitedContentArea
-CONSOLE MESSAGE: line 24: MainFrameView: mouseMovedInContentArea
+CONSOLE MESSAGE: line 18: MainFrameView: mouseEnteredContentArea
+CONSOLE MESSAGE: line 18: MainFrameView: mouseMovedInContentArea
+CONSOLE MESSAGE: line 20: MainFrameView: mouseEnteredVerticalScrollbar
+CONSOLE MESSAGE: line 20: FrameView: mouseEnteredContentArea
+CONSOLE MESSAGE: line 20: MainFrameView: mouseMovedInContentArea
+CONSOLE MESSAGE: line 21: MainFrameView: mouseIsDownInVerticalScrollbar
+CONSOLE MESSAGE: line 22: MainFrameView: mouseIsUpInVerticalScrollbar
+CONSOLE MESSAGE: line 23: MainFrameView: mouseExitedVerticalScrollbar
+CONSOLE MESSAGE: line 23: FrameView: mouseExitedContentArea
+CONSOLE MESSAGE: line 23: MainFrameView: mouseMovedInContentArea
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/scrolling/scroll-animator-overlay-scrollbars-clicked.html (258183 => 258184)
--- trunk/LayoutTests/fast/scrolling/scroll-animator-overlay-scrollbars-clicked.html 2020-03-10 04:04:06 UTC (rev 258183)
+++ trunk/LayoutTests/fast/scrolling/scroll-animator-overlay-scrollbars-clicked.html 2020-03-10 04:07:04 UTC (rev 258184)
@@ -12,20 +12,18 @@
}
function runTest() {
- setTimeout(() => {
- if (window.internals)
- internals.updateLayoutAndStyleForAllFrames();
- if (window.eventSender) {
- eventSender.mouseMoveTo(0, 0);
- // Move to a position that is over the vertical scrollbar and the iframe.
- eventSender.mouseMoveTo(window.innerWidth - 4, 100);
- eventSender.mouseDown();
- eventSender.mouseUp();
- eventSender.mouseMoveTo(0, 0);
- }
- if (window.testRunner)
- testRunner.notifyDone();
- }, 0);
+ if (window.internals)
+ internals.updateLayoutAndStyleForAllFrames();
+ if (window.eventSender) {
+ eventSender.mouseMoveTo(0, 0);
+ // Move to a position that is over the vertical scrollbar and the iframe.
+ eventSender.mouseMoveTo(window.innerWidth - 4, 100);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ eventSender.mouseMoveTo(0, 0);
+ }
+ if (window.testRunner)
+ testRunner.notifyDone();
};
</script>
<script src=""
Modified: trunk/LayoutTests/fast/scrolling/scroll-animator-overlay-scrollbars-hovered-expected.txt (258183 => 258184)
--- trunk/LayoutTests/fast/scrolling/scroll-animator-overlay-scrollbars-hovered-expected.txt 2020-03-10 04:04:06 UTC (rev 258183)
+++ trunk/LayoutTests/fast/scrolling/scroll-animator-overlay-scrollbars-hovered-expected.txt 2020-03-10 04:07:04 UTC (rev 258184)
@@ -1,9 +1,3 @@
-CONSOLE MESSAGE: MainFrameView: didAddVerticalScrollbar
-CONSOLE MESSAGE: FrameView: didAddVerticalScrollbar
-CONSOLE MESSAGE: FrameView: willRemoveVerticalScrollbar
-CONSOLE MESSAGE: line 14: FrameView: didAddVerticalScrollbar
-CONSOLE MESSAGE: line 14: FrameView: didAddHorizontalScrollbar
-CONSOLE MESSAGE: line 14: FrameView: willRemoveVerticalScrollbar
CONSOLE MESSAGE: line 17: MainFrameView: mouseEnteredContentArea
CONSOLE MESSAGE: line 17: MainFrameView: mouseMovedInContentArea
CONSOLE MESSAGE: line 18: FrameView: mouseEnteredHorizontalScrollbar
Modified: trunk/LayoutTests/fast/scrolling/scroll-animator-select-list-events-expected.txt (258183 => 258184)
--- trunk/LayoutTests/fast/scrolling/scroll-animator-select-list-events-expected.txt 2020-03-10 04:04:06 UTC (rev 258183)
+++ trunk/LayoutTests/fast/scrolling/scroll-animator-select-list-events-expected.txt 2020-03-10 04:07:04 UTC (rev 258184)
@@ -1,18 +1,16 @@
-CONSOLE MESSAGE: RenderListBox: didAddVerticalScrollbar
-CONSOLE MESSAGE: line 14: MainFrameView: didAddVerticalScrollbar
-CONSOLE MESSAGE: line 14: MainFrameView: mouseEnteredContentArea
-CONSOLE MESSAGE: line 14: MainFrameView: mouseMovedInContentArea
-CONSOLE MESSAGE: line 15: RenderListBox: mouseEnteredContentArea
-CONSOLE MESSAGE: line 15: RenderListBox: mouseMovedInContentArea
-CONSOLE MESSAGE: line 15: MainFrameView: mouseMovedInContentArea
-CONSOLE MESSAGE: line 16: RenderListBox: mouseEnteredVerticalScrollbar
-CONSOLE MESSAGE: line 16: RenderListBox: mouseMovedInContentArea
+CONSOLE MESSAGE: line 16: MainFrameView: mouseEnteredContentArea
CONSOLE MESSAGE: line 16: MainFrameView: mouseMovedInContentArea
-CONSOLE MESSAGE: line 17: RenderListBox: mouseIsDownInVerticalScrollbar
-CONSOLE MESSAGE: line 18: RenderListBox: mouseIsUpInVerticalScrollbar
-CONSOLE MESSAGE: line 19: RenderListBox: mouseExitedVerticalScrollbar
-CONSOLE MESSAGE: line 19: RenderListBox: mouseExitedContentArea
-CONSOLE MESSAGE: line 19: MainFrameView: mouseMovedInContentArea
+CONSOLE MESSAGE: line 17: RenderListBox: mouseEnteredContentArea
+CONSOLE MESSAGE: line 17: RenderListBox: mouseMovedInContentArea
+CONSOLE MESSAGE: line 17: MainFrameView: mouseMovedInContentArea
+CONSOLE MESSAGE: line 18: RenderListBox: mouseEnteredVerticalScrollbar
+CONSOLE MESSAGE: line 18: RenderListBox: mouseMovedInContentArea
+CONSOLE MESSAGE: line 18: MainFrameView: mouseMovedInContentArea
+CONSOLE MESSAGE: line 19: RenderListBox: mouseIsDownInVerticalScrollbar
+CONSOLE MESSAGE: line 20: RenderListBox: mouseIsUpInVerticalScrollbar
+CONSOLE MESSAGE: line 21: RenderListBox: mouseExitedVerticalScrollbar
+CONSOLE MESSAGE: line 21: RenderListBox: mouseExitedContentArea
+CONSOLE MESSAGE: line 21: MainFrameView: mouseMovedInContentArea
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/scrolling/scroll-animator-select-list-events.html (258183 => 258184)
--- trunk/LayoutTests/fast/scrolling/scroll-animator-select-list-events.html 2020-03-10 04:04:06 UTC (rev 258183)
+++ trunk/LayoutTests/fast/scrolling/scroll-animator-select-list-events.html 2020-03-10 04:07:04 UTC (rev 258184)
@@ -9,6 +9,8 @@
testRunner.dumpAsText();
}
window._onload_ = function () {
+ if (window.internals)
+ internals.updateLayoutAndStyleForAllFrames();
var list = document.getElementById("list");
if (window.eventSender) {
eventSender.mouseMoveTo(0, 0);
Modified: trunk/LayoutTests/platform/mac-wk1/fast/scrolling/scroll-animator-basic-events-expected.txt (258183 => 258184)
--- trunk/LayoutTests/platform/mac-wk1/fast/scrolling/scroll-animator-basic-events-expected.txt 2020-03-10 04:04:06 UTC (rev 258183)
+++ trunk/LayoutTests/platform/mac-wk1/fast/scrolling/scroll-animator-basic-events-expected.txt 2020-03-10 04:07:04 UTC (rev 258184)
@@ -1,12 +1,12 @@
-CONSOLE MESSAGE: line 25: RenderLayer: didAddVerticalScrollbar
-CONSOLE MESSAGE: line 25: RenderLayer: mouseMovedInContentArea
-CONSOLE MESSAGE: line 26: RenderLayer: mouseEnteredVerticalScrollbar
-CONSOLE MESSAGE: line 26: RenderLayer: mouseMovedInContentArea
-CONSOLE MESSAGE: line 27: RenderLayer: mouseIsDownInVerticalScrollbar
-CONSOLE MESSAGE: line 28: RenderLayer: mouseIsUpInVerticalScrollbar
+CONSOLE MESSAGE: line 27: RenderLayer: mouseEnteredContentArea
+CONSOLE MESSAGE: line 27: RenderLayer: mouseMovedInContentArea
+CONSOLE MESSAGE: line 28: RenderLayer: mouseEnteredVerticalScrollbar
CONSOLE MESSAGE: line 28: RenderLayer: mouseMovedInContentArea
-CONSOLE MESSAGE: line 29: RenderLayer: mouseExitedVerticalScrollbar
-CONSOLE MESSAGE: line 29: RenderLayer: mouseExitedContentArea
+CONSOLE MESSAGE: line 29: RenderLayer: mouseIsDownInVerticalScrollbar
+CONSOLE MESSAGE: line 30: RenderLayer: mouseIsUpInVerticalScrollbar
+CONSOLE MESSAGE: line 30: RenderLayer: mouseMovedInContentArea
+CONSOLE MESSAGE: line 31: RenderLayer: mouseExitedVerticalScrollbar
+CONSOLE MESSAGE: line 31: RenderLayer: mouseExitedContentArea
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/platform/mac-wk1/fast/scrolling/scroll-animator-select-list-events-expected.txt (258183 => 258184)
--- trunk/LayoutTests/platform/mac-wk1/fast/scrolling/scroll-animator-select-list-events-expected.txt 2020-03-10 04:04:06 UTC (rev 258183)
+++ trunk/LayoutTests/platform/mac-wk1/fast/scrolling/scroll-animator-select-list-events-expected.txt 2020-03-10 04:07:04 UTC (rev 258184)
@@ -1,12 +1,12 @@
-CONSOLE MESSAGE: RenderListBox: didAddVerticalScrollbar
-CONSOLE MESSAGE: line 15: RenderListBox: mouseMovedInContentArea
-CONSOLE MESSAGE: line 16: RenderListBox: mouseEnteredVerticalScrollbar
-CONSOLE MESSAGE: line 16: RenderListBox: mouseMovedInContentArea
-CONSOLE MESSAGE: line 17: RenderListBox: mouseIsDownInVerticalScrollbar
-CONSOLE MESSAGE: line 18: RenderListBox: mouseIsUpInVerticalScrollbar
+CONSOLE MESSAGE: line 17: RenderListBox: mouseEnteredContentArea
+CONSOLE MESSAGE: line 17: RenderListBox: mouseMovedInContentArea
+CONSOLE MESSAGE: line 18: RenderListBox: mouseEnteredVerticalScrollbar
CONSOLE MESSAGE: line 18: RenderListBox: mouseMovedInContentArea
-CONSOLE MESSAGE: line 19: RenderListBox: mouseExitedVerticalScrollbar
-CONSOLE MESSAGE: line 19: RenderListBox: mouseExitedContentArea
+CONSOLE MESSAGE: line 19: RenderListBox: mouseIsDownInVerticalScrollbar
+CONSOLE MESSAGE: line 20: RenderListBox: mouseIsUpInVerticalScrollbar
+CONSOLE MESSAGE: line 20: RenderListBox: mouseMovedInContentArea
+CONSOLE MESSAGE: line 21: RenderListBox: mouseExitedVerticalScrollbar
+CONSOLE MESSAGE: line 21: RenderListBox: mouseExitedContentArea
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (258183 => 258184)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2020-03-10 04:04:06 UTC (rev 258183)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2020-03-10 04:07:04 UTC (rev 258184)
@@ -1083,8 +1083,4 @@
webkit.org/b/208577 [ Release ] fast/hidpi/image-srcset-relative-svg-canvas.html [ Pass ImageOnlyFailure ]
-webkit.org/b/208584 fast/scrolling/scroll-animator-overlay-scrollbars-clicked.html [ Pass Failure ]
-
webkit.org/b/208590 [ Debug ] fast/events/beforeunload-prompt.html [ Pass Crash ]
-
-webkit.org/b/208678 [ Release ] fast/scrolling/scroll-animator-overlay-scrollbars-hovered.html [ Pass Failure ]
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (258183 => 258184)
--- trunk/Source/WebCore/ChangeLog 2020-03-10 04:04:06 UTC (rev 258183)
+++ trunk/Source/WebCore/ChangeLog 2020-03-10 04:07:04 UTC (rev 258184)
@@ -1,3 +1,22 @@
+2020-03-09 Zalan Bujtas <[email protected]>
+
+ [LayoutTests] Do not expose didAddHorizontal/VerticalScrollbar and willRemoveHorizontal/VerticalScrollbar
+ https://bugs.webkit.org/show_bug.cgi?id=208833
+ <rdar://problem/60244801>
+
+ Reviewed by Simon Fraser.
+
+ didAdd* and willRemove* functions are triggered by layout. Optimal layouts can happen at any point of time.
+ Tests should not rely on the number/order of layouts unless they are specifically designed
+ to test e.g. lack of layouts (see internals.layoutCount).
+ It's sufficient to dump the mouse entered/moved/etc actions only.
+
+ * platform/mock/ScrollAnimatorMock.cpp:
+ (WebCore::ScrollAnimatorMock::didAddVerticalScrollbar):
+ (WebCore::ScrollAnimatorMock::didAddHorizontalScrollbar):
+ (WebCore::ScrollAnimatorMock::willRemoveVerticalScrollbar):
+ (WebCore::ScrollAnimatorMock::willRemoveHorizontalScrollbar):
+
2020-03-09 Simon Fraser <[email protected]>
ASSERT(!m_textCheckingRequest) on editing/spelling/spellcheck-async-remove-frame.html
Modified: trunk/Source/WebCore/platform/mock/ScrollAnimatorMock.cpp (258183 => 258184)
--- trunk/Source/WebCore/platform/mock/ScrollAnimatorMock.cpp 2020-03-10 04:04:06 UTC (rev 258183)
+++ trunk/Source/WebCore/platform/mock/ScrollAnimatorMock.cpp 2020-03-10 04:07:04 UTC (rev 258184)
@@ -47,7 +47,6 @@
void ScrollAnimatorMock::didAddVerticalScrollbar(Scrollbar* scrollbar)
{
m_verticalScrollbar = scrollbar;
- m_logger("didAddVerticalScrollbar");
ScrollAnimator::didAddVerticalScrollbar(scrollbar);
}
@@ -54,13 +53,11 @@
void ScrollAnimatorMock::didAddHorizontalScrollbar(Scrollbar* scrollbar)
{
m_horizontalScrollbar = scrollbar;
- m_logger("didAddHorizontalScrollbar");
ScrollAnimator::didAddHorizontalScrollbar(scrollbar);
}
void ScrollAnimatorMock::willRemoveVerticalScrollbar(Scrollbar* scrollbar)
{
- m_logger("willRemoveVerticalScrollbar");
ScrollAnimator::willRemoveVerticalScrollbar(scrollbar);
m_verticalScrollbar = nullptr;
}
@@ -67,7 +64,6 @@
void ScrollAnimatorMock::willRemoveHorizontalScrollbar(Scrollbar* scrollbar)
{
- m_logger("willRemoveHorizontalScrollbar");
ScrollAnimator::willRemoveHorizontalScrollbar(scrollbar);
m_horizontalScrollbar = nullptr;
}
