Remove old tokens for DMA-BUF import modifiers.

ui/ozone/gl/gl_image_ozone_native_pixmap.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/ozone/gl/gl_image_ozone_native_pixmap.h"
 
 #include <vector>
 
 #include "ui/gfx/buffer_format_util.h"
 #include "ui/gl/gl_surface_egl.h"
@@ skipping 168 matching lines @@
         attrs.push_back(modifier & 0xffffffff);
         attrs.push_back(kLinuxDrmModifiers[attrs_plane] + 1);
         attrs.push_back(static_cast<uint32_t>(modifier >> 32));
       }
     }
     attrs.push_back(EGL_NONE);
 
     if (!GLImageEGL::Initialize(EGL_LINUX_DMA_BUF_EXT,
                                 static_cast<EGLClientBuffer>(nullptr),
                                 &attrs[0])) {
-      // TODO(hshi): remove this workaround after chrome uprevs and
-      // corresponding driver updates are made. https://crosbug.com/p/58718
-      if (has_dma_buf_import_modifier) {
-        // If driver rejects the new DMA-BUF import modifer tokens, then try
-        // again with the old token definition.
-        for (size_t i = 0; i < attrs.size(); i += 2) {
-          switch (attrs[i]) {
-            case EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE0_MODIFIER0_EXT;
-              break;
-            case EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE0_MODIFIER1_EXT;
-              break;
-            case EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE1_MODIFIER0_EXT;
-              break;
-            case EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE1_MODIFIER1_EXT;
-              break;
-            case EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE2_MODIFIER0_EXT;
-              break;
-            case EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE2_MODIFIER1_EXT;
-              break;
-            default:
-              break;
-          }
-        }
-        if (!GLImageEGL::Initialize(EGL_LINUX_DMA_BUF_EXT,
-                                    static_cast<EGLClientBuffer>(nullptr),
-                                    &attrs[0])) {
-          return false;
-        }
-      } else {
-        return false;
-      }
+      return false;
     }
   }
 
   pixmap_ = pixmap;
   return true;
 }
 
 unsigned GLImageOzoneNativePixmap::GetInternalFormat() {
   return internalformat_;
 }
@@ skipping 75 matching lines @@
     case gfx::BufferFormat::UYVY_422:
       NOTREACHED();
       return GL_NONE;
   }
 
   NOTREACHED();
   return GL_NONE;
 }
 
 }  // namespace ui