From ee2046e114189f99a54dccbc51c9ae72ed2a82aa Mon Sep 17 00:00:00 2001 From: CJ DiMeglio Date: Wed, 5 Sep 2018 20:21:31 +0000 Subject: [PATCH] Changes bool to and instead of or. We were moving onto to checking ContextGL if binding failed. This is bad, because we should not touch ContextGL if we haven't been bound. Bug: 879438 Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel Change-Id: I7898adf7af963216c388adaa35c5c2c287802fed Reviewed-on: https://chromium-review.googlesource.com/1200363 Reviewed-by: Kenneth Russell Commit-Queue: CJ DiMeglio Cr-Original-Commit-Position: refs/heads/master@{#588190}(cherry picked from commit 2008c6b2b89dc96e70490259543c53b99e62b605) Reviewed-on: https://chromium-review.googlesource.com/1208133 Reviewed-by: Abdul Syed Cr-Commit-Position: refs/branch-heads/3538@{#65} Cr-Branched-From: 79f7c91a2b2a2932cd447fa6f865cb6662fa8fa6-refs/heads/master@{#587811} --- .../blink/renderer/platform/graphics/video_frame_submitter.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc b/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc index e609f1630152..c6e15aae27b3 100644 --- a/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc +++ b/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc @@ -196,7 +196,7 @@ void VideoFrameSubmitter::OnReceivedContextProvider( auto result = context_provider_->BindToCurrentThread(); has_good_context = - result == gpu::ContextResult::kSuccess || + result == gpu::ContextResult::kSuccess && context_provider_->ContextGL()->GetGraphicsResetStatusKHR() == GL_NO_ERROR; }