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

Unified Diff: blimp/engine/app/ui/blimp_ui_context_factory.cc

Issue 1808313002: Register surface namespace in BlimpUiContextFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Back to patch #1 T_T Created 4 years, 9 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
« no previous file with comments | « blimp/engine/DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/engine/app/ui/blimp_ui_context_factory.cc
diff --git a/blimp/engine/app/ui/blimp_ui_context_factory.cc b/blimp/engine/app/ui/blimp_ui_context_factory.cc
index d41150a294d2abfa85a610a1a97effe1f4cbb362..24da2edf38a90aadc4bc1f7e0eb845d361990bcf 100644
--- a/blimp/engine/app/ui/blimp_ui_context_factory.cc
+++ b/blimp/engine/app/ui/blimp_ui_context_factory.cc
@@ -7,6 +7,7 @@
#include "cc/output/output_surface.h"
#include "cc/resources/shared_bitmap_manager.h"
#include "cc/surfaces/surface_id_allocator.h"
+#include "content/browser/compositor/image_transport_factory.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "ui/compositor/reflector.h"
@@ -70,8 +71,13 @@ cc::TaskGraphRunner* BlimpUiContextFactory::GetTaskGraphRunner() {
scoped_ptr<cc::SurfaceIdAllocator>
BlimpUiContextFactory::CreateSurfaceIdAllocator() {
- return make_scoped_ptr(
+ scoped_ptr<cc::SurfaceIdAllocator> allocator(
new cc::SurfaceIdAllocator(next_surface_id_namespace_++));
+ content::ImageTransportFactory* factory =
+ content::ImageTransportFactory::GetInstance();
+ if (factory->GetSurfaceManager())
+ allocator->RegisterSurfaceIdNamespace(factory->GetSurfaceManager());
+ return allocator;
}
void BlimpUiContextFactory::ResizeDisplay(ui::Compositor* compositor,
« no previous file with comments | « blimp/engine/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698