Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(750)

Unified Diff: Source/core/html/HTMLMediaElement.cpp

Issue 575563002: Fix adopting a video element with controls (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix philipj@'s comments Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/media/adopt-node-video-controls-crash.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLMediaElement.cpp
diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp
index a709141682132ddc3829fd251ecc4500baed28bc..b4f6f317e0332e166d021799fe80fb94266a9fe9 100644
--- a/Source/core/html/HTMLMediaElement.cpp
+++ b/Source/core/html/HTMLMediaElement.cpp
@@ -827,8 +827,8 @@ void HTMLMediaElement::prepareForLoad()
// algorithm, but do it now because we won't start that until after the timer fires and the
// event may have already fired by then.
setShouldDelayLoadEvent(true);
-
- configureMediaControls();
+ if (hasMediaControls())
+ mediaControls()->reset();
}
void HTMLMediaElement::loadInternal()
« no previous file with comments | « LayoutTests/media/adopt-node-video-controls-crash.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698