Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 2973 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2984 if (remotePlaybackClient()) | 2984 if (remotePlaybackClient()) |
| 2985 remotePlaybackClient()->stateChanged(WebRemotePlaybackState::Disconnecte d); | 2985 remotePlaybackClient()->stateChanged(WebRemotePlaybackState::Disconnecte d); |
| 2986 } | 2986 } |
| 2987 | 2987 |
| 2988 void HTMLMediaElement::cancelledRemotePlaybackRequest() | 2988 void HTMLMediaElement::cancelledRemotePlaybackRequest() |
| 2989 { | 2989 { |
| 2990 if (remotePlaybackClient()) | 2990 if (remotePlaybackClient()) |
| 2991 remotePlaybackClient()->connectCancelled(); | 2991 remotePlaybackClient()->connectCancelled(); |
| 2992 } | 2992 } |
| 2993 | 2993 |
| 2994 void HTMLMediaElement::requestReload(const WebURL& newUrl) | |
| 2995 { | |
| 2996 DCHECK(webMediaPlayer()); | |
| 2997 DCHECK(!m_srcObject); | |
| 2998 resetMediaPlayerAndMediaSource(); | |
| 2999 ContentType contentType((String())); | |
| 3000 loadResource(WebMediaPlayerSource(newUrl), contentType); | |
|
foolip
2016/06/22 13:10:54
This will still have the problems with changing m_
DaleCurtis
2016/06/22 14:28:35
I'm not sure I follow the differences from what's
foolip
2016/06/22 16:01:52
Yeah, I'm suggesting to make the order more like t
DaleCurtis
2016/06/22 16:17:41
StartPlayerLoad() also uses m_currentSrc though, s
foolip
2016/06/22 18:00:49
Oh, that's a problem. It's a bit silly that loadRe
DaleCurtis
2016/06/22 23:16:14
I started going down this path and it quickly esca
| |
| 3001 } | |
| 3002 | |
| 2994 // MediaPlayerPresentation methods | 3003 // MediaPlayerPresentation methods |
| 2995 void HTMLMediaElement::repaint() | 3004 void HTMLMediaElement::repaint() |
| 2996 { | 3005 { |
| 2997 if (m_webLayer) | 3006 if (m_webLayer) |
| 2998 m_webLayer->invalidate(); | 3007 m_webLayer->invalidate(); |
| 2999 | 3008 |
| 3000 updateDisplayState(); | 3009 updateDisplayState(); |
| 3001 if (layoutObject()) | 3010 if (layoutObject()) |
| 3002 layoutObject()->setShouldDoFullPaintInvalidation(); | 3011 layoutObject()->setShouldDoFullPaintInvalidation(); |
| 3003 } | 3012 } |
| (...skipping 982 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3986 | 3995 |
| 3987 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst | 3996 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst |
| 3988 { | 3997 { |
| 3989 IntRect result; | 3998 IntRect result; |
| 3990 if (LayoutObject* object = m_element->layoutObject()) | 3999 if (LayoutObject* object = m_element->layoutObject()) |
| 3991 result = object->absoluteBoundingBoxRect(); | 4000 result = object->absoluteBoundingBoxRect(); |
| 3992 return result; | 4001 return result; |
| 3993 } | 4002 } |
| 3994 | 4003 |
| 3995 } // namespace blink | 4004 } // namespace blink |
| OLD | NEW |