Changeset 244407 in webkit


Ignore:
Timestamp:
Apr 17, 2019 4:06:17 PM (5 years ago)
Author:
Truitt Savell
Message:

Unreviewed, rolling out r244400.

Caused testing to exit early with assertionon Debug WK2

Reverted changeset:

"UI↔Web deadlock when printing with a JavaScript alert
visible"
​https://bugs.webkit.org/show_bug.cgi?id=196839
​https://trac.webkit.org/changeset/244400

Location:
trunk
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r244405 r244407  
     12019-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
    1142019-04-17  Brady Eidson  <beidson@apple.com>
    215

  • trunk/Source/WebKit/Platform/IPC/Connection.cpp

    r244400 r244407  
    342342    }
    343343
    344     m_outstandingOutgoingSynchronousReplyCount++;
    345 
    346344    auto replyEncoder = std::make_unique<Encoder>("IPC", "SyncMessageReply", syncRequestID);
    347345
    … …  
    461459bool Connection::sendSyncReply(std::unique_ptr<Encoder> encoder)
    462460{
    463     ASSERT(m_outstandingOutgoingSynchronousReplyCount);
    464     m_outstandingOutgoingSynchronousReplyCount--;
    465 
    466461    return sendMessage(WTFMove(encoder), { });
    467462}
    … …  
    894889    }
    895890
    896     m_outstandingOutgoingSynchronousReplyCount++;
    897 
    898891    auto replyEncoder = std::make_unique<Encoder>("IPC", "SyncMessageReply", syncRequestID);
    899892

  • trunk/Source/WebKit/Platform/IPC/Connection.h

    r244400 r244407  
    197197    bool inSendSync() const { return m_inSendSyncCount; }
    198198
    199     bool hasOutstandingOutgoingSynchronousReplies() const { return m_outstandingOutgoingSynchronousReplyCount; }
    200 
    201199    Identifier identifier() const;
    202200
    … …  
    300298    unsigned m_inDispatchMessageMarkedDispatchWhenWaitingForSyncReplyCount;
    301299    unsigned m_inDispatchMessageMarkedToUseFullySynchronousModeForTesting { 0 };
    302     unsigned m_outstandingOutgoingSynchronousReplyCount { 0 };
    303300    bool m_fullySynchronousModeIsAllowedForTesting { false };
    304301    bool m_ignoreTimeoutsForTesting { false };

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

    r244400 r244407  
    63246324{
    63256325#if !PLATFORM(IOSMAC)
    6326     if (_page->process().connection()->hasOutstandingOutgoingSynchronousReplies())
    6327         return nil;
    6328 
    63296326    UIViewPrintFormatter *viewPrintFormatter = self.viewPrintFormatter;
    63306327    ASSERT([viewPrintFormatter isKindOfClass:[_WKWebViewPrintFormatter class]]);

  • trunk/Source/WebKit/UIProcess/ios/WKContentView.mm

    r244400 r244407  
    727727        return 0;
    728728
    729     if (_page->process().connection()->hasOutstandingOutgoingSynchronousReplies())
    730         return 0;
    731 
    732729    uint64_t frameID;
    733730    if (_WKFrameHandle *handle = printFormatter.frameToPrint)
    … …  
    773770- (CGPDFDocumentRef)_wk_printedDocument
    774771{
    775     if (_page->process().connection()->hasOutstandingOutgoingSynchronousReplies())
    776         return nullptr;
    777 
    778772    if (_isPrintingToPDF) {
    779773        if (!_page->process().connection()->waitForAndDispatchImmediately<Messages::WebPageProxy::DrawToPDFCallback>(_page->pageID(), Seconds::infinity())) {

  • trunk/Tools/ChangeLog

    r244405 r244407  
     12019-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
    1142019-04-17  Brady Eidson  <beidson@apple.com>
    215

  • trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

    r244405 r244407  
    9595                2D2BEB2D22324E5F005544CA /* RequestTextInputContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D2BEB2C22324E5F005544CA /* RequestTextInputContext.mm */; };
    9696                2D3CA3A8221DF4B40088E803 /* PageOverlayPlugin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D3CA3A4221DF2390088E803 /* PageOverlayPlugin.mm */; };
    97                 2D41CFB92260014F00FFF335 /* WKWebViewPrintFormatter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D41CFB82260014E00FFF335 /* WKWebViewPrintFormatter.mm */; };
    9897                2D4CF8BD1D8360CC0001CE8D /* WKThumbnailView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D4CF8BC1D8360CC0001CE8D /* WKThumbnailView.mm */; };
    9998                2D51A0C71C8BF00C00765C45 /* DOMHTMLVideoElementWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D51A0C51C8BF00400765C45 /* DOMHTMLVideoElementWrapper.mm */; };
    … …  
    14531452                2D2BEB2C22324E5F005544CA /* RequestTextInputContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RequestTextInputContext.mm; sourceTree = "<group>"; };
    14541453                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>"; };
    14561454                2D4CF8BC1D8360CC0001CE8D /* WKThumbnailView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKThumbnailView.mm; path = WebKit/WKThumbnailView.mm; sourceTree = "<group>"; };
    14571455                2D51A0C51C8BF00400765C45 /* DOMHTMLVideoElementWrapper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMHTMLVideoElementWrapper.mm; sourceTree = "<group>"; };
    … …  
    27202718                                F4106C6821ACBF84004B89A1 /* WKWebViewFirstResponderTests.mm */,
    27212719                                D3BE5E341E4CE85E00FD563A /* WKWebViewGetContents.mm */,
    2722                                 2D41CFB82260014E00FFF335 /* WKWebViewPrintFormatter.mm */,
    27232720                                37A9DBE7213B4C9300D261A2 /* WKWebViewServerTrustKVC.mm */,
    27242721                                93F56DA81E5F9181003EDE84 /* WKWebViewSnapshot.mm */,
    … …  
    44544451                                D34E08761E4E42E1005FF14A /* WKWebViewGetContents.mm in Sources */,
    44554452                                F4FA91811E61849B007B8C1D /* WKWebViewMacEditingTests.mm in Sources */,
    4456                                 2D41CFB92260014F00FFF335 /* WKWebViewPrintFormatter.mm in Sources */,
    44574453                                37A9DBE9213B4C9300D261A2 /* WKWebViewServerTrustKVC.mm in Sources */,
    44584454                                93F56DA91E5F919D003EDE84 /* WKWebViewSnapshot.mm in Sources */,
Note: See TracChangeset for help on using the changeset viewer.