Title: [249699] branches/safari-608-branch/Source/WebKit
- Revision
- 249699
- Author
- alanc...@apple.com
- Date
- 2019-09-09 20:20:05 -0700 (Mon, 09 Sep 2019)
Log 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
Modified Paths
Diff
Modified: branches/safari-608-branch/Source/WebKit/ChangeLog (249698 => 249699)
--- branches/safari-608-branch/Source/WebKit/ChangeLog 2019-09-10 03:20:02 UTC (rev 249698)
+++ branches/safari-608-branch/Source/WebKit/ChangeLog 2019-09-10 03:20:05 UTC (rev 249699)
@@ -1,5 +1,38 @@
2019-09-09 Kocsen Chung <kocsen_ch...@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_hor...@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_ch...@apple.com>
+
Cherry-pick r249605. rdar://problem/55182896
Incorrect selection rect revealed after pasting images in a contenteditable element
Modified: branches/safari-608-branch/Source/WebKit/UIProcess/ios/WKContentView.mm (249698 => 249699)
--- branches/safari-608-branch/Source/WebKit/UIProcess/ios/WKContentView.mm 2019-09-10 03:20:02 UTC (rev 249698)
+++ branches/safari-608-branch/Source/WebKit/UIProcess/ios/WKContentView.mm 2019-09-10 03:20:05 UTC (rev 249699)
@@ -749,10 +749,8 @@
- (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;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
