                ui::TEXT_INPUT_TYPE_NONE &&
            [event type] == NSKeyDown &&
 diff --git a/content/browser/renderer_host/render_widget_targeter.cc b/content/browser/renderer_host/render_widget_targeter.cc
-index 2282465f5cc8271a2098bb88cf4de56955972f21..87621775f2c587b45adcb5ec20c2a02c6d82dce0 100644
+index 2282465f5cc8271a2098bb88cf4de56955972f21..43d3be844fa75c4212b7a76886e9b81873f86410 100644
 --- a/content/browser/renderer_host/render_widget_targeter.cc
 +++ b/content/browser/renderer_host/render_widget_targeter.cc
 @@ -5,6 +5,7 @@

           "blink::mojom::EngagementClient",
           "blink::mojom::InstallationService",
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index 973f835727b6d0050669a1bea76c84f53be85340..1894f1342a44906d7a9496efa1e466132ab4ee35 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -144,7 +144,7 @@ void BrowserPlugin::OnSetChildFrameSurface(
   if (!attached() || base::FeatureList::IsEnabled(features::kMash))
     return;
 
-  if (!enable_surface_synchronization_) {
+  if (true) {
     compositing_helper_->SetPrimarySurfaceId(surface_info.id(),
                                              frame_rect().size());
   }
@@ -214,7 +214,11 @@ void BrowserPlugin::Detach() {
 
   attached_ = false;
   guest_crashed_ = false;

 #include "content/browser/renderer_host/input/one_shot_timeout_monitor.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
@@ -161,6 +162,9 @@ void RenderWidgetTargeter::FindTargetAndDispatch(
   } else {
     FoundTarget(root_view, target, *event_ptr, latency, result.target_location);
   }
