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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

Issue 2347763002: [Blink, RemotePlayback] Reject the prompt() with OperationError if there's a pending promise for th… (Closed)
Patch Set: Addressed Mounir's comments Created 4 years, 2 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 2183 matching lines...) Expand 10 before | Expand all | Expand 10 after
2194 scheduleTimeupdateEvent(false); 2194 scheduleTimeupdateEvent(false);
2195 scheduleEvent(EventTypeNames::pause); 2195 scheduleEvent(EventTypeNames::pause);
2196 scheduleRejectPlayPromises(AbortError); 2196 scheduleRejectPlayPromises(AbortError);
2197 } 2197 }
2198 2198
2199 updatePlayState(); 2199 updatePlayState();
2200 } 2200 }
2201 2201
2202 void HTMLMediaElement::requestRemotePlayback() 2202 void HTMLMediaElement::requestRemotePlayback()
2203 { 2203 {
2204 DCHECK(m_remoteRoutesAvailable); 2204 if (webMediaPlayer())
2205 webMediaPlayer()->requestRemotePlayback(); 2205 webMediaPlayer()->requestRemotePlayback();
2206 } 2206 }
2207 2207
2208 void HTMLMediaElement::requestRemotePlaybackControl() 2208 void HTMLMediaElement::requestRemotePlaybackControl()
2209 { 2209 {
2210 DCHECK(m_remoteRoutesAvailable); 2210 if (webMediaPlayer())
2211 webMediaPlayer()->requestRemotePlaybackControl(); 2211 webMediaPlayer()->requestRemotePlaybackControl();
2212 } 2212 }
2213 2213
2214 void HTMLMediaElement::closeMediaSource() 2214 void HTMLMediaElement::closeMediaSource()
2215 { 2215 {
2216 if (!m_mediaSource) 2216 if (!m_mediaSource)
2217 return; 2217 return;
2218 2218
2219 m_mediaSource->close(); 2219 m_mediaSource->close();
2220 m_mediaSource = nullptr; 2220 m_mediaSource = nullptr;
2221 } 2221 }
(...skipping 1805 matching lines...) Expand 10 before | Expand all | Expand 10 after
4027 4027
4028 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst 4028 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst
4029 { 4029 {
4030 IntRect result; 4030 IntRect result;
4031 if (LayoutObject* object = m_element->layoutObject()) 4031 if (LayoutObject* object = m_element->layoutObject())
4032 result = object->absoluteBoundingBoxRect(); 4032 result = object->absoluteBoundingBoxRect();
4033 return result; 4033 return result;
4034 } 4034 }
4035 4035
4036 } // namespace blink 4036 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698