commit e92f4420d263aeddf71ca4ea0c00257ed8611f4c
author Leon Scroggins III <scroggo@google.com> Fri Jun 23 10:17:40 2023 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Fri Jun 23 15:31:08 2023 +0000
tree 5ee494de51c3898ba8f10a0de5dff93e6a9dbb26
parent 9635d54210dc3588746a81638669495810da5e9d

Revert "Remove SkCanvas::flush() from Skia-proper and remove other gpu-specific code"

This reverts commit 4a187251e7e143a681b6a7b2901a61ac6c2ef0b0.

Reason for revert: Breaking the Android roll, specifically
CtsUiRenderingTestCases:android.uirendering.cts.testclasses.LayerTests#testWebViewNoOverlappingRenderingAndAlpha

Original change's description:
> Remove SkCanvas::flush() from Skia-proper and remove other gpu-specific code
>
> This removes more gpu-related #ifdefs from SkCanvas.cpp
>
> Bug: skia:14317
> Change-Id: I468c3e1e1abac130fa9204a98f9ce78bc1405eea
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/714643
> Reviewed-by: Brian Osman <brianosman@google.com>

In addition, revert the attempted fix-forward "Preserve SkNWayCanvas::onFlush"

This reverts commit 5265b5ee1afc64094250ee8d017df93b3d7b1407.

Original change's description:
> Preserve SkNWayCanvas::onFlush
>
> Follow-up to https://skia-review.googlesource.com/c/skia/+/714643
>
> Change-Id: I808281dd1ed4fc46df50b89620fcf3e5f691a6a1
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/715325
> Reviewed-by: Leon Scroggins <scroggo@google.com>
> Auto-Submit: Kevin Lubick <kjlubick@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Kevin Lubick <kjlubick@google.com>
> Commit-Queue: Leon Scroggins <scroggo@google.com>

Bug: skia:14317
Change-Id: I7e24b05275cd2d3550cada0deec0491201ea1eba
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/715349
Commit-Queue: Brian Osman <brianosman@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Auto-Submit: Leon Scroggins <scroggo@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>