From b19c93b110e19274d61988a93f532f3be0c5986d Mon Sep 17 00:00:00 2001
From: Luis Antunes <lcantunespt@gmail.com>
Date: Tue, 11 Aug 2026 18:02:39 +0000
Subject: [PATCH 1/2] Add in-dialog camera permission request option to payment
 handler

Currently, the camera test page (camera_test.html) provides two options
when camera access is tested:
1. "Start Camera": invokes getUserMedia and renders video to a <video> element.
2. "Grant Camera Access in Popup Window": opens a separate popup window
   to trigger the permission prompt externally (previously required when
   payment handler dialogs did not support native permission prompts).

To test native permission handling directly inside the payment handler
dialog, this change adds a "Grant Camera Access inside this Dialog" link.

When clicked, it calls navigator.mediaDevices.getUserMedia() directly
within the dialog, stops all tracks immediately upon granting, and
updates the permission status UI. The link is visible when camera
permission is in 'prompt' or 'denied' state, matching the popup link.
---
 public/pay/camera_test.html | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/public/pay/camera_test.html b/public/pay/camera_test.html
index 57feaf4..8978fbd 100644
--- a/public/pay/camera_test.html
+++ b/public/pay/camera_test.html
@@ -28,6 +28,7 @@ <h2>Camera Access Test</h2>
 
       <div style="margin-top: 10px;">
         <button id="start-camera-button" class="btn btn-primary btn-sm">Start Camera</button>
+        <a href="#" id="request-camera-in-dialog-link" class="btn btn-link btn-sm" style="display: none;">Grant Camera Access inside this Dialog</a>
         <a href="#" id="request-camera-popup-link" class="btn btn-link btn-sm" style="display: none;">Grant Camera Access in Popup Window</a>
       </div>
 
@@ -45,6 +46,7 @@ <h2>Camera Access Test</h2>
     <script>
       (function() {
         const statusElem = document.getElementById('camera-permission-status');
+        const inDialogLink = document.getElementById('request-camera-in-dialog-link');
         const popupLink = document.getElementById('request-camera-popup-link');
         const startBtn = document.getElementById('start-camera-button');
         const logElem = document.getElementById('camera-log');
@@ -56,14 +58,17 @@ <h2>Camera Access Test</h2>
           if (state === 'granted') {
             statusElem.className = 'alert alert-success';
             statusElem.innerHTML = 'Camera permission: <strong>granted</strong>';
+            if (inDialogLink) inDialogLink.style.display = 'none';
             if (popupLink) popupLink.style.display = 'none';
           } else if (state === 'prompt') {
             statusElem.className = 'alert alert-warning';
             statusElem.innerHTML = 'Camera permission: <strong>not granted (prompt required)</strong>';
+            if (inDialogLink) inDialogLink.style.display = 'inline-block';
             if (popupLink) popupLink.style.display = 'inline-block';
           } else if (state === 'denied') {
             statusElem.className = 'alert alert-danger';
             statusElem.innerHTML = 'Camera permission: <strong>denied</strong>';
+            if (inDialogLink) inDialogLink.style.display = 'inline-block';
             if (popupLink) popupLink.style.display = 'inline-block';
           } else {
             statusElem.className = 'alert alert-info';
@@ -104,6 +109,22 @@ <h2>Camera Access Test</h2>
           }
         }
 
+        async function requestCameraInDialog(evt) {
+          if (evt) evt.preventDefault();
+          logElem.style.display = 'none';
+          try {
+            const stream = await navigator.mediaDevices.getUserMedia({ video: true });
+            stream.getTracks().forEach(track => track.stop());
+            await checkCameraPermission();
+          } catch (err) {
+            console.error('getUserMedia error:', err);
+            logElem.className = 'alert alert-danger';
+            logElem.innerHTML = `<b>Camera error (${err.name})</b>: ${err.message || 'Access failed.'}`;
+            logElem.style.display = 'block';
+            await checkCameraPermission();
+          }
+        }
+
         function openCameraAccessPopup(evt) {
           if (evt) evt.preventDefault();
           const popup = window.open('/pay/camera_access.html', 'camera_access_popup', 'width=500,height=400');
@@ -118,6 +139,7 @@ <h2>Camera Access Test</h2>
         }
 
         startBtn.addEventListener('click', startCamera);
+        inDialogLink.addEventListener('click', requestCameraInDialog);
         popupLink.addEventListener('click', openCameraAccessPopup);
         checkCameraPermission();
       })();

