2015-01-01 17:51:56 +01:00
|
|
|
diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc
|
2016-08-31 13:25:56 +02:00
|
|
|
index 9af7049..87f1b01 100644
|
2015-01-01 17:51:56 +01:00
|
|
|
--- content/browser/compositor/gpu_process_transport_factory.cc
|
|
|
|
+++ content/browser/compositor/gpu_process_transport_factory.cc
|
2016-08-31 13:25:56 +02:00
|
|
|
@@ -199,6 +199,13 @@ GpuProcessTransportFactory::~GpuProcessTransportFactory() {
|
2016-05-25 01:35:43 +02:00
|
|
|
std::unique_ptr<cc::SoftwareOutputDevice>
|
2015-06-06 00:06:48 +02:00
|
|
|
GpuProcessTransportFactory::CreateSoftwareOutputDevice(
|
2015-01-01 17:51:56 +01:00
|
|
|
ui::Compositor* compositor) {
|
|
|
|
+ if (compositor->delegate()) {
|
2016-05-25 01:35:43 +02:00
|
|
|
+ std::unique_ptr<cc::SoftwareOutputDevice> output_device =
|
2015-01-01 17:51:56 +01:00
|
|
|
+ compositor->delegate()->CreateSoftwareOutputDevice(compositor);
|
2016-05-25 01:35:43 +02:00
|
|
|
+ if (output_device)
|
2015-01-01 17:51:56 +01:00
|
|
|
+ return output_device;
|
|
|
|
+ }
|
|
|
|
+
|
2016-08-31 13:25:56 +02:00
|
|
|
#if defined(USE_AURA)
|
2016-06-21 00:59:23 +02:00
|
|
|
if (shell::ShellIsRemote()) {
|
2016-08-31 13:25:56 +02:00
|
|
|
NOTREACHED();
|
2015-01-01 17:51:56 +01:00
|
|
|
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
|
2016-08-31 13:25:56 +02:00
|
|
|
index b73eb86..81957b2 100644
|
2015-01-01 17:51:56 +01:00
|
|
|
--- ui/compositor/compositor.h
|
|
|
|
+++ ui/compositor/compositor.h
|
2016-08-31 13:25:56 +02:00
|
|
|
@@ -18,6 +18,7 @@
|
2015-01-01 17:51:56 +01:00
|
|
|
#include "base/time/time.h"
|
2016-08-31 13:25:56 +02:00
|
|
|
#include "build/build_config.h"
|
2015-04-20 13:11:11 +02:00
|
|
|
#include "cc/output/begin_frame_args.h"
|
2015-01-01 17:51:56 +01:00
|
|
|
+#include "cc/output/software_output_device.h"
|
|
|
|
#include "cc/surfaces/surface_sequence.h"
|
|
|
|
#include "cc/trees/layer_tree_host_client.h"
|
|
|
|
#include "cc/trees/layer_tree_host_single_thread_client.h"
|
2016-08-31 13:25:56 +02:00
|
|
|
@@ -194,6 +195,17 @@ class COMPOSITOR_EXPORT CompositorLock
|
2016-05-25 01:35:43 +02:00
|
|
|
DISALLOW_COPY_AND_ASSIGN(CompositorLock);
|
2015-01-01 17:51:56 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
+class COMPOSITOR_EXPORT CompositorDelegate {
|
|
|
|
+ public:
|
2016-05-25 01:35:43 +02:00
|
|
|
+ virtual std::unique_ptr<cc::SoftwareOutputDevice> CreateSoftwareOutputDevice(
|
2015-01-01 17:51:56 +01:00
|
|
|
+ ui::Compositor* compositor) {
|
2016-05-25 01:35:43 +02:00
|
|
|
+ return nullptr;
|
2015-01-01 17:51:56 +01:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ 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
|
2016-08-31 13:25:56 +02:00
|
|
|
@@ -220,6 +232,9 @@ class COMPOSITOR_EXPORT Compositor
|
2015-01-01 17:51:56 +01:00
|
|
|
// 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
|
2016-08-31 13:25:56 +02:00
|
|
|
@@ -403,6 +418,8 @@ class COMPOSITOR_EXPORT Compositor
|
2015-01-01 17:51:56 +01:00
|
|
|
|
|
|
|
ui::ContextFactory* context_factory_;
|
|
|
|
|
|
|
|
+ CompositorDelegate* delegate_ = nullptr;
|
|
|
|
+
|
|
|
|
// The root of the Layer tree drawn by this compositor.
|
|
|
|
Layer* root_layer_;
|
|
|
|
|