Changeset 238662 in webkit
- Timestamp:
- Nov 29, 2018, 1:14:12 AM (8 years ago)
- Location:
- trunk/Source/WebDriver
- Files:
-
- 3 edited
-
ChangeLog (modified) (1 diff)
-
Session.cpp (modified) (36 diffs)
-
WebDriverService.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebDriver/ChangeLog
r237724 r238662 1 2018-11-29 Tomas Popela <tpopela@redhat.com> 2 3 [WebDriver] Fix clang warnings in Session.cpp 4 https://bugs.webkit.org/show_bug.cgi?id=192077 5 6 Reviewed by Carlos Garcia Campos. 7 8 * Session.cpp: 9 (WebDriver::Session::dismissAndNotifyAlert): 10 (WebDriver::Session::acceptAndNotifyAlert): 11 (WebDriver::Session::reportUnexpectedAlertOpen): 12 (WebDriver::Session::getCurrentURL): 13 (WebDriver::Session::getTitle): 14 (WebDriver::Session::getWindowHandle): 15 (WebDriver::Session::getWindowHandles): 16 (WebDriver::Session::getToplevelBrowsingContextRect): 17 (WebDriver::Session::computeElementLayout): 18 (WebDriver::Session::isElementSelected): 19 (WebDriver::Session::getElementText): 20 (WebDriver::Session::getElementTagName): 21 (WebDriver::Session::getElementRect): 22 (WebDriver::Session::isElementEnabled): 23 (WebDriver::Session::isElementDisplayed): 24 (WebDriver::Session::getElementAttribute): 25 (WebDriver::Session::getElementProperty): 26 (WebDriver::Session::getElementCSSValue): 27 (WebDriver::Session::selectOptionElement): 28 (WebDriver::Session::elementClick): 29 (WebDriver::Session::elementClear): 30 (WebDriver::Session::handleScriptResult): 31 (WebDriver::Session::performMouseInteraction): 32 (WebDriver::Session::performKeyboardInteractions): 33 (WebDriver::Session::getAllCookies): 34 (WebDriver::Session::getNamedCookie): 35 (WebDriver::Session::addCookie): 36 (WebDriver::Session::deleteCookie): 37 (WebDriver::Session::deleteAllCookies): 38 (WebDriver::Session::performActions): 39 (WebDriver::Session::releaseActions): 40 (WebDriver::Session::dismissAlert): 41 (WebDriver::Session::acceptAlert): 42 (WebDriver::Session::getAlertText): 43 (WebDriver::Session::sendAlertText): 44 (WebDriver::Session::takeScreenshot): 45 * WebDriverService.cpp: 46 (WebDriver::WebDriverService::deleteSession): 47 1 48 2018-11-02 Zan Dobersek <zdobersek@igalia.com> 2 49 -
trunk/Source/WebDriver/Session.cpp
r235560 r238662 242 242 { 243 243 reportUnexpectedAlertOpen([this, completionHandler = WTFMove(completionHandler)](CommandResult&& result) mutable { 244 dismissAlert([ this,errorResult = WTFMove(result), completionHandler = WTFMove(completionHandler)](CommandResult&& result) mutable {244 dismissAlert([errorResult = WTFMove(result), completionHandler = WTFMove(completionHandler)](CommandResult&& result) mutable { 245 245 if (result.isError()) { 246 246 completionHandler(WTFMove(result)); … … 255 255 { 256 256 reportUnexpectedAlertOpen([this, completionHandler = WTFMove(completionHandler)](CommandResult&& result) mutable { 257 acceptAlert([ this,errorResult = WTFMove(result), completionHandler = WTFMove(completionHandler)](CommandResult&& result) mutable {257 acceptAlert([errorResult = WTFMove(result), completionHandler = WTFMove(completionHandler)](CommandResult&& result) mutable { 258 258 if (result.isError()) { 259 259 completionHandler(WTFMove(result)); … … 267 267 void Session::reportUnexpectedAlertOpen(Function<void (CommandResult&&)>&& completionHandler) 268 268 { 269 getAlertText([ this,completionHandler = WTFMove(completionHandler)](CommandResult&& result) {269 getAlertText([completionHandler = WTFMove(completionHandler)](CommandResult&& result) { 270 270 std::optional<String> alertText; 271 271 if (!result.isError()) { … … 329 329 RefPtr<JSON::Object> parameters = JSON::Object::create(); 330 330 parameters->setString("handle"_s, m_toplevelBrowsingContext.value()); 331 m_host->sendCommandToBackend("getBrowsingContext"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {331 m_host->sendCommandToBackend("getBrowsingContext"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 332 332 if (response.isError || !response.responseObject) { 333 333 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 449 449 parameters->setString("function"_s, "function() { return document.title; }"_s); 450 450 parameters->setArray("arguments"_s, JSON::Array::create()); 451 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {451 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 452 452 if (response.isError || !response.responseObject) { 453 453 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 478 478 RefPtr<JSON::Object> parameters = JSON::Object::create(); 479 479 parameters->setString("handle"_s, m_toplevelBrowsingContext.value()); 480 m_host->sendCommandToBackend("getBrowsingContext"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {480 m_host->sendCommandToBackend("getBrowsingContext"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 481 481 if (response.isError || !response.responseObject) { 482 482 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 556 556 void Session::getWindowHandles(Function<void (CommandResult&&)>&& completionHandler) 557 557 { 558 m_host->sendCommandToBackend("getBrowsingContexts"_s, JSON::Object::create(), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {558 m_host->sendCommandToBackend("getBrowsingContexts"_s, JSON::Object::create(), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 559 559 if (response.isError || !response.responseObject) { 560 560 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 687 687 RefPtr<JSON::Object> parameters = JSON::Object::create(); 688 688 parameters->setString("handle"_s, m_toplevelBrowsingContext.value()); 689 m_host->sendCommandToBackend("getBrowsingContext"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {689 m_host->sendCommandToBackend("getBrowsingContext"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 690 690 if (response.isError || !response.responseObject) { 691 691 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 916 916 parameters->setBoolean("scrollIntoViewIfNeeded"_s, options.contains(ElementLayoutOption::ScrollIntoViewIfNeeded)); 917 917 parameters->setString("coordinateSystem"_s, options.contains(ElementLayoutOption::UseViewportCoordinates) ? "LayoutViewport"_s : "Page"_s); 918 m_host->sendCommandToBackend("computeElementLayout"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) mutable {918 m_host->sendCommandToBackend("computeElementLayout"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) mutable { 919 919 if (response.isError || !response.responseObject) { 920 920 completionHandler(std::nullopt, std::nullopt, false, WTFMove(response.responseObject)); … … 1113 1113 parameters->setString("function"_s, ElementAttributeJavaScript); 1114 1114 parameters->setArray("arguments"_s, WTFMove(arguments)); 1115 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {1115 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 1116 1116 if (response.isError || !response.responseObject) { 1117 1117 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 1164 1164 parameters->setString("function"_s, "function(element) { return element.innerText.replace(/^[^\\S\\xa0]+|[^\\S\\xa0]+$/g, '') }"_s); 1165 1165 parameters->setArray("arguments"_s, WTFMove(arguments)); 1166 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {1166 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 1167 1167 if (response.isError || !response.responseObject) { 1168 1168 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 1205 1205 parameters->setString("function"_s, "function(element) { return element.tagName.toLowerCase() }"_s); 1206 1206 parameters->setArray("arguments"_s, WTFMove(arguments)); 1207 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {1207 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 1208 1208 if (response.isError || !response.responseObject) { 1209 1209 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 1237 1237 return; 1238 1238 } 1239 computeElementLayout(elementID, { }, [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](std::optional<Rect>&& rect, std::optional<Point>&&, bool, RefPtr<JSON::Object>&& error) {1239 computeElementLayout(elementID, { }, [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](std::optional<Rect>&& rect, std::optional<Point>&&, bool, RefPtr<JSON::Object>&& error) { 1240 1240 if (!rect || error) { 1241 1241 completionHandler(CommandResult::fail(WTFMove(error))); … … 1273 1273 parameters->setString("function"_s, "function(element) { return element.disabled === undefined ? true : !element.disabled }"_s); 1274 1274 parameters->setArray("arguments"_s, WTFMove(arguments)); 1275 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {1275 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 1276 1276 if (response.isError || !response.responseObject) { 1277 1277 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 1314 1314 parameters->setString("function"_s, ElementDisplayedJavaScript); 1315 1315 parameters->setArray("arguments"_s, WTFMove(arguments)); 1316 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {1316 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 1317 1317 if (response.isError || !response.responseObject) { 1318 1318 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 1356 1356 parameters->setString("function"_s, ElementAttributeJavaScript); 1357 1357 parameters->setArray("arguments"_s, WTFMove(arguments)); 1358 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {1358 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 1359 1359 if (response.isError || !response.responseObject) { 1360 1360 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 1397 1397 parameters->setString("function"_s, makeString("function(element) { return element.", property, "; }")); 1398 1398 parameters->setArray("arguments"_s, WTFMove(arguments)); 1399 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {1399 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 1400 1400 if (response.isError || !response.responseObject) { 1401 1401 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 1438 1438 parameters->setString("function"_s, makeString("function(element) { return document.defaultView.getComputedStyle(element).getPropertyValue('", cssProperty, "'); }")); 1439 1439 parameters->setArray("arguments"_s, WTFMove(arguments)); 1440 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {1440 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 1441 1441 if (response.isError || !response.responseObject) { 1442 1442 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 1499 1499 parameters->setString("frameHandle"_s, m_currentBrowsingContext.value_or(emptyString())); 1500 1500 parameters->setString("nodeHandle"_s, elementID); 1501 m_host->sendCommandToBackend("selectOptionElement"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {1501 m_host->sendCommandToBackend("selectOptionElement"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 1502 1502 if (response.isError) { 1503 1503 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 1530 1530 } 1531 1531 1532 getElementTagName(elementID, [this, elementID, inViewCenter = WTFMove(inViewCenter), isObscured,completionHandler = WTFMove(completionHandler)](CommandResult&& result) mutable {1532 getElementTagName(elementID, [this, elementID, inViewCenter = WTFMove(inViewCenter), completionHandler = WTFMove(completionHandler)](CommandResult&& result) mutable { 1533 1533 bool isOptionElement = false; 1534 1534 if (!result.isError()) { … … 1570 1570 parameters->setString("function"_s, FormElementClearJavaScript); 1571 1571 parameters->setArray("arguments"_s, WTFMove(arguments)); 1572 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {1572 m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 1573 1573 if (response.isError) { 1574 1574 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 1822 1822 } 1823 1823 1824 return resultValue;1824 return WTFMove(resultValue); 1825 1825 } 1826 1826 … … 1926 1926 } 1927 1927 parameters->setArray("modifiers"_s, JSON::Array::create()); 1928 m_host->sendCommandToBackend("performMouseInteraction"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {1928 m_host->sendCommandToBackend("performMouseInteraction"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 1929 1929 if (response.isError) { 1930 1930 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 1960 1960 } 1961 1961 parameters->setArray("interactions"_s, WTFMove(interactionsArray)); 1962 m_host->sendCommandToBackend("performKeyboardInteractions"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {1962 m_host->sendCommandToBackend("performKeyboardInteractions"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 1963 1963 if (response.isError) { 1964 1964 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 2047 2047 RefPtr<JSON::Object> parameters = JSON::Object::create(); 2048 2048 parameters->setString("browsingContextHandle"_s, m_toplevelBrowsingContext.value()); 2049 m_host->sendCommandToBackend("getAllCookies"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) mutable {2049 m_host->sendCommandToBackend("getAllCookies"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) mutable { 2050 2050 if (response.isError || !response.responseObject) { 2051 2051 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 2080 2080 void Session::getNamedCookie(const String& name, Function<void (CommandResult&&)>&& completionHandler) 2081 2081 { 2082 getAllCookies([ this,name, completionHandler = WTFMove(completionHandler)](CommandResult&& result) mutable {2082 getAllCookies([name, completionHandler = WTFMove(completionHandler)](CommandResult&& result) mutable { 2083 2083 if (result.isError()) { 2084 2084 completionHandler(WTFMove(result)); … … 2117 2117 parameters->setString("browsingContextHandle"_s, m_toplevelBrowsingContext.value()); 2118 2118 parameters->setObject("cookie"_s, WTFMove(cookie)); 2119 m_host->sendCommandToBackend("addSingleCookie"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {2119 m_host->sendCommandToBackend("addSingleCookie"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 2120 2120 if (response.isError) { 2121 2121 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 2142 2142 parameters->setString("browsingContextHandle"_s, m_toplevelBrowsingContext.value()); 2143 2143 parameters->setString("cookieName"_s, name); 2144 m_host->sendCommandToBackend("deleteSingleCookie"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {2144 m_host->sendCommandToBackend("deleteSingleCookie"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 2145 2145 if (response.isError) { 2146 2146 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 2166 2166 RefPtr<JSON::Object> parameters = JSON::Object::create(); 2167 2167 parameters->setString("browsingContextHandle"_s, m_toplevelBrowsingContext.value()); 2168 m_host->sendCommandToBackend("deleteAllCookies"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {2168 m_host->sendCommandToBackend("deleteAllCookies"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 2169 2169 if (response.isError) { 2170 2170 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 2338 2338 2339 2339 parameters->setArray("steps"_s, WTFMove(steps)); 2340 m_host->sendCommandToBackend("performInteractionSequence"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)] (SessionHost::CommandResponse&& response) {2340 m_host->sendCommandToBackend("performInteractionSequence"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)] (SessionHost::CommandResponse&& response) { 2341 2341 if (response.isError) { 2342 2342 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 2360 2360 RefPtr<JSON::Object> parameters = JSON::Object::create(); 2361 2361 parameters->setString("handle"_s, m_toplevelBrowsingContext.value()); 2362 m_host->sendCommandToBackend("cancelInteractionSequence"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {2362 m_host->sendCommandToBackend("cancelInteractionSequence"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 2363 2363 if (response.isError) { 2364 2364 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 2378 2378 RefPtr<JSON::Object> parameters = JSON::Object::create(); 2379 2379 parameters->setString("browsingContextHandle"_s, m_toplevelBrowsingContext.value()); 2380 m_host->sendCommandToBackend("dismissCurrentJavaScriptDialog"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {2380 m_host->sendCommandToBackend("dismissCurrentJavaScriptDialog"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 2381 2381 if (response.isError) { 2382 2382 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 2396 2396 RefPtr<JSON::Object> parameters = JSON::Object::create(); 2397 2397 parameters->setString("browsingContextHandle"_s, m_toplevelBrowsingContext.value()); 2398 m_host->sendCommandToBackend("acceptCurrentJavaScriptDialog"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {2398 m_host->sendCommandToBackend("acceptCurrentJavaScriptDialog"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 2399 2399 if (response.isError) { 2400 2400 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 2414 2414 RefPtr<JSON::Object> parameters = JSON::Object::create(); 2415 2415 parameters->setString("browsingContextHandle"_s, m_toplevelBrowsingContext.value()); 2416 m_host->sendCommandToBackend("messageOfCurrentJavaScriptDialog"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {2416 m_host->sendCommandToBackend("messageOfCurrentJavaScriptDialog"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 2417 2417 if (response.isError || !response.responseObject) { 2418 2418 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 2438 2438 parameters->setString("browsingContextHandle"_s, m_toplevelBrowsingContext.value()); 2439 2439 parameters->setString("userInput"_s, text); 2440 m_host->sendCommandToBackend("setUserInputForCurrentJavaScriptPrompt"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {2440 m_host->sendCommandToBackend("setUserInputForCurrentJavaScriptPrompt"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) { 2441 2441 if (response.isError) { 2442 2442 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); … … 2469 2469 if (scrollIntoView.value_or(false)) 2470 2470 parameters->setBoolean("scrollIntoViewIfNeeded"_s, true); 2471 m_host->sendCommandToBackend("takeScreenshot"_s, WTFMove(parameters), [ this,protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) mutable {2471 m_host->sendCommandToBackend("takeScreenshot"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) mutable { 2472 2472 if (response.isError || !response.responseObject) { 2473 2473 completionHandler(CommandResult::fail(WTFMove(response.responseObject))); -
trunk/Source/WebDriver/WebDriverService.cpp
r234837 r238662 759 759 760 760 auto session = std::exchange(m_session, nullptr); 761 session->close([ this,session, completionHandler = WTFMove(completionHandler)](CommandResult&& result) mutable {761 session->close([session, completionHandler = WTFMove(completionHandler)](CommandResult&& result) mutable { 762 762 // Ignore unknown errors when closing the session if the browser is closed. 763 763 if (result.isError() && result.errorCode() == CommandResult::ErrorCode::UnknownError && !session->isConnected())
Note:
See TracChangeset
for help on using the changeset viewer.
