early-access version 1915

src/yuzu/applets/qt_web_browser.cpp

@@ -112,7 +112,6 @@ void QtNXWebEngineView::LoadLocalWebPage(const std::string& main_url,
     SetExitReason(Service::AM::Applets::WebExitReason::EndButtonPressed);
     SetLastURL("http://localhost/");
     StartInputThread();
-    FocusFirstLinkElement();
 
     load(QUrl(QUrl::fromLocalFile(QString::fromStdString(main_url)).toString() +
               QString::fromStdString(additional_args)));
@@ -129,8 +128,6 @@ void QtNXWebEngineView::LoadExternalWebPage(const std::string& main_url,
     StartInputThread();
 
     load(QUrl(QString::fromStdString(main_url) + QString::fromStdString(additional_args)));
-
-    FocusFirstLinkElement();
 }
 
 void QtNXWebEngineView::SetUserAgent(UserAgent user_agent) {
@@ -211,7 +208,7 @@ void QtNXWebEngineView::HandleWindowFooterButtonPressedOnce() {
         if (input_interpreter->IsButtonPressedOnce(button)) {
             page()->runJavaScript(
                 QStringLiteral("yuzu_key_callbacks[%1] == null;").arg(static_cast<u8>(button)),
-                [this, button](const QVariant& variant) {
+                [&](const QVariant& variant) {
                     if (variant.toBool()) {
                         switch (button) {
                         case HIDButton::A:
@@ -367,17 +364,6 @@ void QtNXWebEngineView::LoadExtractedFonts() {
         Qt::QueuedConnection);
 }
 
-void QtNXWebEngineView::FocusFirstLinkElement() {
-    QWebEngineScript focus_link_element;
-
-    focus_link_element.setName(QStringLiteral("focus_link_element.js"));
-    focus_link_element.setSourceCode(QString::fromStdString(FOCUS_LINK_ELEMENT_SCRIPT));
-    focus_link_element.setWorldId(QWebEngineScript::MainWorld);
-    focus_link_element.setInjectionPoint(QWebEngineScript::Deferred);
-    focus_link_element.setRunsOnSubFrames(true);
-    default_profile->scripts()->insert(focus_link_element);
-}
-
 #endif
 
 QtWebBrowser::QtWebBrowser(GMainWindow& main_window) {

src/yuzu/applets/qt_web_browser.h

@@ -161,9 +161,6 @@ private:
     /// Loads the extracted fonts using JavaScript.
     void LoadExtractedFonts();
 
-    /// Brings focus to the first available link element.
-    void FocusFirstLinkElement();
-
     InputCommon::InputSubsystem* input_subsystem;
 
     std::unique_ptr<UrlRequestInterceptor> url_interceptor;

src/yuzu/applets/qt_web_browser_scripts.h

@@ -73,12 +73,6 @@ constexpr char LOAD_NX_FONT[] = R"(
 })();
 )";
 
-constexpr char FOCUS_LINK_ELEMENT_SCRIPT[] = R"(
-if (document.getElementsByTagName("a").length > 0) {
-    document.getElementsByTagName("a")[0].focus();
-}
-)";
-
 constexpr char GAMEPAD_SCRIPT[] = R"(
 window.addEventListener("gamepadconnected", function(e) {
     console.log("Gamepad connected at index %d: %s. %d buttons, %d axes.",