mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: remove CreateViewForWidget patch (#47084)

Browse source 
* refactor: remove CreateViewForWidget patch

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* chore: rm unintended osr change

Co-authored-by: deepak1556 <hop2deep@gmail.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
trop[bot] 2025-05-14 16:01:44 -05:00 • committed by GitHub
commit ec1b0f4923
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 20 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/osr/osr_render_widget_host_view.h
View file

@ -170,7 +170,7 @@ class OffScreenRenderWidgetHostView
content::RenderWidgetHostViewBase* CreateViewForWidget(
content::RenderWidgetHost*,
content::RenderWidgetHost*,
content::WebContentsView*) override;
content::WebContentsView*);
const viz::LocalSurfaceId& GetLocalSurfaceId() const override;
const viz::FrameSinkId& GetFrameSinkId() const override;

15
shell/browser/osr/osr_web_contents_view.cc
View file

@ -122,14 +122,19 @@ OffScreenWebContentsView::CreateViewForChildWidget(
auto* web_contents_impl =
static_cast<content::WebContentsImpl*>(web_contents_);
auto* view = static_cast<OffScreenRenderWidgetHostView*>(
web_contents_impl->GetOuterWebContents()
? web_contents_impl->GetOuterWebContents()->GetRenderWidgetHostView()
: web_contents_impl->GetRenderWidgetHostView());
OffScreenRenderWidgetHostView* embedder_host_view = nullptr;
if (web_contents_impl->GetOuterWebContents()) {
embedder_host_view = static_cast<OffScreenRenderWidgetHostView*>(
web_contents_impl->GetOuterWebContents()->GetRenderWidgetHostView());
} else {
embedder_host_view = static_cast<OffScreenRenderWidgetHostView*>(
web_contents_impl->GetRenderWidgetHostView());
}
return new OffScreenRenderWidgetHostView(
transparent_, offscreen_use_shared_texture_, painting_,
view->frame_rate(), callback_, render_widget_host, view, GetSize());
embedder_host_view->frame_rate(), callback_, render_widget_host,
embedder_host_view, GetSize());
}
void OffScreenWebContentsView::RenderViewReady() {

13
shell/browser/web_view_guest_delegate.cc
View file

@ -7,6 +7,7 @@
#include <memory>
#include "content/browser/web_contents/web_contents_impl.h" // nogncheck
#include "content/browser/web_contents/web_contents_view.h" // nogncheck
#include "content/public/browser/navigation_handle.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h"
@ -111,10 +112,14 @@ WebViewGuestDelegate::CreateNewGuestWindow(
auto* guest_contents_impl =
static_cast<content::WebContentsImpl*>(guest_contents.release());
auto* new_guest_view = guest_contents_impl->GetView();
content::RenderWidgetHostView* widget_view =
new_guest_view->CreateViewForWidget(
guest_contents_impl->GetRenderViewHost()->GetWidget());
if (!create_params.initially_hidden)
content::RenderWidgetHostView* widget_view = nullptr;
if (new_guest_view) {
widget_view = new_guest_view->CreateViewForWidget(
guest_contents_impl->GetRenderViewHost()->GetWidget());
}
if (widget_view && !create_params.initially_hidden)
widget_view->Show();
return base::WrapUnique(
static_cast<content::WebContentsImpl*>(guest_contents_impl));