Delete Ozone egltest platform.

The Ozone X11 platform implements a more complete X11 backend for Ozone
and egltest is unused at this point. Delete the egltest code and all the
accompanying parts of GYP and GN build files.

BUG=none

Review-Url: https://codereview.chromium.org/2167243002
Cr-Commit-Position: refs/heads/master@{#406918}

build/common.gypi

@@ -1563,9 +1563,7 @@
     # Ozone platforms to include in the build.
     'ozone_platform_caca%': 0,
     'ozone_platform_cast%': 0,
-    'ozone_platform_egltest%': 0,
     'ozone_platform_gbm%': 0,
-    'ozone_platform_ozonex%': 0,
     'ozone_platform_headless%': 0,
     'ozone_platform_wayland%': 0,
 
@@ -2357,12 +2355,11 @@
             'ozone_platform_cast%': 1,
             'conditions': [
               # For desktop non-audio Chromecast builds, run with
-              # --ozone-platform=egltest
+              # --ozone-platform=x11
               # TODO(slan|halliwell): Make the default platform "cast" on
               # desktop non-audio builds too.
               ['is_cast_desktop_build==1 and disable_display==0', {
-                'ozone_platform_egltest%': 1,
-                'ozone_platform_ozonex%': 1,
+                # Use GN instead. 
               }, {
                 'ozone_platform%': 'cast',
               }],
@@ -2370,7 +2367,6 @@
           }, {  # chromecast!=1
             # Build all platforms whose deps are in install-build-deps.sh.
             # Only these platforms will be compile tested by buildbots.
-            'ozone_platform_egltest%': 1,
             'conditions': [
               ['chromeos==1', {
                 'ozone_platform_gbm%': 1,

build/linux/system.gyp

@@ -193,7 +193,7 @@
         },
       ],  # targets
     }],
-    [ 'use_x11==1 or ozone_platform_ozonex==1', {
+    [ 'use_x11==1', {
       # Hide X11 and related dependencies when use_x11=0
       'targets': [
         {

docs/cast_build_instructions.md

@@ -25,7 +25,7 @@ ninja -C out/Debug cast_shell
 ```
 
 ```shell
-out/Debug/cast_shell --ozone-platform=egltest http://google.com
+out/Debug/cast_shell --ozone-platform=x11 http://google.com
 ```
 
 ## Building/running cast\_shell\_apk (Android)

ui/events/events.gyp

@@ -349,7 +349,7 @@
             'keycodes/events_keycodes.gyp:keycodes_x11',
           ],
         }],
-        ['use_x11==1 or ozone_platform_ozonex==1', {
+        ['use_x11==1', {
           'dependencies': [
             'x/events_x.gyp:events_x',
           ],

ui/ozone/BUILD.gn

@@ -19,11 +19,6 @@ ozone_platform_deps = []
 # Extra dependencies to pull into ozone_unittests for built platforms.
 ozone_platform_test_deps = []
 
-if (ozone_platform_egltest) {
-  ozone_platforms += [ "egltest" ]
-  ozone_platform_deps += [ "platform/egltest" ]
-}
-
 if (ozone_platform_headless) {
   ozone_platforms += [ "headless" ]
   ozone_platform_deps += [ "platform/headless" ]

ui/ozone/ozone.gni

@@ -24,9 +24,7 @@ declare_args() {
   # Enable individual platforms.
   ozone_platform_caca = false
   ozone_platform_cast = false
-  ozone_platform_egltest = false
   ozone_platform_gbm = false
-  ozone_platform_ozonex = false
   ozone_platform_headless = false
   ozone_platform_x11 = false
   ozone_platform_wayland = false
@@ -61,6 +59,6 @@ declare_args() {
 }
 
 assert(use_ozone || !(ozone_platform_caca || ozone_platform_cast ||
-                          ozone_platform_egltest || ozone_platform_gbm ||
-                          ozone_platform_ozonex || ozone_platform_headless),
+                          ozone_platform_gbm || ozone_platform_headless ||
+                          ozone_platform_x11 || ozone_platform_wayland),
        "Must set use_ozone to select ozone platforms")

ui/ozone/ozone.gyp

@@ -266,11 +266,6 @@
         'platform/cast/cast.gypi',
       ],
     }],
-    ['<(ozone_platform_egltest) == 1', {
-      'includes': [
-        'platform/egltest/egltest.gypi',
-      ],
-    }],
     ['<(ozone_platform_gbm) == 1', {
       'includes': [
         'platform/drm/gbm.gypi',

ui/ozone/platform/egltest/BUILD.gn

-# Copyright 2014 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.
-
-import("//tools/generate_library_loader/generate_library_loader.gni")
-import("//ui/ozone/ozone.gni")
-
-visibility = [ "//ui/ozone/*" ]
-
-source_set("egltest") {
-  sources = [
-    "client_native_pixmap_factory_egltest.cc",
-    "client_native_pixmap_factory_egltest.h",
-    "ozone_platform_egltest.cc",
-    "ozone_platform_egltest.h",
-  ]
-
-  configs += [ "//third_party/khronos:khronos_headers" ]
-
-  deps = [
-    ":eglplatform_shim",
-    "//base",
-    "//ui/events",
-    "//ui/events/devices",
-    "//ui/events/ozone:events_ozone",
-    "//ui/events/ozone:events_ozone_evdev",
-    "//ui/events/ozone:events_ozone_layout",
-    "//ui/events/platform",
-    "//ui/gfx",
-    "//ui/ozone:ozone_base",
-    "//ui/ozone/common",
-    "//ui/platform_window",
-  ]
-}
-
-generate_library_loader("eglplatform_shim") {
-  name = "LibeglplatformShimLoader"
-  output_h = "libeglplatform_shim.h"
-  output_cc = "libeglplatform_shim_loader.cc"
-  header = "\"ui/ozone/platform/egltest/eglplatform_shim.h\""
-
-  functions = [
-    "ShimQueryString",
-    "ShimInitialize",
-    "ShimTerminate",
-    "ShimCreateWindow",
-    "ShimQueryWindow",
-    "ShimDestroyWindow",
-    "ShimGetNativeDisplay",
-    "ShimGetNativeWindow",
-    "ShimReleaseNativeWindow",
-  ]
-}
-
-# TODO(spang): eglplatform_shim_x11 should become a loadable_module once
-# support lands: http://crbug.com/380327. Until then, it is not valid on
-# platforms other than Linux.
-
-# GYP version: "ui/ozone/platform/egltest/egltest.gypi:eglplatform_shim_x11"
-if (is_linux && ozone_platform_ozonex) {
-  shared_library("eglplatform_shim_x11") {
-    output_name = "libeglplatform_shim"
-
-    output_extension = "so.1"
-
-    sources = [
-      "eglplatform_shim.h",
-      "eglplatform_shim_xeleven.cc",
-    ]
-
-    configs += [ "//build/config/linux:x11" ]
-
-    deps = [
-      "//build/config/sanitizers:deps",
-    ]
-
-    visibility += [ "//chromecast/*" ]
-  }
-}

ui/ozone/platform/egltest/client_native_pixmap_factory_egltest.cc

-// Copyright 2015 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/platform/egltest/client_native_pixmap_factory_egltest.h"
-
-#include "ui/ozone/common/stub_client_native_pixmap_factory.h"
-
-namespace ui {
-
-ClientNativePixmapFactory* CreateClientNativePixmapFactoryEgltest() {
-  return CreateStubClientNativePixmapFactory();
-}
-
-}  // namespace ui

ui/ozone/platform/egltest/client_native_pixmap_factory_egltest.h

-// Copyright 2015 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.
-
-#ifndef UI_OZONE_PLATFORM_EGLTEST_CLIENT_NATIVE_PIXMAP_FACTORY_EGLTEST_H_
-#define UI_OZONE_PLATFORM_EGLTEST_CLIENT_NATIVE_PIXMAP_FACTORY_EGLTEST_H_
-
-namespace ui {
-
-class ClientNativePixmapFactory;
-
-// Constructor hook for use in constructor_list.cc
-ClientNativePixmapFactory* CreateClientNativePixmapFactoryEgltest();
-
-}  // namespace ui
-
-#endif  // UI_OZONE_PLATFORM_EGLTEST_CLIENT_NATIVE_PIXMAP_FACTORY_EGLTEST_H_

ui/ozone/platform/egltest/eglplatform_shim.h

-// Copyright 2014 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.
-
-#ifndef __eglplatform_shim_h_
-#define __eglplatform_shim_h_
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SHIM_EXPORT __attribute__((visibility("default")))
-
-// Simple integral native window identifier.
-// NB: Unlike EGLNativeWindowType, this will be shipped between processes.
-typedef int ShimNativeWindowId;
-#define SHIM_NO_WINDOW_ID ((ShimNativeWindowId)0)
-
-// Opaque versions of EGL types (as used by ozone).
-typedef intptr_t ShimEGLNativeDisplayType;
-typedef intptr_t ShimEGLNativeWindowType;
-
-// QueryString targets
-#define SHIM_EGL_LIBRARY 0x1001
-#define SHIM_GLES_LIBRARY 0x1002
-
-// CreateWindow / QueryWindow attributes
-#define SHIM_WINDOW_WIDTH 0x0001
-#define SHIM_WINDOW_HEIGHT 0x0002
-
-// Query global implementation information.
-SHIM_EXPORT const char* ShimQueryString(int name);
-
-// Init/terminate library.
-SHIM_EXPORT bool ShimInitialize(void);
-SHIM_EXPORT bool ShimTerminate(void);
-
-// Create window handle & query window properties (called from browser process).
-SHIM_EXPORT ShimNativeWindowId ShimCreateWindow(void);
-SHIM_EXPORT bool ShimQueryWindow(ShimNativeWindowId window_id,
-                                 int attribute,
-                                 int* value);
-SHIM_EXPORT bool ShimDestroyWindow(ShimNativeWindowId window_id);
-
-// Manage actual EGL platform objects (called from GPU process).
-SHIM_EXPORT ShimEGLNativeDisplayType ShimGetNativeDisplay(void);
-SHIM_EXPORT ShimEGLNativeWindowType
-    ShimGetNativeWindow(ShimNativeWindowId native_window_id);
-SHIM_EXPORT bool ShimReleaseNativeWindow(ShimEGLNativeWindowType native_window);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __eglplatform_shim_h */

ui/ozone/platform/egltest/eglplatform_shim_xeleven.cc

-// Copyright 2014 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/platform/egltest/eglplatform_shim.h"
-
-#include <string.h>
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-Display* g_display;
-
-const int kDefaultX = 0;
-const int kDefaultY = 0;
-const int kDefaultWidth = 1280;
-const int kDefaultHeight = 720;
-const int kDefaultBorderWidth = 0;
-
-const char* ShimQueryString(int name) {
-  switch (name) {
-    case SHIM_EGL_LIBRARY:
-      return "libEGL.so.1";
-    case SHIM_GLES_LIBRARY:
-      return "libGLESv2.so.2";
-    default:
-      return NULL;
-  }
-}
-
-bool ShimInitialize(void) {
-  g_display = XOpenDisplay(NULL);
-  return g_display != NULL;
-}
-
-bool ShimTerminate(void) {
-  XCloseDisplay(g_display);
-  return true;
-}
-
-ShimNativeWindowId ShimCreateWindow(void) {
-  XSetWindowAttributes swa;
-  memset(&swa, 0, sizeof(swa));
-  swa.event_mask = 0;
-
-  Window window = XCreateWindow(g_display,
-                                DefaultRootWindow(g_display),
-                                kDefaultX,
-                                kDefaultY,
-                                kDefaultWidth,
-                                kDefaultHeight,
-                                kDefaultBorderWidth,
-                                CopyFromParent,
-                                InputOutput,
-                                CopyFromParent,
-                                CWEventMask,
-                                &swa);
-
-  XMapWindow(g_display, window);
-  XStoreName(g_display, window, "EGL test");
-  XFlush(g_display);
-
-  return window;
-}
-
-bool ShimQueryWindow(ShimNativeWindowId window_id, int attribute, int* value) {
-  XWindowAttributes window_attributes;
-  switch (attribute) {
-    case SHIM_WINDOW_WIDTH:
-      XGetWindowAttributes(g_display, window_id, &window_attributes);
-      *value = window_attributes.width;
-      return true;
-    case SHIM_WINDOW_HEIGHT:
-      XGetWindowAttributes(g_display, window_id, &window_attributes);
-      *value = window_attributes.height;
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool ShimDestroyWindow(ShimNativeWindowId window_id) {
-  XDestroyWindow(g_display, window_id);
-  return true;
-}
-
-ShimEGLNativeDisplayType ShimGetNativeDisplay(void) {
-  return reinterpret_cast<ShimEGLNativeDisplayType>(g_display);
-}
-
-ShimEGLNativeWindowType ShimGetNativeWindow(
-    ShimNativeWindowId native_window_id) {
-  return native_window_id;
-}
-
-bool ShimReleaseNativeWindow(ShimEGLNativeWindowType native_window) {
-  return true;
-}
-
-#ifdef __cplusplus
-}
-#endif

ui/ozone/platform/egltest/egltest.gypi

-# Copyright 2014 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.
-
-{
-  'variables': {
-    'internal_ozone_platform_deps': [
-      'ozone_platform_egltest',
-    ],
-    'internal_ozone_platforms': [
-      'egltest'
-    ],
-  },
-  'targets': [
-    {
-      'target_name': 'ozone_platform_egltest',
-      'type': 'static_library',
-      'defines': [
-        'OZONE_IMPLEMENTATION',
-      ],
-      'dependencies': [
-        'ozone.gyp:ozone_base',
-        'ozone.gyp:ozone_common',
-        '../../base/base.gyp:base',
-        '../../third_party/khronos/khronos.gyp:khronos_headers',
-        '../events/devices/events_devices.gyp:events_devices',
-        '../events/events.gyp:events',
-        '../events/ozone/events_ozone.gyp:events_ozone_evdev',
-        '../events/ozone/events_ozone.gyp:events_ozone_layout',
-        '../events/platform/events_platform.gyp:events_platform',
-        '../gfx/gfx.gyp:gfx',
-        'eglplatform_shim',
-      ],
-      'sources': [
-        'client_native_pixmap_factory_egltest.cc',
-        'client_native_pixmap_factory_egltest.h',
-        'ozone_platform_egltest.cc',
-        'ozone_platform_egltest.h',
-      ],
-    },
-    {
-      'target_name': 'eglplatform_shim',
-      'type': 'static_library',
-      'dependencies': [
-        '../../third_party/khronos/khronos.gyp:khronos_headers',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(SHARED_INTERMEDIATE_DIR)',
-        ],
-      },
-      'include_dirs': [
-        '../../../..',
-      ],
-      'hard_dependency': 1,
-      'actions': [
-        {
-          'variables': {
-            'output_cc': '<(INTERMEDIATE_DIR)/libeglplatform_shim_loader.cc',
-            'output_h': '<(SHARED_INTERMEDIATE_DIR)/library_loaders/libeglplatform_shim.h',
-            'generator': '../../tools/generate_library_loader/generate_library_loader.py',
-          },
-          'action_name': 'generate_libeglplatform_shim_loader',
-          'inputs': [
-            '<(generator)',
-          ],
-          'outputs': [
-            '<(output_h)',
-            '<(output_cc)',
-          ],
-          'action': ['python',
-                     '<(generator)',
-                     '--name', 'LibeglplatformShimLoader',
-                     '--output-h', '<(output_h)',
-                     '--output-cc', '<(output_cc)',
-                     '--header', '"ui/ozone/platform/egltest/eglplatform_shim.h"',
-                     'ShimQueryString',
-                     'ShimInitialize',
-                     'ShimTerminate',
-                     'ShimCreateWindow',
-                     'ShimQueryWindow',
-                     'ShimDestroyWindow',
-                     'ShimGetNativeDisplay',
-                     'ShimGetNativeWindow',
-                     'ShimReleaseNativeWindow',
-          ],
-          'message': 'Generating libeglplatform_shim library loader',
-          'process_outputs_as_sources': 1,
-        },
-      ],
-    },
-  ],
-  'conditions': [
-    ['ozone_platform_ozonex == 1', {
-      'targets': [
-        {
-          'target_name': 'eglplatform_shim_x11',
-          'type': 'loadable_module',
-          'product_name': 'eglplatform_shim',
-          'product_extension': 'so.1',
-          'include_dirs': [
-            '../../../..',
-          ],
-          'dependencies': [
-            '../../build/linux/system.gyp:x11',
-          ],
-          'sources': [
-            'eglplatform_shim.h',
-            'eglplatform_shim_xeleven.cc',
-          ],
-        },
-      ],
-    }],
-  ],
-}

ui/ozone/platform/egltest/ozone_platform_egltest.h

-// Copyright 2014 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.
-
-#ifndef UI_OZONE_PLATFORM_TEST_OZONE_PLATFORM_EGLTEST_H_
-#define UI_OZONE_PLATFORM_TEST_OZONE_PLATFORM_EGLTEST_H_
-
-namespace ui {
-
-class OzonePlatform;
-
-// Constructor hook for use in ozone_platform_list.cc
-OzonePlatform* CreateOzonePlatformEgltest();
-
-}  // namespace ui
-
-#endif  // UI_OZONE_PLATFORM_TEST_OZONE_PLATFORM_EGLTEST_H_