WebKitTestRunner: Don't use accessibility controller when !HAVE(ACCESSIBILITY)
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 8 Mar 2018 23:27:45 +0000 (23:27 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 8 Mar 2018 23:27:45 +0000 (23:27 +0000)
https://bugs.webkit.org/show_bug.cgi?id=183475

Patch by Stephan Szabo <stephan.szabo@sony.com> on 2018-03-08
Reviewed by Youenn Fablet.

* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
(WTR::InjectedBundle::done):
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::didClearWindowForFrame):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229439 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

index a4e70d4..a573d15 100644 (file)
@@ -1,3 +1,15 @@
+2018-03-08  Stephan Szabo  <stephan.szabo@sony.com>
+
+        WebKitTestRunner: Don't use accessibility controller when !HAVE(ACCESSIBILITY)
+        https://bugs.webkit.org/show_bug.cgi?id=183475
+
+        Reviewed by Youenn Fablet.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::done):
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::didClearWindowForFrame):
+
 2018-03-08  Ms2ger  <Ms2ger@igalia.com>
 
         [WPE] Update expectations for API tests
index fe52c54..169fd5d 100644 (file)
@@ -419,7 +419,9 @@ void InjectedBundle::done()
 
     m_testRunner->invalidateWaitToDumpWatchdogTimer();
 
+#if HAVE(ACCESSIBILITY)
     m_accessibilityController->resetToConsistentState();
+#endif
 
     WKRetainPtr<WKStringRef> doneMessageName(AdoptWK, WKStringCreateWithUTF8CString("Done"));
     WKRetainPtr<WKMutableDictionaryRef> doneMessageBody(AdoptWK, WKMutableDictionaryCreate());
index 6016747..8edfb2f 100644 (file)
@@ -995,7 +995,9 @@ void InjectedBundlePage::didClearWindowForFrame(WKBundleFrameRef frame, WKBundle
     injectedBundle.gcController()->makeWindowObject(context, window, &exception);
     injectedBundle.eventSendingController()->makeWindowObject(context, window, &exception);
     injectedBundle.textInputController()->makeWindowObject(context, window, &exception);
+#if HAVE(ACCESSIBILITY)
     injectedBundle.accessibilityController()->makeWindowObject(context, window, &exception);
+#endif
 
     WebCoreTestSupport::injectInternalsObject(context);
 }