Attachment 357480 Details for Bug 192061 – Part 3.

[patch] Part 3.

bug-192061-20181217145854.patch (text/plain), 4.95 KB, created by Jiewen Tan on 2018-12-17 14:58:55 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Jiewen Tan

Created: 2018-12-17 14:58:55 PST

Size: 4.95 KB

patch

obsolete

>Subversion Revision: 239282
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index cc9c4ab4fa4c7dca456962bff2591f4c082d317b..aadf9de833a8a01a5cdd6654c70bf1690710b4cc 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-12-17  Jiewen Tan  <jiewen_tan@apple.com>
>+
>+        [Mac] Layout Test http/wpt/webauthn/public-key-credential-create-success-hid.https.html and http/wpt/webauthn/public-key-credential-get-success-hid.https.html are flaky
>+        https://bugs.webkit.org/show_bug.cgi?id=192061
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part 3.
>+
>+        Add some additional temporary logging info to determine if the timer is working as expected.
>+        Once the bug is determined and fixed, we should remove all logging added in this patch.
>+
>+        * UIProcess/WebAuthentication/AuthenticatorManager.cpp:
>+        (WebKit::AuthenticatorManager::respondReceived):
>+        (WebKit::AuthenticatorManager::initTimeOutTimer):
>+        (WebKit::AuthenticatorManager::timeOutTimerFired):
>+        * UIProcess/WebAuthentication/Mock/MockAuthenticatorManager.cpp:
>+        (WebKit::MockAuthenticatorManager::respondReceivedInternal):
>+
> 2018-12-17  Zan Dobersek  <zdobersek@igalia.com>
> 
>         Unreviewed WPE build fix after r239277.
>diff --git a/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorManager.cpp b/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorManager.cpp
>index 6595f9c0af33c9bac38c16e6fa3b3dbeca745f86..c1a6832edf3c1ae7bdd8997f08379ebc5c1877f4 100644
>--- a/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorManager.cpp
>+++ b/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorManager.cpp
>@@ -191,6 +191,8 @@ void AuthenticatorManager::respondReceived(Respond&& respond)
>     if (WTF::holds_alternative<PublicKeyCredentialData>(respond)) {
>         m_pendingCompletionHandler(WTFMove(respond));
>         clearStateAsync();
>+        // FIXME(192061)
>+        LOG_ERROR("Stop timer.");
>         m_requestTimeOutTimer.stop();
>         return;
>     }
>@@ -223,11 +225,16 @@ void AuthenticatorManager::initTimeOutTimer(const std::optional<unsigned>& timeO
>     using namespace AuthenticatorManagerInternal;
> 
>     unsigned timeOutInMsValue = std::min(maxTimeOutValue, timeOutInMs.value_or(maxTimeOutValue));
>+    // FIXME(192061)
>+    LOG_ERROR("Start timer.");
>     m_requestTimeOutTimer.startOneShot(Seconds::fromMilliseconds(timeOutInMsValue));
> }
> 
> void AuthenticatorManager::timeOutTimerFired()
> {
>+    ASSERT(m_requestTimeOutTimer.isActive());
>+    // FIXME(192061)
>+    LOG_ERROR("Timer fired.");
>     m_pendingCompletionHandler((ExceptionData { NotAllowedError, "Operation timed out."_s }));
>     clearStateAsync();
> }
>diff --git a/Source/WebKit/UIProcess/WebAuthentication/Mock/MockAuthenticatorManager.cpp b/Source/WebKit/UIProcess/WebAuthentication/Mock/MockAuthenticatorManager.cpp
>index 4db27609754607be9d77fe5da130792a7ba0746c..fae88614a86055f6344d4cb9866d465ea9500818 100644
>--- a/Source/WebKit/UIProcess/WebAuthentication/Mock/MockAuthenticatorManager.cpp
>+++ b/Source/WebKit/UIProcess/WebAuthentication/Mock/MockAuthenticatorManager.cpp
>@@ -47,6 +47,8 @@ void MockAuthenticatorManager::respondReceivedInternal(Respond&& respond)
> 
>     pendingCompletionHandler()(WTFMove(respond));
>     clearStateAsync();
>+    // FIXME(192061)
>+    LOG_ERROR("Stop timer.");
>     requestTimeOutTimer().stop();
> }
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index e57880bb57ba499f3dbcbed59e527da907e639db..a459acd31dc34f99dc48f99e9e6ed782ab8a763c 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-12-17  Jiewen Tan  <jiewen_tan@apple.com>
>+
>+        [Mac] Layout Test http/wpt/webauthn/public-key-credential-create-success-hid.https.html and http/wpt/webauthn/public-key-credential-get-success-hid.https.html are flaky
>+        https://bugs.webkit.org/show_bug.cgi?id=192061
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add a time out value.
>+
>+        * http/wpt/webauthn/public-key-credential-create-success-hid.https.html:
>+
> 2018-12-17  Zalan Bujtas  <zalan@apple.com>
> 
>         Reproducible ASSERTion failure when toggling layer borders with find-in-page up
>diff --git a/LayoutTests/http/wpt/webauthn/public-key-credential-create-success-hid.https.html b/LayoutTests/http/wpt/webauthn/public-key-credential-create-success-hid.https.html
>index cc6cd16f56f66308c19a2b1807ee947f661cc648..798b7be8d350920c2bbf0caa667fa070fce2d20f 100644
>--- a/LayoutTests/http/wpt/webauthn/public-key-credential-create-success-hid.https.html
>+++ b/LayoutTests/http/wpt/webauthn/public-key-credential-create-success-hid.https.html
>@@ -69,7 +69,8 @@
>                 },
>                 challenge: Base64URL.parse("MTIzNDU2"),
>                 pubKeyCredParams: [{ type: "public-key", alg: -7 }],
>-                authenticatorSelection: { authenticatorAttachment: "cross-platform" }
>+                authenticatorSelection: { authenticatorAttachment: "cross-platform" },
>+                timeout: 10
>             }
>         };
>

Actions: View | Formatted Diff | Diff

Attachments on bug 192061: 356665 | 357284 | 357480 | 357622 | 357969 | 358635 | 358758 | 358844 | 358846 | 358851