Changeset 249699 in webkit

Timestamp:

Sep 9, 2019, 8:20:05 PM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r249624. rdar://problem/55202935

Marking up a note on iOS results in a PDF with no contents
​https://bugs.webkit.org/show_bug.cgi?id=201530
<rdar://problem/53686019>

Unreviewed follow-up.

• UIProcess/ios/WKContentView.mm: (-[WKContentView _waitForDrawToPDFCallback]): Remove an ASSERT_NOT_REACHED that fires if the synchronous wait for printing times out. This is a totally legitimite situation that can occur if the process crashes; there's no need for an assert there.

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

Location:

branches/safari-608-branch/Source/WebKit

Files:

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

branches/safari-608-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-09  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r249624. rdar://problem/55202935
+
+    Marking up a note on iOS results in a PDF with no contents
+    https://bugs.webkit.org/show_bug.cgi?id=201530
+    <rdar://problem/53686019>
+    
+    Unreviewed follow-up.
+    
+    * UIProcess/ios/WKContentView.mm:
+    (-[WKContentView _waitForDrawToPDFCallback]):
+    Remove an ASSERT_NOT_REACHED that fires if the synchronous wait for printing
+    times out. This is a totally legitimite situation that can occur if the process
+    crashes; there's no need for an assert there.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@249624 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-09-07  Tim Horton  <timothy_horton@apple.com>
+
+            Marking up a note on iOS results in a PDF with no contents
+            https://bugs.webkit.org/show_bug.cgi?id=201530
+            <rdar://problem/53686019>
+
+            Unreviewed follow-up.
+
+            * UIProcess/ios/WKContentView.mm:
+            (-[WKContentView _waitForDrawToPDFCallback]):
+            Remove an ASSERT_NOT_REACHED that fires if the synchronous wait for printing
+            times out. This is a totally legitimite situation that can occur if the process
+            crashes; there's no need for an assert there.
+
 2019-09-09  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-608-branch/Source/WebKit/UIProcess/ios/WKContentView.mm

@@ -750 +750 @@
 - (BOOL)_waitForDrawToPDFCallback
 {
-    if (!_page->process().connection()->waitForAndDispatchImmediately<Messages::WebPageProxy::DrawToPDFCallback>(_page->webPageID(), Seconds::infinity())) {
-        ASSERT_NOT_REACHED();
+    if (!_page->process().connection()->waitForAndDispatchImmediately<Messages::WebPageProxy::DrawToPDFCallback>(_page->pageID(), Seconds::infinity()))
         return false;
-    }
     ASSERT(!_isPrintingToPDF);
     return true;