mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-02 12:17:15 +01:00
68 lines
2.9 KiB
Diff
68 lines
2.9 KiB
Diff
diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc
|
|
index 8313f13f3355..9ee1056eb825 100644
|
|
--- content/browser/compositor/gpu_process_transport_factory.cc
|
|
+++ content/browser/compositor/gpu_process_transport_factory.cc
|
|
@@ -274,6 +274,13 @@ GpuProcessTransportFactory::~GpuProcessTransportFactory() {
|
|
std::unique_ptr<cc::SoftwareOutputDevice>
|
|
GpuProcessTransportFactory::CreateSoftwareOutputDevice(
|
|
ui::Compositor* compositor) {
|
|
+ if (compositor->delegate()) {
|
|
+ std::unique_ptr<cc::SoftwareOutputDevice> output_device =
|
|
+ compositor->delegate()->CreateSoftwareOutputDevice(compositor);
|
|
+ if (output_device)
|
|
+ return output_device;
|
|
+ }
|
|
+
|
|
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
|
if (command_line->HasSwitch(switches::kHeadless))
|
|
return base::WrapUnique(new cc::SoftwareOutputDevice);
|
|
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
|
|
index a3bc8cafc574..745f1dacb26e 100644
|
|
--- ui/compositor/compositor.h
|
|
+++ ui/compositor/compositor.h
|
|
@@ -17,6 +17,7 @@
|
|
#include "base/single_thread_task_runner.h"
|
|
#include "base/time/time.h"
|
|
#include "build/build_config.h"
|
|
+#include "cc/output/software_output_device.h"
|
|
#include "cc/trees/layer_tree_host_client.h"
|
|
#include "cc/trees/layer_tree_host_single_thread_client.h"
|
|
#include "components/viz/common/frame_sinks/begin_frame_args.h"
|
|
@@ -179,6 +180,17 @@ class COMPOSITOR_EXPORT ContextFactory {
|
|
virtual void RemoveObserver(ContextFactoryObserver* observer) = 0;
|
|
};
|
|
|
|
+class COMPOSITOR_EXPORT CompositorDelegate {
|
|
+ public:
|
|
+ virtual std::unique_ptr<cc::SoftwareOutputDevice> CreateSoftwareOutputDevice(
|
|
+ ui::Compositor* compositor) {
|
|
+ return nullptr;
|
|
+ }
|
|
+
|
|
+ protected:
|
|
+ virtual ~CompositorDelegate() {}
|
|
+};
|
|
+
|
|
// Compositor object to take care of GPU painting.
|
|
// A Browser compositor object is responsible for generating the final
|
|
// displayable form of pixels comprising a single widget's contents. It draws an
|
|
@@ -215,6 +227,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
|
|
// Schedules a redraw of the layer tree associated with this compositor.
|
|
void ScheduleDraw();
|
|
|
|
+ CompositorDelegate* delegate() const { return delegate_; }
|
|
+ void SetDelegate(CompositorDelegate* delegate) { delegate_ = delegate; }
|
|
+
|
|
// Sets the root of the layer tree drawn by this Compositor. The root layer
|
|
// must have no parent. The compositor's root layer is reset if the root layer
|
|
// is destroyed. NULL can be passed to reset the root layer, in which case the
|
|
@@ -431,6 +446,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
|
|
ui::ContextFactory* context_factory_;
|
|
ui::ContextFactoryPrivate* context_factory_private_;
|
|
|
|
+ CompositorDelegate* delegate_ = nullptr;
|
|
+
|
|
// The root of the Layer tree drawn by this compositor.
|
|
Layer* root_layer_ = nullptr;
|
|
|