Changeset 245894 in webkit

Timestamp:

May 30, 2019, 11:05:18 AM (7 years ago)

Author:

Wenson Hsieh

Message:

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 Tim Horton.

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):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+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 Tim Horton.
+
+        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-30  Truitt Savell  <tsavell@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -3293 +3293 @@
 void WebPage::scheduleShrinkToFitContent()
 {
+    if (m_isClosed)
+        return;
+
     m_shrinkToFitContentTimer.restart();
 }
@@ -3304 +3307 @@
 bool WebPage::immediatelyShrinkToFitContent()
 {
+    if (m_isClosed)
+        return false;
+
     if (!shouldIgnoreMetaViewport())
         return false;