Commit a8165b48 authored by kylechar's avatar kylechar Committed by Commit Bot

Revert "Add checks to find source of null requests"

This reverts commit 5b1e0dfc.

Reason for revert: Found the problem.

Original change's description:
> Add checks to find source of null requests
> 
> Somehow ReadPixelsContext::request is null once it reaches
> OnRGBAReadbackDone() done. Add some checks to figure out how that can
> happen.
> 
> Bug: 1048251
> Change-Id: If74854b5b332b1af347647c4c1c234e995afa944
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2037846
> Reviewed-by: Jonathan Backer <backer@chromium.org>
> Commit-Queue: kylechar <kylechar@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#738563}

TBR=backer@chromium.org,kylechar@chromium.org

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

Bug: 1048251
Change-Id: I0ba8227e8f8b000ff9e761169c7e47134de6ad9f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2042536Reviewed-by: default avatarkylechar <kylechar@chromium.org>
Commit-Queue: kylechar <kylechar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#739203}
parent 192cdd7c
...@@ -596,8 +596,6 @@ void SkiaOutputSurfaceImpl::CopyOutput( ...@@ -596,8 +596,6 @@ void SkiaOutputSurfaceImpl::CopyOutput(
const gfx::ColorSpace& color_space, const gfx::ColorSpace& color_space,
std::unique_ptr<CopyOutputRequest> request) { std::unique_ptr<CopyOutputRequest> request) {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
// TODO(crbug.com/1048251): Remove after finding source of null requests.
CHECK(request);
if (!request->has_result_task_runner()) if (!request->has_result_task_runner())
request->set_result_task_runner(base::ThreadTaskRunnerHandle::Get()); request->set_result_task_runner(base::ThreadTaskRunnerHandle::Get());
......
...@@ -120,10 +120,7 @@ struct ReadPixelsContext { ...@@ -120,10 +120,7 @@ struct ReadPixelsContext {
: request(std::move(request)), : request(std::move(request)),
result_rect(result_rect), result_rect(result_rect),
color_space(color_space), color_space(color_space),
impl_on_gpu(impl_on_gpu) { impl_on_gpu(impl_on_gpu) {}
// TODO(crbug.com/1048251): Remove after finding source of null requests.
CHECK(this->request);
}
std::unique_ptr<CopyOutputRequest> request; std::unique_ptr<CopyOutputRequest> request;
gfx::Rect result_rect; gfx::Rect result_rect;
...@@ -259,9 +256,6 @@ void OnRGBAReadbackDone( ...@@ -259,9 +256,6 @@ void OnRGBAReadbackDone(
return; return;
} }
// TODO(crbug.com/1048251): Remove after finding source of null requests.
CHECK(context->request);
DCHECK_EQ(1, async_result->count()); DCHECK_EQ(1, async_result->count());
auto info = SkImageInfo::MakeN32Premul(context->result_rect.width(), auto info = SkImageInfo::MakeN32Premul(context->result_rect.width(),
...@@ -1147,9 +1141,6 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutput( ...@@ -1147,9 +1141,6 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutput(
// TODO(crbug.com/898595): Do this on the GPU instead of CPU with Vulkan. // TODO(crbug.com/898595): Do this on the GPU instead of CPU with Vulkan.
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
// TODO(crbug.com/1048251): Remove after finding source of null requests.
CHECK(request);
// Clear |destroy_after_swap_| if we CopyOutput without SwapBuffers. // Clear |destroy_after_swap_| if we CopyOutput without SwapBuffers.
base::ScopedClosureRunner cleanup( base::ScopedClosureRunner cleanup(
base::BindOnce([](std::vector<std::unique_ptr<SkDeferredDisplayList>>) {}, base::BindOnce([](std::vector<std::unique_ptr<SkDeferredDisplayList>>) {},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment