bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

macOS: Fix crash when scrolling in OSR mode (issue #2540)

This commit is contained in:
Marshall Greenblatt 2018-11-06 17:27:26 -05:00
parent bb5fe57984
commit 285dbb1ce6
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
patch/patch.cfg
View File

@ -372,6 +372,11 @@ patches = [
# https://bitbucket.org/chromiumembedded/cef/issues/2539 # https://bitbucket.org/chromiumembedded/cef/issues/2539
'name': 'mac_event_observer_2539', 'name': 'mac_event_observer_2539',
}, },
{
# macOS: Fix crash when scrolling in OSR mode.
# https://bitbucket.org/chromiumembedded/cef/issues/2540
'name': 'mac_fling_scheduler_2540',
},
{ {
# Support rendering to a hardware GL/D3D texture/surface provided by the client # Support rendering to a hardware GL/D3D texture/surface provided by the client
# https://bitbucket.org/chromiumembedded/cef/issues/1006 # https://bitbucket.org/chromiumembedded/cef/issues/1006

15
patch/patches/mac_fling_scheduler_2540.patch Normal file
View File

@ -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 f10c5d161dd1..92a751dd984e 100644
--- content/browser/renderer_host/input/fling_scheduler_mac.mm
+++ content/browser/renderer_host/input/fling_scheduler_mac.mm
@@ -26,6 +26,10 @@
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())