FREEZE.unindexed

ui/gl/gl_image_ozone_native_pixmap.cc

Index: ui/gl/gl_image_ozone_native_pixmap.cc
diff --git a/ui/gl/gl_image_ozone_native_pixmap.cc b/ui/gl/gl_image_ozone_native_pixmap.cc
index 90cc2205fad8cfed77f22500de681c744b40dfcc..f1d33f3ab2c132a7c8cce46e4de7ee5911894ab4 100644
--- a/ui/gl/gl_image_ozone_native_pixmap.cc
+++ b/ui/gl/gl_image_ozone_native_pixmap.cc
@@ -78,14 +78,16 @@ GLImageOzoneNativePixmap::~GLImageOzoneNativePixmap() {
   DCHECK(!pixmap_);
 }
 
-bool GLImageOzoneNativePixmap::Initialize(ui::NativePixmap* pixmap,
-                                          BufferFormat format) {
+bool GLImageOzoneNativePixmap::Initialize(
+    base::trace_event::GenericSharedMemoryId shared_memory_id,
+    ui::NativePixmap* pixmap,
+    GpuMemoryBuffer::Format format) {
   DCHECK(!pixmap_);
 
   bool result = true;
   if (pixmap->GetEGLClientBuffer()) {
     EGLint attrs[] = {EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_NONE};
-    result = GLImageEGL::Initialize(EGL_NATIVE_PIXMAP_KHR,
+    result = GLImageEGL::Initialize(shared_memory_id, EGL_NATIVE_PIXMAP_KHR,
                                     pixmap->GetEGLClientBuffer(), attrs);
   } else if (pixmap->GetDmaBufFd() >= 0) {
     if (!ValidInternalFormat(internalformat_)) {
@@ -113,8 +115,9 @@ bool GLImageOzoneNativePixmap::Initialize(ui::NativePixmap* pixmap,
                       EGL_DMA_BUF_PLANE0_PITCH_EXT,
                       pixmap->GetDmaBufPitch(),
                       EGL_NONE};
-    result = GLImageEGL::Initialize(
-        EGL_LINUX_DMA_BUF_EXT, static_cast<EGLClientBuffer>(nullptr), attrs);
+    result =
+        GLImageEGL::Initialize(shared_memory_id, EGL_LINUX_DMA_BUF_EXT,
+                               static_cast<EGLClientBuffer>(nullptr), attrs);
   }
 
   if (result)