Changeset 243496 in webkit

Timestamp:

Mar 26, 2019 8:58:36 AM (5 years ago)

Author:

ap@apple.com

Message:

Address NSWindow sometimes using WebKitTestRunnerEvent too early
​https://bugs.webkit.org/show_bug.cgi?id=196211
rdar://problem/49110552

Reviewed by Tim Horton.

• WebKitTestRunner/TestController.cpp: (WTR::TestController::initialize):

Make sure that EventSenderProxy always exists when running tests. We used to create
it when resetting before the first test, which is a bit too late.

• WebKitTestRunner/TestController.h:
• WebKitTestRunner/cocoa/TestControllerCocoa.mm:

(WTR::TestController::platformCreateWebView):
(WTR::TestController::platformCreateOtherPage):
(WTR::TestController::finishCreatingPlatformWebView):

• WebKitTestRunner/mac/PlatformWebViewMac.mm:

(WTR::PlatformWebView::PlatformWebView):
Moved some code that made NSWindow use NSEvent during web view creation. We may
need to move more if some other case us found, but this is enough for now.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/TestController.cpp (modified) (1 diff)
• WebKitTestRunner/TestController.h (modified) (1 diff)
• WebKitTestRunner/cocoa/TestControllerCocoa.mm (modified) (2 diffs)
• WebKitTestRunner/mac/PlatformWebViewMac.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-03-25  Alexey Proskuryakov  <ap@apple.com>
+
+        Address NSWindow sometimes using WebKitTestRunnerEvent too early
+        https://bugs.webkit.org/show_bug.cgi?id=196211
+        rdar://problem/49110552
+
+        Reviewed by Tim Horton.
+
+        * WebKitTestRunner/TestController.cpp: (WTR::TestController::initialize):
+        Make sure that EventSenderProxy always exists when running tests. We used to create
+        it when resetting before the first test, which is a bit too late.
+
+        * WebKitTestRunner/TestController.h:
+        * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+        (WTR::TestController::platformCreateWebView):
+        (WTR::TestController::platformCreateOtherPage):
+        (WTR::TestController::finishCreatingPlatformWebView):
+        * WebKitTestRunner/mac/PlatformWebViewMac.mm:
+        (WTR::PlatformWebView::PlatformWebView):
+        Moved some code that made NSWindow use NSEvent during web view creation. We may
+        need to move more if some other case us found, but this is enough for now.
+
 2019-03-26  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -459 +459 @@
     WKRetainPtr<WKStringRef> pageGroupIdentifier(AdoptWK, WKStringCreateWithUTF8CString("WebKitTestRunnerPageGroup"));
     m_pageGroup.adopt(WKPageGroupCreateWithIdentifier(pageGroupIdentifier.get()));
+
+    m_eventSenderProxy = std::make_unique<EventSenderProxy>(this);
 }
 

trunk/Tools/WebKitTestRunner/TestController.h

@@ -454 +454 @@
     static void runModal(PlatformWebView*);
 
+#if PLATFORM(COCOA)
+    static void finishCreatingPlatformWebView(PlatformWebView*, const TestOptions&);
+#endif
+
     static const char* libraryPathForTesting();
     static const char* platformLibraryPathForTesting();

trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm

@@ -167 +167 @@
 
     m_mainWebView = std::make_unique<PlatformWebView>(copiedConfiguration.get(), options);
+    finishCreatingPlatformWebView(m_mainWebView.get(), options);
 
     if (options.punchOutWhiteBackgroundsInDarkMode)
@@ -179 +180 @@
     WKWebViewConfiguration *newConfiguration = [[globalWebViewConfiguration copy] autorelease];
     newConfiguration._relatedWebView = static_cast<WKWebView*>(parentView->platformView());
-    return new PlatformWebView(newConfiguration, options);
+    PlatformWebView* view = new PlatformWebView(newConfiguration, options);
+    finishCreatingPlatformWebView(view, options);
+    return view;
+}
+
+// Code that needs to run after TestController::m_mainWebView is initialized goes into this function.
+void TestController::finishCreatingPlatformWebView(PlatformWebView* view, const TestOptions& options)
+{
+#if PLATFORM(MAC)
+    if (options.shouldShowWebView)
+        [view->platformWindow() orderFront:nil];
+    else
+        [view->platformWindow() orderBack:nil];
+#endif
 }
 

trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm

@@ -81 +81 @@
     [m_window setCollectionBehavior:NSWindowCollectionBehaviorStationary];
     [[m_window contentView] addSubview:m_view];
-    if (m_options.shouldShowWebView)
-        [m_window orderFront:nil];
-    else
-        [m_window orderBack:nil];
     [m_window setReleasedWhenClosed:NO];
 }