Changeset 228447 in webkit


Ignore:
Timestamp:
Feb 13, 2018 8:15:46 PM (6 years ago)
Author:
jmarcell@apple.com
Message:

Cherry-pick r228299. rdar://problem/37518837

Location:
branches/safari-605-branch
Files:
4 added
3 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-605-branch/LayoutTests/ChangeLog

    r228395 r228447  
     12018-02-13  Jason Marcell  <jmarcell@apple.com>
     2
     3        Cherry-pick r228299. rdar://problem/37518837
     4
     5    2018-02-08  Chris Dumez  <cdumez@apple.com>
     6
     7            Form submission after navigation fails when decidePolicyForNavigationAction is async
     8            https://bugs.webkit.org/show_bug.cgi?id=182412
     9            <rdar://problem/35181099>
     10
     11            Reviewed by Alex Christensen.
     12
     13            Import layout test coverage from Alex's earlier patch.
     14
     15            * http/tests/navigation/resources/a.html: Added.
     16            * http/tests/navigation/resources/b.html: Added.
     17            * http/tests/navigation/sync-form-submit-iframe-expected.txt: Added.
     18            * http/tests/navigation/sync-form-submit-iframe.html: Added.
     19
    1202018-02-12  Dean Jackson  <dino@apple.com>
    221

  • branches/safari-605-branch/Source/WebCore/ChangeLog

    r228407 r228447  
     12018-02-13  Jason Marcell  <jmarcell@apple.com>
     2
     3        Cherry-pick r228299. rdar://problem/37518837
     4
     5    2018-02-08  Chris Dumez  <cdumez@apple.com>
     6
     7            Form submission after navigation fails when decidePolicyForNavigationAction is async
     8            https://bugs.webkit.org/show_bug.cgi?id=182412
     9            <rdar://problem/35181099>
     10
     11            Reviewed by Alex Christensen.
     12
     13            When the form is submitted and schedules the load in an iframe that is already loading,
     14            FrameLoader::stopLoading() is called as expected. However, because policy checks can
     15            now be asynchronous, stopLoading() also needs to stop pending policy checks. Otherwise,
     16            continueLoadAfterNavigationPolicy() gets called for a cancelled load and we're in trouble
     17            because the FrameLoader was reused for another load since then.
     18
     19            Test: http/tests/navigation/sync-form-submit-iframe.html
     20
     21            * loader/FrameLoader.cpp:
     22            (WebCore::FrameLoader::stopLoading):
     23
    1242018-02-12  Jason Marcell  <jmarcell@apple.com>
    225

  • branches/safari-605-branch/Source/WebCore/loader/FrameLoader.cpp

    r228386 r228447  
    489489    }
    490490
     491    policyChecker().stopCheck();
     492
    491493    // FIXME: This will cancel redirection timer, which really needs to be restarted when restoring the frame from b/f cache.
    492494    m_frame.navigationScheduler().cancel();
Note: See TracChangeset for help on using the changeset viewer.