Changeset 244407 in webkit
- Timestamp:
- Apr 17, 2019 4:06:17 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r244405 r244407 1 2019-04-17 Truitt Savell <tsavell@apple.com> 2 3 Unreviewed, rolling out r244400. 4 5 Caused testing to exit early with assertionon Debug WK2 6 7 Reverted changeset: 8 9 "UI↔Web deadlock when printing with a JavaScript alert 10 visible" 11 https://bugs.webkit.org/show_bug.cgi?id=196839 12 https://trac.webkit.org/changeset/244400 13 1 14 2019-04-17 Brady Eidson <beidson@apple.com> 2 15 -
trunk/Source/WebKit/Platform/IPC/Connection.cpp
r244400 r244407 342 342 } 343 343 344 m_outstandingOutgoingSynchronousReplyCount++;345 346 344 auto replyEncoder = std::make_unique<Encoder>("IPC", "SyncMessageReply", syncRequestID); 347 345 … … 461 459 bool Connection::sendSyncReply(std::unique_ptr<Encoder> encoder) 462 460 { 463 ASSERT(m_outstandingOutgoingSynchronousReplyCount);464 m_outstandingOutgoingSynchronousReplyCount--;465 466 461 return sendMessage(WTFMove(encoder), { }); 467 462 } … … 894 889 } 895 890 896 m_outstandingOutgoingSynchronousReplyCount++;897 898 891 auto replyEncoder = std::make_unique<Encoder>("IPC", "SyncMessageReply", syncRequestID); 899 892 -
trunk/Source/WebKit/Platform/IPC/Connection.h
r244400 r244407 197 197 bool inSendSync() const { return m_inSendSyncCount; } 198 198 199 bool hasOutstandingOutgoingSynchronousReplies() const { return m_outstandingOutgoingSynchronousReplyCount; }200 201 199 Identifier identifier() const; 202 200 … … 300 298 unsigned m_inDispatchMessageMarkedDispatchWhenWaitingForSyncReplyCount; 301 299 unsigned m_inDispatchMessageMarkedToUseFullySynchronousModeForTesting { 0 }; 302 unsigned m_outstandingOutgoingSynchronousReplyCount { 0 };303 300 bool m_fullySynchronousModeIsAllowedForTesting { false }; 304 301 bool m_ignoreTimeoutsForTesting { false }; -
trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
r244400 r244407 6324 6324 { 6325 6325 #if !PLATFORM(IOSMAC) 6326 if (_page->process().connection()->hasOutstandingOutgoingSynchronousReplies())6327 return nil;6328 6329 6326 UIViewPrintFormatter *viewPrintFormatter = self.viewPrintFormatter; 6330 6327 ASSERT([viewPrintFormatter isKindOfClass:[_WKWebViewPrintFormatter class]]); -
trunk/Source/WebKit/UIProcess/ios/WKContentView.mm
r244400 r244407 727 727 return 0; 728 728 729 if (_page->process().connection()->hasOutstandingOutgoingSynchronousReplies())730 return 0;731 732 729 uint64_t frameID; 733 730 if (_WKFrameHandle *handle = printFormatter.frameToPrint) … … 773 770 - (CGPDFDocumentRef)_wk_printedDocument 774 771 { 775 if (_page->process().connection()->hasOutstandingOutgoingSynchronousReplies())776 return nullptr;777 778 772 if (_isPrintingToPDF) { 779 773 if (!_page->process().connection()->waitForAndDispatchImmediately<Messages::WebPageProxy::DrawToPDFCallback>(_page->pageID(), Seconds::infinity())) { -
trunk/Tools/ChangeLog
r244405 r244407 1 2019-04-17 Truitt Savell <tsavell@apple.com> 2 3 Unreviewed, rolling out r244400. 4 5 Caused testing to exit early with assertionon Debug WK2 6 7 Reverted changeset: 8 9 "UI↔Web deadlock when printing with a JavaScript alert 10 visible" 11 https://bugs.webkit.org/show_bug.cgi?id=196839 12 https://trac.webkit.org/changeset/244400 13 1 14 2019-04-17 Brady Eidson <beidson@apple.com> 2 15 -
trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
r244405 r244407 95 95 2D2BEB2D22324E5F005544CA /* RequestTextInputContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D2BEB2C22324E5F005544CA /* RequestTextInputContext.mm */; }; 96 96 2D3CA3A8221DF4B40088E803 /* PageOverlayPlugin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D3CA3A4221DF2390088E803 /* PageOverlayPlugin.mm */; }; 97 2D41CFB92260014F00FFF335 /* WKWebViewPrintFormatter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D41CFB82260014E00FFF335 /* WKWebViewPrintFormatter.mm */; };98 97 2D4CF8BD1D8360CC0001CE8D /* WKThumbnailView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D4CF8BC1D8360CC0001CE8D /* WKThumbnailView.mm */; }; 99 98 2D51A0C71C8BF00C00765C45 /* DOMHTMLVideoElementWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D51A0C51C8BF00400765C45 /* DOMHTMLVideoElementWrapper.mm */; }; … … 1453 1452 2D2BEB2C22324E5F005544CA /* RequestTextInputContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RequestTextInputContext.mm; sourceTree = "<group>"; }; 1454 1453 2D3CA3A4221DF2390088E803 /* PageOverlayPlugin.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageOverlayPlugin.mm; sourceTree = "<group>"; }; 1455 2D41CFB82260014E00FFF335 /* WKWebViewPrintFormatter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewPrintFormatter.mm; sourceTree = "<group>"; };1456 1454 2D4CF8BC1D8360CC0001CE8D /* WKThumbnailView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKThumbnailView.mm; path = WebKit/WKThumbnailView.mm; sourceTree = "<group>"; }; 1457 1455 2D51A0C51C8BF00400765C45 /* DOMHTMLVideoElementWrapper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMHTMLVideoElementWrapper.mm; sourceTree = "<group>"; }; … … 2720 2718 F4106C6821ACBF84004B89A1 /* WKWebViewFirstResponderTests.mm */, 2721 2719 D3BE5E341E4CE85E00FD563A /* WKWebViewGetContents.mm */, 2722 2D41CFB82260014E00FFF335 /* WKWebViewPrintFormatter.mm */,2723 2720 37A9DBE7213B4C9300D261A2 /* WKWebViewServerTrustKVC.mm */, 2724 2721 93F56DA81E5F9181003EDE84 /* WKWebViewSnapshot.mm */, … … 4454 4451 D34E08761E4E42E1005FF14A /* WKWebViewGetContents.mm in Sources */, 4455 4452 F4FA91811E61849B007B8C1D /* WKWebViewMacEditingTests.mm in Sources */, 4456 2D41CFB92260014F00FFF335 /* WKWebViewPrintFormatter.mm in Sources */,4457 4453 37A9DBE9213B4C9300D261A2 /* WKWebViewServerTrustKVC.mm in Sources */, 4458 4454 93F56DA91E5F919D003EDE84 /* WKWebViewSnapshot.mm in Sources */,
Note: See TracChangeset
for help on using the changeset viewer.