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

Unified Diff: content/common/mac/io_surface_manager.cc

Issue 1137453002: content: Pass IOSurface references using Mach IPC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, remove extra DCHECKs and fix reply port typo Created 5 years, 7 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/common/mac/io_surface_manager.cc
diff --git a/content/common/android/surface_texture_manager.cc b/content/common/mac/io_surface_manager.cc
similarity index 52%
copy from content/common/android/surface_texture_manager.cc
copy to content/common/mac/io_surface_manager.cc
index 8062964e0575285c18541caa62e4c58d55a8113a..afa2bf60b886526f1da8b3659d1adecc99a55d0d 100644
--- a/content/common/android/surface_texture_manager.cc
+++ b/content/common/mac/io_surface_manager.cc
@@ -1,26 +1,26 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/common/android/surface_texture_manager.h"
+#include "content/common/mac/io_surface_manager.h"
#include "base/logging.h"
namespace content {
namespace {
-SurfaceTextureManager* g_instance = NULL;
+IOSurfaceManager* g_instance = NULL;
} // namespace
// static
-SurfaceTextureManager* SurfaceTextureManager::GetInstance() {
+IOSurfaceManager* IOSurfaceManager::GetInstance() {
DCHECK(g_instance);
return g_instance;
}
// static
-void SurfaceTextureManager::InitInstance(SurfaceTextureManager* instance) {
+void IOSurfaceManager::SetInstance(IOSurfaceManager* instance) {
DCHECK(!g_instance || !instance);
g_instance = instance;
}

Powered by Google App Engine
This is Rietveld 408576698