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

Unified Diff: content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc

Issue 1389133002: content: Use type-parameterized tests for GpuMemoryBuffer implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add blankline Created 5 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
Index: content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc
diff --git a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc
index 0aea4b6b33e4c1238291f5520289cfeaa6486384..952e6c507ff354eabc9ed30de3be3a6d7bd05450 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc
+++ b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc
@@ -11,25 +11,6 @@
#include "ui/ozone/public/surface_factory_ozone.h"
namespace content {
-namespace {
-
-void GetSupportedConfigurations(
- std::vector<GpuMemoryBufferFactory::Configuration>* configurations) {
- if (!ui::ClientNativePixmapFactory::GetInstance()) {
- // unittests don't have to set ClientNativePixmapFactory.
- return;
- }
- std::vector<ui::ClientNativePixmapFactory::Configuration>
- native_pixmap_configurations =
- ui::ClientNativePixmapFactory::GetInstance()
- ->GetSupportedConfigurations();
- for (auto& native_pixmap_configuration : native_pixmap_configurations) {
- configurations->push_back({native_pixmap_configuration.format,
- native_pixmap_configuration.usage});
- }
-}
-
-} // namespace
GpuMemoryBufferFactoryOzoneNativePixmap::
GpuMemoryBufferFactoryOzoneNativePixmap() {}
@@ -41,20 +22,12 @@ GpuMemoryBufferFactoryOzoneNativePixmap::
bool GpuMemoryBufferFactoryOzoneNativePixmap::
IsGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format,
gfx::BufferUsage usage) {
- std::vector<Configuration> configurations;
- GetSupportedConfigurations(&configurations);
- for (auto& configuration : configurations) {
- if (configuration.format == format && configuration.usage == usage)
- return true;
+ if (!ui::ClientNativePixmapFactory::GetInstance()) {
+ // unittests don't have to set ClientNativePixmapFactory.
+ return false;
}
-
- return false;
-}
-
-void GpuMemoryBufferFactoryOzoneNativePixmap::
- GetSupportedGpuMemoryBufferConfigurations(
- std::vector<Configuration>* configurations) {
- GetSupportedConfigurations(configurations);
+ return ui::ClientNativePixmapFactory::GetInstance()->IsConfigurationSupported(
+ format, usage);
}
gfx::GpuMemoryBufferHandle

Powered by Google App Engine
This is Rietveld 408576698