Attachment 370943 Details for Bug 198374 – Patch

[patch] Patch

bug-198374-20190530082058.patch (text/plain), 1.94 KB, created by Wenson Hsieh on 2019-05-30 08:20:59 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2019-05-30 08:20:59 PDT

Size: 1.94 KB

patch

obsolete

>Subversion Revision: 245847
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 6a90c5cb1ea1bfbfc49e76db31a8e46c9ba5b811..e99880e7efba0a1c2e2f45ba3c0005bc13460a92 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-05-30  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Rare crash under `WebPage::shouldIgnoreMetaViewport const` when shrinking to fit content
>+        https://bugs.webkit.org/show_bug.cgi?id=198374
>+        <rdar://problem/51261348>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This is a speculative fix for the crash; what appears to be happening is that the shrink-to-fit-content timer
>+        is somehow being scheduled after the page has already been closed. We can probably fix this by bailing when
>+        scheduling shrink-to-fit-content if m_isClosed is true.
>+
>+        * WebProcess/WebPage/ios/WebPageIOS.mm:
>+        (WebKit::WebPage::scheduleShrinkToFitContent):
>+        (WebKit::WebPage::immediatelyShrinkToFitContent):
>+
> 2019-05-29  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Missing caret when focusing an editable field if the selection was set when WKWebView wasn't first responder
>diff --git a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
>index ad2f69bad16ca6880af59b09cff94f441abb5163..7bd678b00882e5781ec072c425645313b93ac89e 100644
>--- a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
>+++ b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
>@@ -3235,6 +3235,9 @@ void WebPage::resetViewportDefaultConfiguration(WebFrame* frame, bool hasMobileD
> 
> void WebPage::scheduleShrinkToFitContent()
> {
>+    if (m_isClosed)
>+        return;
>+
>     m_shrinkToFitContentTimer.restart();
> }
> 
>@@ -3246,6 +3249,9 @@ void WebPage::shrinkToFitContentTimerFired()
> 
> bool WebPage::immediatelyShrinkToFitContent()
> {
>+    if (m_isClosed)
>+        return false;
>+
>     if (!shouldIgnoreMetaViewport())
>         return false;
>

Actions: View | Formatted Diff | Diff

Attachments on bug 198374: 370943