mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
fix: build failure when printing is disabled (#46285)
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:
@@ -2079,6 +2079,7 @@ void WebContents::DraggableRegionsChanged(
|
||||
draggable_region_ = DraggableRegionsToSkRegion(regions);
|
||||
}
|
||||
|
||||
#if BUILDFLAG(ENABLE_PRINTING)
|
||||
void WebContents::PrintCrossProcessSubframe(
|
||||
content::WebContents* web_contents,
|
||||
const gfx::Rect& rect,
|
||||
@@ -2089,6 +2090,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();
|
||||
|
||||
@@ -630,11 +630,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;
|
||||
|
||||
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user