OLD | NEW |
---|---|
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 Loading... | |
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 Loading... | |
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() | |
121 ->OpenClientNativePixmapDevice() | |
122 .Pass()); | |
dcheng
2015/08/31 17:40:53
Pass() here should also be unnecessary.
dshwang
2015/08/31 18:12:29
Done.
| |
118 } | 123 } |
119 #endif | 124 #endif |
120 } | 125 } |
121 | 126 |
122 } // namespace content | 127 } // namespace content |
OLD | NEW |