⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 245934 in webkit


Ignore:
Timestamp:
May 30, 2019, 5:30:39 PM (7 years ago)
Author:
Alan Coon
Message:

Apply patch. rdar://problem/50753927

Add test coverage for <rdar://problem/49731231> ​https://bugs.webkit.org/show_bug.cgi?id=196730 <rdar://problem/49731231>

Reviewed by Ryosuke Niwa.

Tools:

Add support for testRunner.abortModal() in macOS's WebKitTestRunner in order
to match DumpRenderTree.

  • WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
  • WebKitTestRunner/InjectedBundle/TestRunner.cpp: (WTR::TestRunner::abortModal):
  • WebKitTestRunner/InjectedBundle/TestRunner.h:
  • WebKitTestRunner/TestController.cpp: (WTR::TestController::runModal):
  • WebKitTestRunner/TestController.h:
  • WebKitTestRunner/TestInvocation.cpp: (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
  • WebKitTestRunner/gtk/TestControllerGtk.cpp: (WTR::TestController::abortModal):
  • WebKitTestRunner/ios/TestControllerIOS.mm: (WTR::TestController::abortModal):
  • WebKitTestRunner/mac/TestControllerMac.mm: (WTR::TestController::abortModal):
  • WebKitTestRunner/win/TestControllerWin.cpp: (WTR::TestController::abortModal):

LayoutTests:

  • http/tests/security/showModalDialog-sync-cross-origin-page-load-expected.txt: Added.
  • http/tests/security/showModalDialog-sync-cross-origin-page-load.html: Added.

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

Location:
branches/safari-607-branch
Files:
2 added
12 edited

Legend:

Unmodified
Added
Removed

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

    r245927 r245934  
     12019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Apply patch. rdar://problem/50753927
     4
     5    Add test coverage for <rdar://problem/49731231> https://bugs.webkit.org/show_bug.cgi?id=196730 <rdar://problem/49731231>
     6   
     7    Reviewed by Ryosuke Niwa.
     8   
     9    Tools:
     10   
     11    Add support for testRunner.abortModal() in macOS's WebKitTestRunner in order
     12    to match DumpRenderTree.
     13   
     14    * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
     15    * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
     16    (WTR::TestRunner::abortModal):
     17    * WebKitTestRunner/InjectedBundle/TestRunner.h:
     18    * WebKitTestRunner/TestController.cpp:
     19    (WTR::TestController::runModal):
     20    * WebKitTestRunner/TestController.h:
     21    * WebKitTestRunner/TestInvocation.cpp:
     22    (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
     23    * WebKitTestRunner/gtk/TestControllerGtk.cpp:
     24    (WTR::TestController::abortModal):
     25    * WebKitTestRunner/ios/TestControllerIOS.mm:
     26    (WTR::TestController::abortModal):
     27    * WebKitTestRunner/mac/TestControllerMac.mm:
     28    (WTR::TestController::abortModal):
     29    * WebKitTestRunner/win/TestControllerWin.cpp:
     30    (WTR::TestController::abortModal):
     31   
     32    LayoutTests:
     33   
     34    * http/tests/security/showModalDialog-sync-cross-origin-page-load-expected.txt: Added.
     35    * http/tests/security/showModalDialog-sync-cross-origin-page-load.html: Added.
     36   
     37    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@244898 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     38
     39    2019-05-02  Chris Dumez  <cdumez@apple.com>
     40
     41            Add test coverage for <rdar://problem/49731231>
     42            https://bugs.webkit.org/show_bug.cgi?id=196730
     43            <rdar://problem/49731231>
     44
     45            Reviewed by Ryosuke Niwa.
     46
     47            * http/tests/security/showModalDialog-sync-cross-origin-page-load-expected.txt: Added.
     48            * http/tests/security/showModalDialog-sync-cross-origin-page-load.html: Added.
     49
    1502019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
    251

  • branches/safari-607-branch/Tools/ChangeLog

    r245893 r245934  
     12019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Apply patch. rdar://problem/50753927
     4
     5    Add test coverage for <rdar://problem/49731231> https://bugs.webkit.org/show_bug.cgi?id=196730 <rdar://problem/49731231>
     6   
     7    Reviewed by Ryosuke Niwa.
     8   
     9    Tools:
     10   
     11    Add support for testRunner.abortModal() in macOS's WebKitTestRunner in order
     12    to match DumpRenderTree.
     13   
     14    * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
     15    * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
     16    (WTR::TestRunner::abortModal):
     17    * WebKitTestRunner/InjectedBundle/TestRunner.h:
     18    * WebKitTestRunner/TestController.cpp:
     19    (WTR::TestController::runModal):
     20    * WebKitTestRunner/TestController.h:
     21    * WebKitTestRunner/TestInvocation.cpp:
     22    (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
     23    * WebKitTestRunner/gtk/TestControllerGtk.cpp:
     24    (WTR::TestController::abortModal):
     25    * WebKitTestRunner/ios/TestControllerIOS.mm:
     26    (WTR::TestController::abortModal):
     27    * WebKitTestRunner/mac/TestControllerMac.mm:
     28    (WTR::TestController::abortModal):
     29    * WebKitTestRunner/win/TestControllerWin.cpp:
     30    (WTR::TestController::abortModal):
     31   
     32    LayoutTests:
     33   
     34    * http/tests/security/showModalDialog-sync-cross-origin-page-load-expected.txt: Added.
     35    * http/tests/security/showModalDialog-sync-cross-origin-page-load.html: Added.
     36   
     37    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@244898 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     38
     39    2019-05-02  Chris Dumez  <cdumez@apple.com>
     40
     41            Add test coverage for <rdar://problem/49731231>
     42            https://bugs.webkit.org/show_bug.cgi?id=196730
     43            <rdar://problem/49731231>
     44
     45            Reviewed by Ryosuke Niwa.
     46
     47            Add support for testRunner.abortModal() in macOS's WebKitTestRunner in order
     48            to match DumpRenderTree.
     49
     50            * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
     51            * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
     52            (WTR::TestRunner::abortModal):
     53            * WebKitTestRunner/InjectedBundle/TestRunner.h:
     54            * WebKitTestRunner/TestController.cpp:
     55            (WTR::TestController::runModal):
     56            * WebKitTestRunner/TestController.h:
     57            * WebKitTestRunner/TestInvocation.cpp:
     58            (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
     59            * WebKitTestRunner/gtk/TestControllerGtk.cpp:
     60            (WTR::TestController::abortModal):
     61            * WebKitTestRunner/ios/TestControllerIOS.mm:
     62            (WTR::TestController::abortModal):
     63            * WebKitTestRunner/mac/TestControllerMac.mm:
     64            (WTR::TestController::abortModal):
     65            * WebKitTestRunner/win/TestControllerWin.cpp:
     66            (WTR::TestController::abortModal):
     67
    1682019-05-30  Ryan Haddad  <ryanhaddad@apple.com>
    269

  • branches/safari-607-branch/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl

    r241088 r245934  
    330330    void setOpenPanelFiles(object filesArray);
    331331
     332    // Modal alerts
     333    void abortModal();
     334
    332335    void setWebRTCMDNSICECandidatesEnabled(boolean value);
    333336    void setWebRTCUnifiedPlanEnabled(boolean value);

  • branches/safari-607-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

    r241088 r245934  
    26862686}
    26872687
     2688void TestRunner::abortModal()
     2689{
     2690    WKRetainPtr<WKStringRef> messageName = adoptWK(WKStringCreateWithUTF8CString("AbortModal"));
     2691    WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), nullptr, nullptr);
     2692}
     2693
    26882694} // namespace WTR

  • branches/safari-607-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

    r241088 r245934  
    449449    void setOpenPanelFiles(JSValueRef);
    450450
     451    // Modal alerts
     452    void abortModal();
     453
    451454    void terminateNetworkProcess();
    452455    void terminateServiceWorkerProcess();

  • branches/safari-607-branch/Tools/WebKitTestRunner/TestController.cpp

    r241880 r245934  
    205205{
    206206    PlatformWebView* view = static_cast<PlatformWebView*>(const_cast<void*>(clientInfo));
    207     view->setWindowIsKey(false);
     207    TestController::singleton().mainWebView()->setWindowIsKey(false);
    208208    runModal(view);
    209     view->setWindowIsKey(true);
     209    TestController::singleton().mainWebView()->setWindowIsKey(true);
    210210}
    211211

  • branches/safari-607-branch/Tools/WebKitTestRunner/TestController.h

    r241101 r245934  
    279279#endif
    280280
     281    void abortModal();
     282
    281283    bool isDoingMediaCapture() const;
    282284

  • branches/safari-607-branch/Tools/WebKitTestRunner/TestInvocation.cpp

    r241088 r245934  
    15221522    }
    15231523
     1524    if (WKStringIsEqualToUTF8CString(messageName, "AbortModal")) {
     1525        TestController::singleton().abortModal();
     1526        return nullptr;
     1527    }
     1528
    15241529    ASSERT_NOT_REACHED();
    15251530    return nullptr;

  • branches/safari-607-branch/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp

    r239401 r245934  
    125125}
    126126
     127void TestController::abortModal()
     128{
     129}
     130
    127131WKContextRef TestController::platformContext()
    128132{

  • branches/safari-607-branch/Tools/WebKitTestRunner/ios/TestControllerIOS.mm

    r238939 r245934  
    192192}
    193193
     194void TestController::abortModal()
     195{
     196}
     197
    194198const char* TestController::platformLibraryPathForTesting()
    195199{

  • branches/safari-607-branch/Tools/WebKitTestRunner/mac/TestControllerMac.mm

    r241461 r245934  
    352352}
    353353
     354void TestController::abortModal()
     355{
     356    [NSApp abortModal];
     357}
     358
    354359const char* TestController::platformLibraryPathForTesting()
    355360{

  • branches/safari-607-branch/Tools/WebKitTestRunner/win/TestControllerWin.cpp

    r238098 r245934  
    198198}
    199199
     200void TestController::abortModal()
     201{
     202    notImplemented();
     203}
     204
    200205WKContextRef TestController::platformContext()
    201206{
Note: See TracChangeset for help on using the changeset viewer.