80 lines
3.6 KiB
Diff
80 lines
3.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Anonymous <anonymous@electronjs.org>
|
|
Date: Thu, 20 Sep 2018 17:45:36 -0700
|
|
Subject: compositor_delegate.patch
|
|
|
|
|
|
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
|
|
index e8741caf69a8d3770905dcf1d466e7f01ddf69ba..b62009feb2e97362d90c6c917305f91cae27d790 100644
|
|
--- a/content/browser/compositor/gpu_process_transport_factory.cc
|
|
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
|
|
@@ -492,10 +492,20 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
|
|
// surfaces as they are not following the correct mode.
|
|
DisableGpuCompositing(compositor.get());
|
|
}
|
|
+
|
|
+ std::unique_ptr<viz::SoftwareOutputDevice> output_device;
|
|
+ if (compositor->delegate()) {
|
|
+ output_device = compositor->delegate()->CreateSoftwareOutputDevice(
|
|
+ compositor.get());
|
|
+ }
|
|
+ if (!output_device) {
|
|
+ output_device = CreateSoftwareOutputDevice(compositor->widget(),
|
|
+ compositor->task_runner());
|
|
+ }
|
|
+
|
|
display_output_surface =
|
|
std::make_unique<SoftwareBrowserCompositorOutputSurface>(
|
|
- CreateSoftwareOutputDevice(compositor->widget(),
|
|
- compositor->task_runner()),
|
|
+ std::move(output_device),
|
|
std::move(vsync_callback));
|
|
} else {
|
|
DCHECK(context_provider);
|
|
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
|
|
index b3905bdfa6500f02328552b7c2402797a71758be..490722c20c25f752e37ac3b481f8d2aa616408a4 100644
|
|
--- a/ui/compositor/compositor.h
|
|
+++ b/ui/compositor/compositor.h
|
|
@@ -26,6 +26,7 @@
|
|
#include "components/viz/common/surfaces/frame_sink_id.h"
|
|
#include "components/viz/common/surfaces/local_surface_id.h"
|
|
#include "components/viz/host/host_frame_sink_client.h"
|
|
+#include "components/viz/service/display/software_output_device.h"
|
|
#include "third_party/skia/include/core/SkColor.h"
|
|
#include "third_party/skia/include/core/SkMatrix44.h"
|
|
#include "ui/compositor/compositor_animation_observer.h"
|
|
@@ -198,6 +199,15 @@ class COMPOSITOR_EXPORT ContextFactory {
|
|
virtual bool SyncTokensRequiredForDisplayCompositor() = 0;
|
|
};
|
|
|
|
+class COMPOSITOR_EXPORT CompositorDelegate {
|
|
+ public:
|
|
+ virtual std::unique_ptr<viz::SoftwareOutputDevice> CreateSoftwareOutputDevice(
|
|
+ ui::Compositor* compositor) = 0;
|
|
+
|
|
+ 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
|
|
@@ -237,6 +247,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
|
|
@@ -448,6 +461,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;
|
|
|