GitLab

This CL splits VaapiDrmPicture into a common part named
VaapiPictureNativePixmap, and two subclasses, namely:
- VaapiPictureNativePixmapOzone, containing the current
 #if defined(USE_OZONE) sandwiched parts, and
- VaapiPixtureNativePixmapEgl with the other parts.

So the class tree should look like:

  +-----------------+
  |   VaapiPicture  |
  +-----------------+
   ^               ^
   |               +----+
  +--------------+    +------------------+
  | VaapiPicture |    | VaapiPictureTFP  |
  | NativePixmap |    | (existing on ToT)|
  +--------------+    +------------------+
   ^
   +---------------+
   |               |
 +-------+    +-------+
 | VPNP  |    | VPNP  |
 | Ozone |    | Egl   |
 +-------+    +-------+

The point here is to reduce the amount of if-defs to one single
point, the VaapiPictureFactory.

BUILD.gn is changed to reflect that VaapiDrmPicture is
egl-specific (see bug, |use_egl| definition in [1]), while
VaapiDrmPictureOzone is |use_ozone| [2] specific. Note
that |use_egl| can coexist with |use_x11| [3].

This CL just moves code around, no new code introduced in
either vaapi_picture*.cc.

[1] https://cs.chromium.org/chromium/src/ui/gl/features.gni?q=ui/gl/features.gni&sq=package:chromium&dr&l=16
[2] https://cs.chromium.org/chromium/src/build/config/ui.gni?q=build/config/ui.gni&sq=package:chromium&dr&l=26
[3] https://cs.chromium.org/chromium/src/build/config/ui.gni?type=cs&sq=package:chromium&l=47

Bug: 785201
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I67f6f4d994322ef7f23a8ed255405963a4be0152
Reviewed-on: https://chromium-review.googlesource.com/951928Reviewed-by: Julien Isorce <julien.isorce@chromium.org>
Commit-Queue: Miguel Casas <mcasas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542107}