Title: [198915] trunk/Source/WebKit2
- Revision
- 198915
- Author
- [email protected]
- Date
- 2016-03-31 14:03:52 -0700 (Thu, 31 Mar 2016)
Log Message
Web Automation: Add support for script timeouts to the evaluateJavaScriptFunction command
https://bugs.webkit.org/show_bug.cgi?id=156052
rdar://problem/25457151
Address additional review comments.
* WebProcess/Automation/WebAutomationSessionProxy.js:
(AutomationSessionProxy.prototype.evaluateJavaScriptFunction): Add semicolons and remove
and clearTimeout that wasn't needed.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (198914 => 198915)
--- trunk/Source/WebKit2/ChangeLog 2016-03-31 20:52:44 UTC (rev 198914)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-31 21:03:52 UTC (rev 198915)
@@ -1,5 +1,18 @@
2016-03-31 Timothy Hatcher <[email protected]>
+ Web Automation: Add support for script timeouts to the evaluateJavaScriptFunction command
+
+ https://bugs.webkit.org/show_bug.cgi?id=156052
+ rdar://problem/25457151
+
+ Address additional review comments.
+
+ * WebProcess/Automation/WebAutomationSessionProxy.js:
+ (AutomationSessionProxy.prototype.evaluateJavaScriptFunction): Add semicolons and remove
+ and clearTimeout that wasn't needed.
+
+2016-03-31 Timothy Hatcher <[email protected]>
+
Web Automation: Navigation commands should not return until page loads or fails
https://bugs.webkit.org/show_bug.cgi?id=156063
Modified: trunk/Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.js (198914 => 198915)
--- trunk/Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.js 2016-03-31 20:52:44 UTC (rev 198914)
+++ trunk/Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.js 2016-03-31 21:03:52 UTC (rev 198915)
@@ -50,8 +50,8 @@
let timeoutIdentifier = 0;
- let reportResult = (result) => { clearTimeout(timeoutIdentifier); resultCallback(frameID, callbackID, this._jsonStringify(result), false); }
- let reportTimeoutError = () => { clearTimeout(timeoutIdentifier); resultCallback(frameID, callbackID, "_javascript_Timeout", true); }
+ let reportResult = (result) => { clearTimeout(timeoutIdentifier); resultCallback(frameID, callbackID, this._jsonStringify(result), false); };
+ let reportTimeoutError = () => { resultCallback(frameID, callbackID, "_javascript_Timeout", true); };
if (expectsImplicitCallbackArgument) {
timeoutIdentifier = setTimeout(reportTimeoutError, callbackTimeout);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes