From 459ed6ea85942bc0aa2e10d91b606a9a5f3bc074 Mon Sep 17 00:00:00 2001
From: MeladJM <jcmelad@up.edu.ph>
Date: Sat, 26 Jul 2025 04:07:54 +0800
Subject: [PATCH] Issue #2790 - Cleanup: Remove debugging lines

---
 layout/style/RuleCascadeData.cpp              |  2 --
 layout/style/nsCSSRuleUtils.cpp               |  2 --
 layout/style/res/forms.css                    | 32 -------------------
 .../FormAutofillContentService.js             | 22 -------------
 .../passwordmgr/LoginManagerContent.jsm       |  2 +-
 .../satchel/nsFormFillController.cpp          |  4 ---
 6 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/layout/style/RuleCascadeData.cpp b/layout/style/RuleCascadeData.cpp
index 349f2ca6ff..da6a4e70de 100644
--- a/layout/style/RuleCascadeData.cpp
+++ b/layout/style/RuleCascadeData.cpp
@@ -1270,13 +1270,11 @@ ComputeSelectorStateDependence(nsCSSSelector& aSelector)
       continue;
     }
 
-    // --- BEGIN PATCH: Explicit autofill state dependence ---
     if (pseudoClass->mType == CSSPseudoClassType::autofill ||
         pseudoClass->mType == CSSPseudoClassType::mozAutofillHighlight) {
       states |= NS_EVENT_STATE_AUTOFILL;
       continue;
     }
-    // --- END PATCH ---
 
     auto idx = static_cast<CSSPseudoClassTypeBase>(pseudoClass->mType);
     states |= nsCSSPseudoClasses::sPseudoClassStateDependences[idx];
diff --git a/layout/style/nsCSSRuleUtils.cpp b/layout/style/nsCSSRuleUtils.cpp
index bbba88fbea..1b987cbab8 100644
--- a/layout/style/nsCSSRuleUtils.cpp
+++ b/layout/style/nsCSSRuleUtils.cpp
@@ -576,7 +576,6 @@ nsCSSRuleUtils::StateSelectorMatches(Element* aElement,
   for (nsPseudoClassList* pseudoClass = aSelector->mPseudoClassList;
        pseudoClass;
        pseudoClass = pseudoClass->mNext) {
-    // --- Autofill explicit matching ---
     if (pseudoClass->mType == CSSPseudoClassType::autofill ||
         pseudoClass->mType == CSSPseudoClassType::mozAutofillHighlight) {
       // Match if the element has the autofill state, regardless of focus
@@ -585,7 +584,6 @@ nsCSSRuleUtils::StateSelectorMatches(Element* aElement,
       }
       continue; // This pseudo-class matches
     }
-    // --- End autofill explicit matching ---
     auto idx = static_cast<CSSPseudoClassTypeBase>(pseudoClass->mType);
     EventStates statesToCheck = nsCSSPseudoClasses::sPseudoClassStates[idx];
     if (!statesToCheck.IsEmpty() && !StateSelectorMatches(aElement,
diff --git a/layout/style/res/forms.css b/layout/style/res/forms.css
index d0f2c101fd..bc07a8ff4a 100644
--- a/layout/style/res/forms.css
+++ b/layout/style/res/forms.css
@@ -82,24 +82,8 @@ label {
 /* Note: Values in nsNativeTheme IsWidgetStyled function
    need to match textfield background/border values here */
 
-/* Autofill persistent highlight styles */
-input:-moz-autofill {
-  background-color: #FFEB3B !important;
-  background-image: none !important;
-  color: fieldtext !important;
-}
-
-input:-moz-autofill:hover,
-input:-moz-autofill:focus,
-input:-moz-autofill:active {
-  background-color: #FFEB3B !important;
-  background-image: none !important;
-  color: fieldtext !important;
-}
-
 input {
   -moz-appearance: textfield;
-  appearance: textfield;
   /* The sum of border and padding on block-start and block-end
      must be the same here, for buttons, and for <select> (including its
      internal padding magic) */
@@ -107,22 +91,6 @@ input {
   border: 2px inset ThreeDLightShadow;
   background-color: -moz-Field;
   color: -moz-FieldText;
-}
-
-/* Autofill styles - make highlighting persist */
-input:-moz-autofill {
-  background-color: #FFEB3B !important;
-  color: fieldtext !important;
-  background-image: none !important;
-}
-
-/* Ensure highlight persists on focus/hover/active states */
-input:-moz-autofill:hover,
-input:-moz-autofill:focus,
-input:-moz-autofill:active {
-  background-color: #FFEB3B !important;
-  color: fieldtext !important;
-  background-image: none !important;
   font: -moz-field;
   text-rendering: optimizeLegibility;
   line-height: normal;
diff --git a/toolkit/components/formautofill/FormAutofillContentService.js b/toolkit/components/formautofill/FormAutofillContentService.js
index 4f96b361e3..cd9850804f 100644
--- a/toolkit/components/formautofill/FormAutofillContentService.js
+++ b/toolkit/components/formautofill/FormAutofillContentService.js
@@ -250,29 +250,7 @@ FormHandler.prototype = {
       }
       fieldDetail.element.value = field.value;
       
-      // Add event listeners for debugging
-      // try {
-      //   fieldDetail.element.addEventListener('focus', () => console.log('[JS] input focused'));
-      //   fieldDetail.element.addEventListener('blur', () => console.log('[JS] input blurred'));
-      //   fieldDetail.element.addEventListener('input', () => console.log('[JS] input event, value:', fieldDetail.element.value));
-      // } catch (e) {
-      //   console.log('[JS] Could not add event listeners:', e);
-      // }
       
-      // if (typeof fieldDetail.element.setAutofilled === 'function') {
-      //   if (field.value) {
-      //     console.log('AUTOFILL: Calling setAutofilled(true) on element');
-      //     fieldDetail.element.setAutofilled(true);
-      //     console.log('AUTOFILL: setAutofilled(true) called successfully');
-      //   } else {
-      //     console.log('AUTOFILL: Calling setAutofilled(false) on element (empty value)');
-      //     fieldDetail.element.setAutofilled(false);
-      //   }
-      // } else {
-      //   console.log('AUTOFILL: setAutofilled is not a function on this element');
-      // }
-
-      // Highlight: Set autofilled state for all autofilled fields
       if (typeof fieldDetail.element.setAutofilled === 'function') {
         fieldDetail.element.setAutofilled(!!field.value);
       }
diff --git a/toolkit/components/passwordmgr/LoginManagerContent.jsm b/toolkit/components/passwordmgr/LoginManagerContent.jsm
index 28eabafbd7..a5b9abc288 100644
--- a/toolkit/components/passwordmgr/LoginManagerContent.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerContent.jsm
@@ -1220,7 +1220,7 @@ var LoginManagerContent = {
         };
         log("Saving autoFilledLogin", autoFilledLogin.guid, "for", form.rootElement);
         this.stateForDocument(doc).fillsByRootElement.set(form.rootElement, autoFilledLogin);
-        // Patch: Set autofilled state if value is present
+        // Set autofilled state if value is present
         if (typeof passwordField.setAutofilled === "function" && passwordField.value) {
           passwordField.setAutofilled(true);
         }
diff --git a/toolkit/components/satchel/nsFormFillController.cpp b/toolkit/components/satchel/nsFormFillController.cpp
index 00bc070770..8da7f3ecfa 100644
--- a/toolkit/components/satchel/nsFormFillController.cpp
+++ b/toolkit/components/satchel/nsFormFillController.cpp
@@ -1347,10 +1347,6 @@ nsFormFillController::StopControllingInput()
     nsresult rv;
     nsCOMPtr <nsIFormAutoComplete> formAutoComplete =
       do_GetService("@mozilla.org/satchel/form-autocomplete;1", &rv);
-    if (formAutoComplete) {
-      // PATCH: Do NOT call StopControllingInput here, so autofill state is NOT cleared on blur/focus.
-      // formAutoComplete->StopControllingInput(mFocusedInput);
-    }
 
     mFocusedInputNode = nullptr;
     mFocusedInput = nullptr;