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

fix: build failure when printing is disabled (#46284)

Browse source 
fix: ftbfs when printing is disabled

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
trop[bot] 2025-03-26 12:48:49 +01:00 • committed by GitHub
parent 3e2aa2f443
commit 32c352bff5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/api/electron_api_web_contents.cc
View file

@ -1988,6 +1988,7 @@ void WebContents::DraggableRegionsChanged(
draggable_region_ = DraggableRegionsToSkRegion(regions);
}
#if BUILDFLAG(ENABLE_PRINTING)
void WebContents::PrintCrossProcessSubframe(
content::WebContents* web_contents,
const gfx::Rect& rect,
@ -1998,6 +1999,7 @@ void WebContents::PrintCrossProcessSubframe(
client->PrintCrossProcessSubframe(rect, document_cookie, subframe_host);
}
}
#endif
SkRegion* WebContents::draggable_region() {
return g_disable_draggable_regions ? nullptr : draggable_region_.get();

2
shell/browser/api/electron_api_web_contents.h
View file

@ -585,11 +585,13 @@ class WebContents final : public ExclusiveAccessContext,
void DraggableRegionsChanged(
const std::vector<blink::mojom::DraggableRegionPtr>& regions,
content::WebContents* contents) override;
#if BUILDFLAG(ENABLE_PRINTING)
void PrintCrossProcessSubframe(
content::WebContents* web_contents,
const gfx::Rect& rect,
int document_cookie,
content::RenderFrameHost* subframe_host) const override;
#endif
// content::WebContentsObserver:
void BeforeUnloadFired(bool proceed) override;

3
shell/browser/feature_list.cc
View file

@ -16,6 +16,7 @@
#include "electron/buildflags/buildflags.h"
#include "media/base/media_switches.h"
#include "net/base/features.h"
#include "printing/buildflags/buildflags.h"
#include "services/network/public/cpp/features.h"
#include "third_party/blink/public/common/features.h"
@ -60,7 +61,7 @@ void InitializeFeatureList() {
std::string(",") + features::kMacWebContentsOcclusion.name;
#endif
#if BUILDFLAG(IS_LINUX)
#if BUILDFLAG(IS_LINUX) && BUILDFLAG(ENABLE_PRINTING)
disable_features +=
// EnableOopPrintDrivers is still a bit half-baked on Linux and
// causes crashes when trying to show dialogs.