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

Unified Diff: mojo/aura/surface_context_factory.cc

Issue 669813003: Update from chromium https://crrev.com/301725/ (Closed) Base URL: git@github.com:domokit/mojo.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
« no previous file with comments | « mojo/aura/surface_context_factory.h ('k') | mojo/tools/roll/cc_strip_video.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/aura/surface_context_factory.cc
diff --git a/mojo/aura/surface_context_factory.cc b/mojo/aura/surface_context_factory.cc
index aa964012ecd1a011e07313f53da5124d50c4da0f..eb7391dc68a1fa718bdb079b09ff4c5b9e83d67d 100644
--- a/mojo/aura/surface_context_factory.cc
+++ b/mojo/aura/surface_context_factory.cc
@@ -52,7 +52,8 @@ cc::SharedBitmapManager* SurfaceContextFactory::GetSharedBitmapManager() {
return nullptr;
}
-cc::GpuMemoryBufferManager* SurfaceContextFactory::GetGpuMemoryBufferManager() {
+gpu::GpuMemoryBufferManager*
+SurfaceContextFactory::GetGpuMemoryBufferManager() {
return nullptr;
}
« no previous file with comments | « mojo/aura/surface_context_factory.h ('k') | mojo/tools/roll/cc_strip_video.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698