| Index: ui/ozone/platform/drm/gpu/gbm_surface.cc
|
| diff --git a/ui/ozone/platform/drm/gpu/gbm_surface.cc b/ui/ozone/platform/drm/gpu/gbm_surface.cc
|
| index 08a32f44d7bf7c9c09fc83a49151deaaeb11bb5e..8b5b167bc85a3d9eefa3e0b0ffbf59cd9af9827c 100644
|
| --- a/ui/ozone/platform/drm/gpu/gbm_surface.cc
|
| +++ b/ui/ozone/platform/drm/gpu/gbm_surface.cc
|
| @@ -18,9 +18,6 @@
|
| namespace ui {
|
|
|
| namespace {
|
| -
|
| -void DoNothing(gfx::SwapResult) {
|
| -}
|
|
|
| class GbmSurfaceBuffer : public GbmBufferBase {
|
| public:
|
| @@ -134,7 +131,7 @@
|
| }
|
|
|
| bool GbmSurface::OnSwapBuffers() {
|
| - return OnSwapBuffersAsync(base::Bind(&DoNothing));
|
| + return OnSwapBuffersAsync(base::Bind(&base::DoNothing));
|
| }
|
|
|
| bool GbmSurface::OnSwapBuffersAsync(const SwapCompletionCallback& callback) {
|
| @@ -147,7 +144,7 @@
|
| primary = GbmSurfaceBuffer::CreateBuffer(gbm_, pending_buffer);
|
| if (!primary.get()) {
|
| LOG(ERROR) << "Failed to associate the buffer with the controller";
|
| - callback.Run(gfx::SwapResult::SWAP_FAILED);
|
| + callback.Run();
|
| return false;
|
| }
|
| }
|
| @@ -158,7 +155,7 @@
|
| if (!GbmSurfaceless::OnSwapBuffersAsync(
|
| base::Bind(&GbmSurface::OnSwapBuffersCallback,
|
| weak_factory_.GetWeakPtr(), callback, pending_buffer))) {
|
| - callback.Run(gfx::SwapResult::SWAP_FAILED);
|
| + callback.Run();
|
| return false;
|
| }
|
|
|
| @@ -166,14 +163,13 @@
|
| }
|
|
|
| void GbmSurface::OnSwapBuffersCallback(const SwapCompletionCallback& callback,
|
| - gbm_bo* pending_buffer,
|
| - gfx::SwapResult result) {
|
| + gbm_bo* pending_buffer) {
|
| // If there was a frontbuffer, it is no longer active. Release it back to GBM.
|
| if (current_buffer_)
|
| gbm_surface_release_buffer(native_surface_, current_buffer_);
|
|
|
| current_buffer_ = pending_buffer;
|
| - callback.Run(result);
|
| + callback.Run();
|
| }
|
|
|
| } // namespace ui
|
|
|