Title: [258882] trunk/Source/WebCore
- Revision
- 258882
- Author
- [email protected]
- Date
- 2020-03-23 15:53:58 -0700 (Mon, 23 Mar 2020)
Log Message
[iOS WK2] compositing/overflow/dynamic-composited-scrolling-status.html asserts
https://bugs.webkit.org/show_bug.cgi?id=209440
<rdar://problem/60705261>
Reviewed by Wenson Hsieh.
nonFastScrollableRectsForTesting() needs to eagerly update event regions after r258528,
as we do for touchEventRectsForEventForTesting().
Also renamed the function so it's clear that it's for testing only.
* page/Page.cpp:
(WebCore::Page::nonFastScrollableRectsForTesting):
(WebCore::Page::nonFastScrollableRects): Deleted.
* page/Page.h:
* testing/Internals.cpp:
(WebCore::Internals::nonFastScrollableRects const):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (258881 => 258882)
--- trunk/Source/WebCore/ChangeLog 2020-03-23 22:48:49 UTC (rev 258881)
+++ trunk/Source/WebCore/ChangeLog 2020-03-23 22:53:58 UTC (rev 258882)
@@ -1,3 +1,23 @@
+2020-03-23 Simon Fraser <[email protected]>
+
+ [iOS WK2] compositing/overflow/dynamic-composited-scrolling-status.html asserts
+ https://bugs.webkit.org/show_bug.cgi?id=209440
+ <rdar://problem/60705261>
+
+ Reviewed by Wenson Hsieh.
+
+ nonFastScrollableRectsForTesting() needs to eagerly update event regions after r258528,
+ as we do for touchEventRectsForEventForTesting().
+
+ Also renamed the function so it's clear that it's for testing only.
+
+ * page/Page.cpp:
+ (WebCore::Page::nonFastScrollableRectsForTesting):
+ (WebCore::Page::nonFastScrollableRects): Deleted.
+ * page/Page.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::nonFastScrollableRects const):
+
2020-03-24 James Darpinian <[email protected]>
Set important EGL context attributes
Modified: trunk/Source/WebCore/page/Page.cpp (258881 => 258882)
--- trunk/Source/WebCore/page/Page.cpp 2020-03-23 22:48:49 UTC (rev 258881)
+++ trunk/Source/WebCore/page/Page.cpp 2020-03-23 22:53:58 UTC (rev 258882)
@@ -459,10 +459,14 @@
return String();
}
-Ref<DOMRectList> Page::nonFastScrollableRects()
+Ref<DOMRectList> Page::nonFastScrollableRectsForTesting()
{
- if (Document* document = m_mainFrame->document())
+ if (Document* document = m_mainFrame->document()) {
document->updateLayout();
+#if ENABLE(IOS_TOUCH_EVENTS)
+ document->updateTouchEventRegions();
+#endif
+ }
Vector<IntRect> rects;
if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator()) {
Modified: trunk/Source/WebCore/page/Page.h (258881 => 258882)
--- trunk/Source/WebCore/page/Page.h 2020-03-23 22:48:49 UTC (rev 258881)
+++ trunk/Source/WebCore/page/Page.h 2020-03-23 22:53:58 UTC (rev 258882)
@@ -266,7 +266,7 @@
WEBCORE_EXPORT String scrollingStateTreeAsText();
WEBCORE_EXPORT String synchronousScrollingReasonsAsText();
- WEBCORE_EXPORT Ref<DOMRectList> nonFastScrollableRects();
+ WEBCORE_EXPORT Ref<DOMRectList> nonFastScrollableRectsForTesting();
WEBCORE_EXPORT Ref<DOMRectList> touchEventRectsForEventForTesting(const String& eventName);
WEBCORE_EXPORT Ref<DOMRectList> passiveTouchEventListenerRectsForTesting();
Modified: trunk/Source/WebCore/testing/Internals.cpp (258881 => 258882)
--- trunk/Source/WebCore/testing/Internals.cpp 2020-03-23 22:48:49 UTC (rev 258881)
+++ trunk/Source/WebCore/testing/Internals.cpp 2020-03-23 22:53:58 UTC (rev 258882)
@@ -2864,7 +2864,7 @@
if (!page)
return DOMRectList::create();
- return page->nonFastScrollableRects();
+ return page->nonFastScrollableRectsForTesting();
}
ExceptionOr<void> Internals::setElementUsesDisplayListDrawing(Element& element, bool usesDisplayListDrawing)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
