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

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

Issue 2594353003: Crash in blink::beforeCallEnteredCallback() (Closed)
Patch Set: Created 4 years 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
Index: third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
index d03da2e9ca79091341d7e82c4d61eac99a70a038..ff4f0015c35e2c7167b7820b6952efb9d66f65c1 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
@@ -803,9 +803,13 @@ void HTMLMediaElement::invokeLoadAlgorithm() {
// 4.6.2 - Take pending play promises and reject pending play promises
// with the result and an "AbortError" DOMException.
- rejectPlayPromises(
- AbortError,
- "The play() request was interrupted by a new load request.");
+ if (!ScriptForbiddenScope::isScriptForbidden()) {
mlamouri (slow - plz ping) 2016/12/23 12:00:26 Why is the script forbidden here?
Anton Obzhirov 2017/01/09 15:35:54 Plz check https://cs.chromium.org/chromium/src/thi
+ rejectPlayPromises(
+ AbortError,
+ "The play() request was interrupted by a new load request.");
+ } else {
+ scheduleRejectPlayPromises(AbortError);
foolip 2017/01/04 15:49:00 It's fairly likely that it's still forbidden in a
Anton Obzhirov 2017/01/09 15:35:54 I see, will remove it.
haraken 2017/01/21 01:49:13 scheduleRejectPlayPromises schedules a task on a n
Anton Obzhirov 2017/01/21 20:30:58 It seemed to work in this particular case, I mean
+ }
}
// 4.7 - If seeking is true, set it to false.

Powered by Google App Engine
This is Rietveld 408576698