Title: [268068] branches/safari-610.2.8.1-branch/Source/WebKit
Revision
268068
Author
repst...@apple.com
Date
2020-10-06 13:14:03 -0700 (Tue, 06 Oct 2020)

Log Message

Cherry-pick r268019. rdar://problem/70012479

    Change a PDF RELEASE_ASSERT to an early return.
    rdar://problem/69805240 and https://bugs.webkit.org/show_bug.cgi?id=217346

    Reviewed by Tim Horton.

    No new tests (Wish they were possible)

    * WebProcess/Plugins/PDF/PDFPlugin.mm:
    (WebKit::PDFPlugin::installPDFDocument): This release assert is getting hit regularly.
      Change to an early return while we continue tracking this down.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268019 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-610.2.8.1-branch/Source/WebKit/ChangeLog (268067 => 268068)


--- branches/safari-610.2.8.1-branch/Source/WebKit/ChangeLog	2020-10-06 20:11:32 UTC (rev 268067)
+++ branches/safari-610.2.8.1-branch/Source/WebKit/ChangeLog	2020-10-06 20:14:03 UTC (rev 268068)
@@ -1,3 +1,34 @@
+2020-10-06  Russell Epstein  <repst...@apple.com>
+
+        Cherry-pick r268019. rdar://problem/70012479
+
+    Change a PDF RELEASE_ASSERT to an early return.
+    rdar://problem/69805240 and https://bugs.webkit.org/show_bug.cgi?id=217346
+    
+    Reviewed by Tim Horton.
+    
+    No new tests (Wish they were possible)
+    
+    * WebProcess/Plugins/PDF/PDFPlugin.mm:
+    (WebKit::PDFPlugin::installPDFDocument): This release assert is getting hit regularly.
+      Change to an early return while we continue tracking this down.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268019 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-05  Brady Eidson  <beid...@apple.com>
+
+            Change a PDF RELEASE_ASSERT to an early return.
+            rdar://problem/69805240 and https://bugs.webkit.org/show_bug.cgi?id=217346
+
+            Reviewed by Tim Horton.
+
+            No new tests (Wish they were possible)
+
+            * WebProcess/Plugins/PDF/PDFPlugin.mm:
+            (WebKit::PDFPlugin::installPDFDocument): This release assert is getting hit regularly.
+              Change to an early return while we continue tracking this down.
+
 2020-09-27  Alan Coon  <alanc...@apple.com>
 
         Cherry-pick r267540. rdar://problem/69593993

Modified: branches/safari-610.2.8.1-branch/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm (268067 => 268068)


--- branches/safari-610.2.8.1-branch/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm	2020-10-06 20:11:32 UTC (rev 268067)
+++ branches/safari-610.2.8.1-branch/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm	2020-10-06 20:14:03 UTC (rev 268068)
@@ -1574,8 +1574,10 @@
     if (m_hasBeenDestroyed)
         return;
 
-    // If we haven't been destroyed yet, there must still be a PluginController
-    RELEASE_ASSERT(controller());
+    if (!controller()) {
+        RELEASE_LOG(IncrementalPDF, "PDFPlugin::installPDFDocument called - Plug-in has not been destroyed, but there's also no controller.");
+        return;
+    }
 
 #if HAVE(INCREMENTAL_PDF_APIS)
     maybeClearHighLatencyDataProviderFlag();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to