diff options
author | Inna Palant <ipalant@google.com> | 2023-12-12 19:56:22 -0800 |
---|---|---|
committer | Inna Palant <ipalant@google.com> | 2023-12-12 19:56:22 -0800 |
commit | 1ee1f36e3b492d7a6a0bf2367fe509365853aeaa (patch) | |
tree | a5790e155ff0d998639beb6172dfa0feb294aac9 /patch/patches/mac_fling_scheduler_2540.patch | |
parent | 1e76199e6f0ded437fca14eb9e512e0c6bd0fc1e (diff) | |
parent | c33b736614ef77e4048cee551999a656a5ef465f (diff) | |
download | cef-main.tar.gz |
Merge remote-tracking branch 'origin/upstream'main
Import b/312293934
Diffstat (limited to 'patch/patches/mac_fling_scheduler_2540.patch')
-rw-r--r-- | patch/patches/mac_fling_scheduler_2540.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/patch/patches/mac_fling_scheduler_2540.patch b/patch/patches/mac_fling_scheduler_2540.patch new file mode 100644 index 00000000..fa98a94b --- /dev/null +++ b/patch/patches/mac_fling_scheduler_2540.patch @@ -0,0 +1,15 @@ +diff --git content/browser/renderer_host/input/fling_scheduler_mac.mm content/browser/renderer_host/input/fling_scheduler_mac.mm +index 50ed39df38044..7839bdaf7b7e5 100644 +--- content/browser/renderer_host/input/fling_scheduler_mac.mm ++++ content/browser/renderer_host/input/fling_scheduler_mac.mm +@@ -26,6 +26,10 @@ ui::Compositor* FlingSchedulerMac::GetCompositor() { + return nullptr; + } + ++ // For CEF this will always be false when running in OSR mode. ++ if (!view->GetNativeView()) ++ return nullptr; ++ + RenderWidgetHostViewMac* mac_view = + static_cast<RenderWidgetHostViewMac*>(view); + if (mac_view->BrowserCompositor()) |