Refactor pair<BufferFormat, BufferUsage> to BufferUsageAndFormat

R=kylechar

Fixes: 1044437
Change-Id: I469d7589eb1a70034a3324782a20784d646eb769
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2011685
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: kylechar <kylechar@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736998}

components/viz/host/host_gpu_memory_buffer_manager.cc

@@ -169,8 +169,8 @@ bool HostGpuMemoryBufferManager::IsNativeGpuMemoryBufferConfiguration(
     base::ScopedAllowBaseSyncPrimitivesOutsideBlockingScope allow_wait;
     native_configurations_initialized_.Wait();
   }
-  return native_configurations_.find(std::make_pair(format, usage)) !=
-         native_configurations_.end();
+  return native_configurations_.find(gfx::BufferUsageAndFormat(
+             usage, format)) != native_configurations_.end();
 }
 
 std::unique_ptr<gfx::GpuMemoryBuffer>

content/browser/gpu/gpu_internals_ui.cc

@@ -372,13 +372,8 @@ std::unique_ptr<base::ListValue> GpuMemoryBufferInfo(
     std::string native_usage_support;
     for (size_t usage = 0;
          usage < static_cast<size_t>(gfx::BufferUsage::LAST) + 1; usage++) {
-#if defined(USE_X11)
       gfx::BufferUsageAndFormat element{static_cast<gfx::BufferUsage>(usage),
                                         static_cast<gfx::BufferFormat>(format)};
-#else
-      auto element = std::make_pair(static_cast<gfx::BufferFormat>(format),
-                                    static_cast<gfx::BufferUsage>(usage));
-#endif
       if (base::Contains(native_configurations, element)) {
         native_usage_support = base::StringPrintf(
             "%s%s %s", native_usage_support.c_str(),

content/browser/gpu/gpu_memory_buffer_manager_singleton_x11.cc

@@ -23,7 +23,7 @@ void GpuMemoryBufferManagerSingletonX11::OnGpuExtraInfoUpdate() {
   gpu::GpuMemoryBufferConfigurationSet configs;
   for (const auto& config : gpu_data_manager_impl_->GetGpuExtraInfo()
                                 .gpu_memory_buffer_support_x11) {
-    configs.insert(std::make_pair(config.format, config.usage));
+    configs.insert(config);
   }
   SetNativeConfigurations(std::move(configs));
 }

gpu/ipc/host/gpu_memory_buffer_support.cc

@@ -42,7 +42,7 @@ GpuMemoryBufferConfigurationSet GetNativeGpuMemoryBufferConfigurations(
   for (auto format : kBufferFormats) {
     for (auto usage : kUsages) {
       if (support->IsNativeGpuMemoryBufferConfigurationSupported(format, usage))
-        configurations.insert(std::make_pair(format, usage));
+        configurations.insert(gfx::BufferUsageAndFormat(usage, format));
     }
   }
 #endif  // defined(USE_OZONE) || defined(OS_MACOSX) || defined(OS_WIN) ||
@@ -60,9 +60,9 @@ bool GetImageNeedsPlatformSpecificTextureTarget(gfx::BufferFormat format,
   GpuMemoryBufferSupport support;
   GpuMemoryBufferConfigurationSet native_configurations =
       GetNativeGpuMemoryBufferConfigurations(&support);
-  return native_configurations.find(std::make_pair(format, usage)) !=
-         native_configurations.end();
-#else  // defined(USE_OZONE) || defined(OS_MACOSX)
+  return base::Contains(native_configurations,
+                        gfx::BufferUsageAndFormat(usage, format));
+#else
   return false;
 #endif
 }

gpu/ipc/host/gpu_memory_buffer_support.h

@@ -15,8 +15,7 @@
 
 namespace gpu {
 
-using GpuMemoryBufferConfigurationKey =
-    std::pair<gfx::BufferFormat, gfx::BufferUsage>;
+using GpuMemoryBufferConfigurationKey = gfx::BufferUsageAndFormat;
 using GpuMemoryBufferConfigurationSet =
     std::unordered_set<GpuMemoryBufferConfigurationKey>;
 
@@ -27,8 +26,8 @@ namespace std {
 template <>
 struct hash<gpu::GpuMemoryBufferConfigurationKey> {
   size_t operator()(const gpu::GpuMemoryBufferConfigurationKey& key) const {
-    return base::HashInts(static_cast<int>(key.first),
-                          static_cast<int>(key.second));
+    return base::HashInts(static_cast<int>(key.format),
+                          static_cast<int>(key.usage));
   }
 };