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

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: remove redundant Pass() Created 5 years, 3 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
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 19 matching lines...) Expand all
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/client_native_pixmap_factory.h" 39 #include "ui/ozone/public/client_native_pixmap_factory.h"
40 #include "ui/ozone/public/ozone_platform.h"
40 #endif 41 #endif
41 42
42 namespace content { 43 namespace content {
43 namespace { 44 namespace {
44 45
45 class TestInitializationListener : public testing::EmptyTestEventListener { 46 class TestInitializationListener : public testing::EmptyTestEventListener {
46 public: 47 public:
47 TestInitializationListener() : test_content_client_initializer_(NULL) { 48 TestInitializationListener() : test_content_client_initializer_(NULL) {
48 } 49 }
49 50
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 InProcessSurfaceTextureManager::GetInstance()); 109 InProcessSurfaceTextureManager::GetInstance());
109 #endif 110 #endif
110 #if defined(OS_MACOSX) && !defined(OS_IOS) 111 #if defined(OS_MACOSX) && !defined(OS_IOS)
111 IOSurfaceManager::SetInstance(InProcessIOSurfaceManager::GetInstance()); 112 IOSurfaceManager::SetInstance(InProcessIOSurfaceManager::GetInstance());
112 #endif 113 #endif
113 #if defined(USE_OZONE) 114 #if defined(USE_OZONE)
114 if (!is_child_process) { 115 if (!is_child_process) {
115 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create(); 116 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create();
116 ui::ClientNativePixmapFactory::SetInstance( 117 ui::ClientNativePixmapFactory::SetInstance(
117 client_native_pixmap_factory_.get()); 118 client_native_pixmap_factory_.get());
119 ui::ClientNativePixmapFactory::GetInstance()->Initialize(
120 ui::OzonePlatform::GetInstance()->OpenClientNativePixmapDevice());
118 } 121 }
119 #endif 122 #endif
120 } 123 }
121 124
122 } // namespace content 125 } // namespace content
OLDNEW
« no previous file with comments | « content/common/child_process_messages.h ('k') | ui/ozone/common/stub_client_native_pixmap_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698