[iOS] - Get rid of Window Render Script (#26992)

brave · Dec 12, 2024 · bcf0fbd · bcf0fbd
1 parent c9a9edd
commit bcf0fbd
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 119 deletions.
diff --git a/ios/brave-ios/Package.swift b/ios/brave-ios/Package.swift
@@ -589,9 +589,6 @@ var braveTarget: PackageDescription.Target = .target(
     .copy(
       "Frontend/UserContent/UserScripts/Scripts_Dynamic/Scripts/Sandboxed/SiteStateListenerScript.js"
     ),
-    .copy(
-      "Frontend/UserContent/UserScripts/Scripts_Dynamic/Scripts/Sandboxed/WindowRenderScript.js"
-    ),
     .copy("WebFilters/ContentBlocker/Lists/block-ads.json"),
     .copy("WebFilters/ContentBlocker/Lists/block-cookies.json"),
     .copy("WebFilters/ContentBlocker/Lists/block-trackers.json"),

diff --git a/...rave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController.swift b/...rave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController.swift
@@ -438,11 +438,6 @@ public class BrowserViewController: UIViewController {
         #if canImport(BraveTalk)
         self.braveTalkJitsiCoordinator.resetPictureInPictureBounds(.init(size: size))
         #endif
-      },
-      completion: { _ in
-        if let tab = self.tabManager.selectedTab {
-          WindowRenderScriptHandler.executeScript(for: tab)
-        }
       }
     )
   }
@@ -736,11 +731,6 @@ public class BrowserViewController: UIViewController {
           self.bottomBarKeyboardBackground.backgroundColor = self.topToolbar.backgroundColor
           self.setNeedsStatusBarAppearanceUpdate()
         }
-      },
-      completion: { _ in
-        if let tab = self.tabManager.selectedTab {
-          WindowRenderScriptHandler.executeScript(for: tab)
-        }
       }
     )
   }
@@ -2624,7 +2614,6 @@ extension BrowserViewController: TabDelegate {
       BraveSearchScriptHandler(tab: tab, profile: profile, rewards: rewards),
       ResourceDownloadScriptHandler(tab: tab),
       DownloadContentScriptHandler(browserController: self, tab: tab),
-      WindowRenderScriptHandler(tab: tab),
       PlaylistScriptHandler(tab: tab),
       PlaylistFolderSharingScriptHandler(tab: tab),
       RewardsReportingScriptHandler(rewards: rewards, tab: tab),

diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/User Scripts/Debug/Preferences.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/User Scripts/Debug/Preferences.swift
@@ -62,12 +62,6 @@ extension Preferences {
         default: true
       )
 
-    public static let windowRender =
-      Option<Bool>(
-        key: "userscript.preferences.\(UserScriptManager.ScriptType.windowRenderHelper.rawValue)",
-        default: true
-      )
-
     public static let readyState =
       Option<Bool>(
         key: "userscript.preferences.\(UserScriptManager.ScriptType.readyStateHelper.rawValue)",

diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/User Scripts/Debug/UserScriptsDebugView.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/User Scripts/Debug/UserScriptsDebugView.swift
@@ -37,9 +37,6 @@ struct UserScriptsDebugView: View {
   @ObservedObject
   private var trackingProtectionStats = Preferences.UserScript.trackingProtectionStats
 
-  @ObservedObject
-  private var windowRender = Preferences.UserScript.windowRender
-
   @ObservedObject
   private var readyState = Preferences.UserScript.readyState
 
@@ -83,8 +80,6 @@ struct UserScriptsDebugView: View {
 
         Toggle("Tracking Protection Stats", isOn: $trackingProtectionStats.value)
 
-        Toggle("Window Render Helper", isOn: $windowRender.value)
-
         Toggle("Ready State", isOn: $readyState.value)
 
         Toggle("Ethereum Provider", isOn: $ethereumProvider.value)

diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/UserScriptManager.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/UserScriptManager.swift
@@ -30,10 +30,6 @@ class UserScriptManager {
       scripts.append(.playlist)
     }
 
-    if Preferences.UserScript.windowRender.value {
-      scripts.append(.windowRenderHelper)
-    }
-
     if Preferences.UserScript.readyState.value {
       scripts.append(.readyStateHelper)
     }
@@ -126,7 +122,6 @@ class UserScriptManager {
     case requestBlocking
     case trackerProtectionStats
     case resourceDownloader
-    case windowRenderHelper
     case readyStateHelper
     case ethereumProvider
     case solanaProvider
@@ -170,9 +165,6 @@ class UserScriptManager {
       case .playlist:
         return Preferences.UserScript.playlist.value ? PlaylistScriptHandler.userScript : nil
       case .resourceDownloader: return ResourceDownloadScriptHandler.userScript
-      case .windowRenderHelper:
-        return Preferences.UserScript.windowRender.value
-          ? WindowRenderScriptHandler.userScript : nil
       case .readyStateHelper:
         return Preferences.UserScript.readyState.value ? ReadyStateScriptHandler.userScript : nil
       case .youtubeQuality:

diff --git a/...tent/UserScripts/Scripts_Dynamic/ScriptHandlers/Sandboxed/WindowRenderScriptHandler.swift b/...tent/UserScripts/Scripts_Dynamic/ScriptHandlers/Sandboxed/WindowRenderScriptHandler.swift
diff --git a/.../Frontend/UserContent/UserScripts/Scripts_Dynamic/Scripts/Sandboxed/WindowRenderScript.js b/.../Frontend/UserContent/UserScripts/Scripts_Dynamic/Scripts/Sandboxed/WindowRenderScript.js