GitLab

This reverts commit dcee7502.

Reason for revert: Broke the software-composited cursors on chromeos

BUG=1139157

Original change's description:
> Fix loading of animated cursors on Ozone/Wayland
>
> Animated cursor assets were not being loaded because GetCursorDataFor
> was used for all cursors, instead of using GetAnimatedCursorDataFor when
> the cursor was animated.
>
> With this CL, both set of cursors are merged so they can be retrieved
> with a single call.
>
> To ease these changes, ImageCursor, which was a very thin layer over
> CursorLoader, was merged into the latter. This change has the benefit of
> unifying the cursor loading code path of Ash with the one of the other
> Aura platforms and changing Ash on Linux to use the Chromium assets
> instead of the platform cursors, as when running on Chrome OS devices.
>
> The only behavior change with respect to ImageCursors is that the cached
> cursors will be removed on display changes, instead of reloaded.
>
> Bug: 1135515
> Change-Id: Iedf84290bf3792c3ce06cfad0be1b5c0e2d96946
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2440760
> Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
> Reviewed-by: Scott Violet <sky@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#815678}

TBR=sky@chromium.org,hferreiro@igalia.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1135515
Change-Id: I6ddde59ade817585217521d9b435d1136d83584f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2478023
Commit-Queue: Ahmed Fakhry <afakhry@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817832}