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

Side by Side Diff: content/test/content_test_suite.cc

Issue 1248713002: ozone: ClientPixmapManager passes VGEM fd from browser to renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase to lastest crrev.com/1128113011 Created 5 years, 5 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 unified diff | Download patch
« no previous file with comments | « content/test/BUILD.gn ('k') | content/test/test_native_pixmap_manager_ozone.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/test/content_test_suite.h" 5 #include "content/test/content_test_suite.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "content/public/common/content_client.h" 9 #include "content/public/common/content_client.h"
10 #include "content/public/common/content_paths.h" 10 #include "content/public/common/content_paths.h"
(...skipping 18 matching lines...) Expand all
29 #include "base/command_line.h" 29 #include "base/command_line.h"
30 #include "media/base/media.h" 30 #include "media/base/media.h"
31 #include "ui/gl/test/gl_surface_test_support.h" 31 #include "ui/gl/test/gl_surface_test_support.h"
32 #endif 32 #endif
33 33
34 #if defined(OS_ANDROID) 34 #if defined(OS_ANDROID)
35 #include "content/browser/android/in_process_surface_texture_manager.h" 35 #include "content/browser/android/in_process_surface_texture_manager.h"
36 #endif 36 #endif
37 37
38 #if defined(USE_OZONE) 38 #if defined(USE_OZONE)
39 #include "ui/ozone/public/native_pixmap_manager.h" 39 #include "content/test/test_native_pixmap_manager_ozone.h"
40 #endif 40 #endif
41 41
42 namespace content { 42 namespace content {
43 namespace { 43 namespace {
44 44
45 class TestInitializationListener : public testing::EmptyTestEventListener { 45 class TestInitializationListener : public testing::EmptyTestEventListener {
46 public: 46 public:
47 TestInitializationListener() : test_content_client_initializer_(NULL) { 47 TestInitializationListener() : test_content_client_initializer_(NULL) {
48 } 48 }
49 49
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 #if defined(OS_ANDROID) 106 #if defined(OS_ANDROID)
107 SurfaceTextureManager::SetInstance( 107 SurfaceTextureManager::SetInstance(
108 InProcessSurfaceTextureManager::GetInstance()); 108 InProcessSurfaceTextureManager::GetInstance());
109 #endif 109 #endif
110 #if defined(OS_MACOSX) && !defined(OS_IOS) 110 #if defined(OS_MACOSX) && !defined(OS_IOS)
111 IOSurfaceManager::SetInstance(InProcessIOSurfaceManager::GetInstance()); 111 IOSurfaceManager::SetInstance(InProcessIOSurfaceManager::GetInstance());
112 #endif 112 #endif
113 #if defined(USE_OZONE) 113 #if defined(USE_OZONE)
114 if (!is_child_process) { 114 if (!is_child_process) {
115 DCHECK(!ui::NativePixmapManager::GetInstance()); 115 DCHECK(!ui::NativePixmapManager::GetInstance());
116 ui::NativePixmapManager::SetInstance(ui::NativePixmapManager::Create()); 116 ui::NativePixmapManager::SetInstance(
117 TestNativePixmapManager::GetInstance());
117 } 118 }
118 #endif 119 #endif
119 } 120 }
120 121
121 } // namespace content 122 } // namespace content
OLDNEW
« no previous file with comments | « content/test/BUILD.gn ('k') | content/test/test_native_pixmap_manager_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698