From a2ab0c5986204cb15400b0469143eddcdb99f7f0 Mon Sep 17 00:00:00 2001
From: Colin Blundell <blundell@chromium.org>
Date: Tue, 26 Jul 2022 14:06:16 +0000
Subject: [PATCH] Revert "[CodecImage] Verify that CopyTexImage() is a no-op"
This CL reverts
https://chromium-review.googlesource.com/c/chromium/src/+/3750920,
which added a DumpWithoutCrashing() call to CodecImage::CopyTexImage().
We have now gathered crash reports from the invocation and it is
causing test failures. Hence we are taking it out, and we will re-add
it once we have reason to believe that we have solved the issues that
are causing it to go off.
Bug: 1310020, 1347077
Change-Id: I97eadde85ab33e0d3927c96e824e793e6868d397
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3787834
Reviewed-by: vikas soni <vikassoni@chromium.org>
Commit-Queue: vikas soni <vikassoni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1028242}
---
media/gpu/android/codec_image.cc | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/media/gpu/android/codec_image.cc b/media/gpu/android/codec_image.cc
index d81393dec6121..f86895b66c40e 100644
--- a/media/gpu/android/codec_image.cc
+++ b/media/gpu/android/codec_image.cc
@@ -10,7 +10,6 @@
#include "base/android/scoped_hardware_buffer_fence_sync.h"
#include "base/callback_helpers.h"
-#include "base/debug/dump_without_crashing.h"
#include "gpu/command_buffer/service/gles2_cmd_decoder.h"
#include "gpu/command_buffer/service/texture_manager.h"
#include "gpu/config/gpu_finch_features.h"
@@ -118,15 +117,6 @@ bool CodecImage::CopyTexImage(unsigned target) {
return false;
}
- // Our hypothesis is that in actuality the rendering to the front buffer and
- // binding of the image have always already occurred by the time that this
- // method is called. The below DumpWithoutCrashing() call serves to verify
- // whether this hypothesis is correct. See crbug.com/1310020 for details.
- // TODO(crbug.com/1310020): Remove this code as part of removing this entire
- // function once we have verified that it is indeed no longer needed.
- if (!output_buffer_renderer_->was_rendered_to_front_buffer())
- base::debug::DumpWithoutCrashing();
-
// On some devices GL_TEXTURE_BINDING_EXTERNAL_OES is not supported as
// glGetIntegerv() parameter. In this case the value of |texture_id| will be
// zero and we assume that it is properly bound to TextureOwner's texture id.