Changeset 263591 in webkit

Timestamp:

Jun 26, 2020 3:00:52 PM (4 years ago)

Author:

Wenson Hsieh

Message:

[iOS] Layout tests sometimes assert under -[WKContentView hasContent]
​https://bugs.webkit.org/show_bug.cgi?id=213656
<rdar://problem/64818648>

Reviewed by Tim Horton.

Make it safe to invoke -[WKContentView hasContent] when post-layout data is not present, and there is no
ranged or caret selection. Some editing layout tests on iOS tend to hit the post-layout data assertion due to
the callout bar presentation callback firing while we reset the test harness to a consistent state (and spin the
runloop while doing so).

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView hasContent]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-06-26  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS] Layout tests sometimes assert under -[WKContentView hasContent]
+        https://bugs.webkit.org/show_bug.cgi?id=213656
+        <rdar://problem/64818648>
+
+        Reviewed by Tim Horton.
+
+        Make it safe to invoke `-[WKContentView hasContent]` when post-layout data is not present, and there is no
+        ranged or caret selection. Some editing layout tests on iOS tend to hit the post-layout data assertion due to
+        the callout bar presentation callback firing while we reset the test harness to a consistent state (and spin the
+        runloop while doing so).
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView hasContent]):
+
 2020-06-26  Pablo Saavedra  <psaavedra@igalia.com>
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -5662 +5662 @@
 - (BOOL)hasContent
 {
-    return _page->editorState().postLayoutData().hasContent;
+    auto& editorState = _page->editorState();
+    return !editorState.selectionIsNone && editorState.postLayoutData().hasContent;
 }