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

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

Issue 553213003: Avoid destroying surface before the parent surface stops referencing it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 524223f819186d8a69cd73e724d826b6734a14e2..808d297f6db20029748596afac0501ae40e03500 100644
--- a/content/browser/compositor/test/no_transport_image_transport_factory.cc
+++ b/content/browser/compositor/test/no_transport_image_transport_factory.cc
@@ -5,6 +5,7 @@
#include "content/browser/compositor/test/no_transport_image_transport_factory.h"
#include "cc/output/context_provider.h"
+#include "cc/surfaces/surface_manager.h"
#include "content/common/gpu/client/gl_helper.h"
#include "gpu/command_buffer/client/gles2_interface.h"
#include "ui/compositor/compositor.h"
@@ -13,7 +14,8 @@
namespace content {
NoTransportImageTransportFactory::NoTransportImageTransportFactory()
- : context_factory_(new ui::InProcessContextFactory) {
+ : context_factory_(new ui::InProcessContextFactory),
+ surface_manager_(new cc::SurfaceManager) {
}
NoTransportImageTransportFactory::~NoTransportImageTransportFactory() {
@@ -31,13 +33,8 @@ NoTransportImageTransportFactory::GetSharedSurfaceHandle() {
return gfx::GLSurfaceHandle();
}
-scoped_ptr<cc::SurfaceIdAllocator>
-NoTransportImageTransportFactory::CreateSurfaceIdAllocator() {
- return scoped_ptr<cc::SurfaceIdAllocator>();
-}
-
cc::SurfaceManager* NoTransportImageTransportFactory::GetSurfaceManager() {
- return NULL;
+ return surface_manager_.get();
}
GLHelper* NoTransportImageTransportFactory::GetGLHelper() {
« no previous file with comments | « content/browser/compositor/test/no_transport_image_transport_factory.h ('k') | content/common/cc_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698