From 632214ed4a9cb07e70970d68e0cf0cc45f5010c2 Mon Sep 17 00:00:00 2001
From: Luis Antunes <lcantunespt@gmail.com>
Date: Tue, 11 Aug 2026 18:47:37 +0000
Subject: [PATCH 2/2] Hide in-dialog camera access option when feature flag is
 disabled

When the kPaymentHandlerCameraAccess or kPaymentHandlerCameraAccessUx
feature flag is disabled in Chromium,
WebContentsDelegate does not handle camera access requests for payment
handler dialogs, and getUserMedia() rejects with NotSupportedError.

This CL handles NotSupportedError in camera_test.html by:
1. Dynamically marking camera access as unsupported.
2. Hiding the "Grant Camera Access" links to avoid
   confusing partners when the feature flag is disabled.
---
 public/pay/camera_test.html | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/public/pay/camera_test.html b/public/pay/camera_test.html
index 8978fbd..20351d3 100644
--- a/public/pay/camera_test.html
+++ b/public/pay/camera_test.html
@@ -52,6 +52,8 @@ <h2>Camera Access Test</h2>
         const logElem = document.getElementById('camera-log');
         const videoElem = document.getElementById('camera-video');
 
+        let cameraAccessSupported = true;
+
         function updateCameraPermissionUI(state) {
           if (!statusElem) return;
           statusElem.style.display = 'block';
@@ -63,13 +65,13 @@ <h2>Camera Access Test</h2>
           } else if (state === 'prompt') {
             statusElem.className = 'alert alert-warning';
             statusElem.innerHTML = 'Camera permission: <strong>not granted (prompt required)</strong>';
-            if (inDialogLink) inDialogLink.style.display = 'inline-block';
-            if (popupLink) popupLink.style.display = 'inline-block';
+            if (inDialogLink) inDialogLink.style.display = cameraAccessSupported ? 'inline-block' : 'none';
+            if (popupLink) popupLink.style.display = cameraAccessSupported ? 'inline-block' : 'none';
           } else if (state === 'denied') {
             statusElem.className = 'alert alert-danger';
             statusElem.innerHTML = 'Camera permission: <strong>denied</strong>';
-            if (inDialogLink) inDialogLink.style.display = 'inline-block';
-            if (popupLink) popupLink.style.display = 'inline-block';
+            if (inDialogLink) inDialogLink.style.display = cameraAccessSupported ? 'inline-block' : 'none';
+            if (popupLink) popupLink.style.display = cameraAccessSupported ? 'inline-block' : 'none';
           } else {
             statusElem.className = 'alert alert-info';
             statusElem.innerHTML = `Camera permission: <strong>${state}</strong>`;
@@ -103,8 +105,16 @@ <h2>Camera Access Test</h2>
           } catch (err) {
             console.error('getUserMedia error:', err);
             videoElem.style.display = 'none';
-            logElem.className = 'alert alert-danger';
-            logElem.innerHTML = `<b>Camera error (${err.name})</b>: ${err.message || 'Access failed.'}`;
+            if (err.name === 'NotSupportedError') {
+              cameraAccessSupported = false;
+              if (inDialogLink) inDialogLink.style.display = 'none';
+              if (popupLink) popupLink.style.display = 'none';
+              logElem.className = 'alert alert-warning';
+              logElem.innerHTML = '<b>Camera access is not supported:</b> feature flag <code>kPaymentHandlerCameraAccess</code> may be disabled.';
+            } else {
+              logElem.className = 'alert alert-danger';
+              logElem.innerHTML = `<b>Camera error (${err.name})</b>: ${err.message || 'Access failed.'}`;
+            }
             logElem.style.display = 'block';
           }
         }
@@ -118,8 +128,16 @@ <h2>Camera Access Test</h2>
             await checkCameraPermission();
           } catch (err) {
             console.error('getUserMedia error:', err);
-            logElem.className = 'alert alert-danger';
-            logElem.innerHTML = `<b>Camera error (${err.name})</b>: ${err.message || 'Access failed.'}`;
+            if (err.name === 'NotSupportedError') {
+              cameraAccessSupported = false;
+              if (inDialogLink) inDialogLink.style.display = 'none';
+              if (popupLink) popupLink.style.display = 'none';
+              logElem.className = 'alert alert-warning';
+              logElem.innerHTML = '<b>Camera access is not supported:</b> feature flag <code>kPaymentHandlerCameraAccess</code> may be disabled.';
+            } else {
+              logElem.className = 'alert alert-danger';
+              logElem.innerHTML = `<b>Camera error (${err.name})</b>: ${err.message || 'Access failed.'}`;
+            }
             logElem.style.display = 'block';
             await checkCameraPermission();
           }