Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1159)

Unified Diff: content/browser/compositor/test/no_transport_image_transport_factory.cc

Issue 888783002: Composite to cc::Display from ui::InProcessContextFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/compositor/test/no_transport_image_transport_factory.cc
diff --git a/content/browser/compositor/test/no_transport_image_transport_factory.cc b/content/browser/compositor/test/no_transport_image_transport_factory.cc
index e8a859a26adcfbddd9d700688cea0d0a3bc5fab4..baebdef03939ba52c7d6054357042f2c436c5a96 100644
--- a/content/browser/compositor/test/no_transport_image_transport_factory.cc
+++ b/content/browser/compositor/test/no_transport_image_transport_factory.cc
@@ -6,6 +6,7 @@
#include "cc/output/context_provider.h"
#include "cc/surfaces/surface_manager.h"
+#include "content/browser/gpu/compositor_util.h"
#include "content/common/gpu/client/gl_helper.h"
#include "gpu/command_buffer/client/gles2_interface.h"
#include "ui/compositor/compositor.h"
@@ -14,10 +15,11 @@
namespace content {
NoTransportImageTransportFactory::NoTransportImageTransportFactory()
- // The context factory created here is for unit tests, thus passing in true
- // in constructor.
- : context_factory_(new ui::InProcessContextFactory(true)),
- surface_manager_(new cc::SurfaceManager) {
+ : surface_manager_(UseSurfacesEnabled() ? new cc::SurfaceManager : nullptr),
+ // The context factory created here is for unit tests, thus passing in
+ // true in constructor.
+ context_factory_(
+ new ui::InProcessContextFactory(true, surface_manager_.get())) {
}
NoTransportImageTransportFactory::~NoTransportImageTransportFactory() {

Powered by Google App Engine
This is Rietveld 408576698