[Media Controls] Prevent DCHECK when removing video acting as audio

This CL prevents the is_acting_as_audio_controls_ state from updating during an HTMLMediaElement's removal from the document. This fixes an issue where a DCHECK was firing on the controls inserting elements into the panel during a removal. Bug: 851374 Change-Id: I28a4cd31dd4e0197b8fcad8cfaa9401dbf5aea61 Reviewed-on: https://chromium-review.googlesource.com/1098306Reviewed-by: Becca Hughes <beccahughes@chromium.org> Commit-Queue: Tommy Steimel <steimel@chromium.org> Cr-Commit-Position: refs/heads/master@{#567689}

[Media Controls] Prevent DCHECK when removing video acting as audio
This CL prevents the is_acting_as_audio_controls_ state from updating during an HTMLMediaElement's removal from the document. This fixes an issue where a DCHECK was firing on the controls inserting elements into the panel during a removal. Bug: 851374 Change-Id: I28a4cd31dd4e0197b8fcad8cfaa9401dbf5aea61 Reviewed-on: https://chromium-review.googlesource.com/1098306Reviewed-by: Becca Hughes <beccahughes@chromium.org> Commit-Queue: Tommy Steimel <steimel@chromium.org> Cr-Commit-Position: refs/heads/master@{#567689}
2c5d8300 · Tommy Steimel · Commit Bot · f27798f4 · 2c5d8300 · 2c5d8300
Commit 2c5d8300 authored Jun 15, 2018 by Tommy Steimel Committed by Commit Bot Jun 15, 2018
2 changed files
--- a/third_party/WebKit/LayoutTests/media/controls/removing-video-acting-as-audio-element-does-not-crash.html
+++ b/third_party/WebKit/LayoutTests/media/controls/removing-video-acting-as-audio-element-does-not-crash.html
+<!DOCTYPE html>
+<html>
+<title>Test that removing a video that is acting as audio does not crash</title>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<video controls preload=metadata>
+  <source src="../content/test.oga" />
+</video>
+<script>
+async_test(t => {
+  const video = document.querySelector('video');
+
+  video.addEventListener('loadedmetadata', t.step_func_done(() => {
+    video.src=null;
+    video.parentNode.removeChild(video);
+  }));
+
+});
+</script>
+</html>
--- a/third_party/blink/renderer/modules/media_controls/media_controls_impl.cc
+++ b/third_party/blink/renderer/modules/media_controls/media_controls_impl.cc
@@ -924,7 +924,13 @@ void MediaControlsImpl::Hide() {
  timeline_->OnControlsHidden();

  UpdateCSSClassFromState();
-  UpdateActingAsAudioControls();
+
+  // Hide is called when the HTMLMediaElement is removed from a document. If we
+  // stop acting as audio controls during this removal, we end up inserting
+  // nodes during the removal, firing a DCHECK. To avoid this, only update here
+  // when the media element is connected.
+  if (MediaElement().isConnected())
+    UpdateActingAsAudioControls();
 }

 bool MediaControlsImpl::IsVisible() const {