diff options
Diffstat (limited to 'WebKitTools/TestWebKitAPI/InjectedBundleController.cpp')
| -rw-r--r-- | WebKitTools/TestWebKitAPI/InjectedBundleController.cpp | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/WebKitTools/TestWebKitAPI/InjectedBundleController.cpp b/WebKitTools/TestWebKitAPI/InjectedBundleController.cpp index e438afd..5942ec8 100644 --- a/WebKitTools/TestWebKitAPI/InjectedBundleController.cpp +++ b/WebKitTools/TestWebKitAPI/InjectedBundleController.cpp @@ -54,20 +54,15 @@ void InjectedBundleController::initialize(WKBundleRef bundle, WKTypeRef initiali this, didCreatePage, willDestroyPage, - didInitializePageGroup, didReceiveMessage }; WKBundleSetClient(m_bundle, &client); // Initialize the test from the "initializationUserData". + assert(WKGetTypeID(initializationUserData) == WKStringGetTypeID()); + WKStringRef testName = static_cast<WKStringRef>(initializationUserData); - assert(WKGetTypeID(initializationUserData) == WKDictionaryGetTypeID()); - WKDictionaryRef initializationDictionary = static_cast<WKDictionaryRef>(initializationUserData); - - WKStringRef testName = static_cast<WKStringRef>(WKDictionaryGetItemForKey(initializationDictionary, WKStringCreateWithUTF8CString("TestName"))); - WKTypeRef userData = WKDictionaryGetItemForKey(initializationDictionary, WKStringCreateWithUTF8CString("UserData")); - - initializeTestNamed(bundle, Util::toSTD(testName), userData); + initializeTestNamed(bundle, Util::toSTD(testName)); } void InjectedBundleController::didCreatePage(WKBundleRef bundle, WKBundlePageRef page, const void* clientInfo) @@ -84,13 +79,6 @@ void InjectedBundleController::willDestroyPage(WKBundleRef bundle, WKBundlePageR self->m_currentTest->willDestroyPage(bundle, page); } -void InjectedBundleController::didInitializePageGroup(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, const void* clientInfo) -{ - InjectedBundleController* self = static_cast<InjectedBundleController*>(const_cast<void*>(clientInfo)); - assert(self->m_currentTest); - self->m_currentTest->didInitializePageGroup(bundle, pageGroup); -} - void InjectedBundleController::didReceiveMessage(WKBundleRef bundle, WKStringRef messageName, WKTypeRef messageBody, const void* clientInfo) { InjectedBundleController* self = static_cast<InjectedBundleController*>(const_cast<void*>(clientInfo)); @@ -106,7 +94,7 @@ void InjectedBundleController::dumpTestNames() printf("%s\n", (*it).first.c_str()); } -void InjectedBundleController::initializeTestNamed(WKBundleRef bundle, const std::string& identifier, WKTypeRef userData) +void InjectedBundleController::initializeTestNamed(WKBundleRef bundle, const std::string& identifier) { CreateInjectedBundleTestFunction createTestFunction = m_createInjectedBundleTestFunctions[identifier]; if (!createTestFunction) { @@ -115,7 +103,7 @@ void InjectedBundleController::initializeTestNamed(WKBundleRef bundle, const std } m_currentTest = createTestFunction(identifier); - m_currentTest->initialize(bundle, userData); + m_currentTest->initialize(bundle); } void InjectedBundleController::registerCreateInjectedBundleTestFunction(const std::string& identifier, CreateInjectedBundleTestFunction function) |