bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

osr: Avoid crash in WebContentsImpl::GetSize/Resize

Browse Source
This commit is contained in:
Marshall Greenblatt
2025-04-07 17:11:48 -04:00
parent c0df792f3b
commit 06288b535e
2 changed files with 63 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patch/patch.cfg
View File

@@ -136,6 +136,8 @@ patches = [
# #
# Add WebContentsObserver::RenderWidgetCreated. # Add WebContentsObserver::RenderWidgetCreated.
# https://github.com/chromiumembedded/cef/issues/3308 # https://github.com/chromiumembedded/cef/issues/3308
#
# osr: Avoid crash in WebContentsImpl::GetSize/Resize.
'name': 'web_contents_1257_1565', 'name': 'web_contents_1257_1565',
}, },
{ {

62
patch/patches/web_contents_1257_1565.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index f80d8ecc385df..e8c41051b0fa4 100644 index f80d8ecc385df..b879741c441af 100644
--- content/browser/web_contents/web_contents_impl.cc --- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc
@@ -3916,6 +3916,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -3916,6 +3916,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -59,6 +59,66 @@ index f80d8ecc385df..e8c41051b0fa4 100644
} }
FrameTree* WebContentsImpl::GetOwnedPictureInPictureFrameTree() { FrameTree* WebContentsImpl::GetOwnedPictureInPictureFrameTree() {
@@ -10411,6 +10433,11 @@ void WebContentsImpl::Resize(const gfx::Rect& new_bounds) {
OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::Resize");
#if defined(USE_AURA)
aura::Window* window = GetNativeView();
+ if (!window) {
+ // Will be nullptr with CEF OSR.
+ NOTIMPLEMENTED();
+ return;
+ }
window->SetBounds(gfx::Rect(window->bounds().origin(), new_bounds.size()));
#elif BUILDFLAG(IS_ANDROID)
content::RenderWidgetHostView* view = GetRenderWidgetHostView();
@@ -10423,6 +10450,11 @@ void WebContentsImpl::Resize(const gfx::Rect& new_bounds) {
gfx::Size WebContentsImpl::GetSize() {
#if defined(USE_AURA)
aura::Window* window = GetNativeView();
+ if (!window) {
+ // Will be nullptr with CEF OSR.
+ NOTIMPLEMENTED();
+ return gfx::Size();
+ }
return window->bounds().size();
#elif BUILDFLAG(IS_ANDROID)
ui::ViewAndroid* view_android = GetNativeView();
diff --git content/browser/web_contents/web_contents_impl_mac.mm content/browser/web_contents/web_contents_impl_mac.mm
index f1105a13aa0eb..d1dba26bbac1f 100644
--- content/browser/web_contents/web_contents_impl_mac.mm
+++ content/browser/web_contents/web_contents_impl_mac.mm
@@ -6,6 +6,7 @@
#import <Cocoa/Cocoa.h>
+#include "base/notimplemented.h"
#include "content/public/browser/web_contents.h"
#include "ui/gfx/geometry/size.h"
@@ -13,6 +14,11 @@ namespace content {
void WebContentsImpl::Resize(const gfx::Rect& new_bounds) {
NSView* view = GetNativeView().GetNativeNSView();
+ if (!view) {
+ // Will be nullptr with CEF OSR.
+ NOTIMPLEMENTED();
+ return;
+ }
NSRect old_wcv_frame = view.frame;
CGFloat new_x = old_wcv_frame.origin.x;
CGFloat new_y = old_wcv_frame.origin.y +
@@ -24,6 +30,11 @@ void WebContentsImpl::Resize(const gfx::Rect& new_bounds) {
gfx::Size WebContentsImpl::GetSize() {
NSView* view = GetNativeView().GetNativeNSView();
+ if (!view) {
+ // Will be nullptr with CEF OSR.
+ NOTIMPLEMENTED();
+ return gfx::Size();
+ }
NSRect frame = view.frame;
return gfx::Size(NSWidth(frame), NSHeight(frame));
}
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
index 4cf7eef3b54bb..620bfe54841d2 100644 index 4cf7eef3b54bb..620bfe54841d2 100644
--- content/public/browser/web_contents.h --- content/public/browser/web_contents.h