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

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

Issue 2021573002: MSE: Reset delaying-the-load-event-flag on attachment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed foolip@'s nits Created 4 years, 6 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 3595 matching lines...) Expand 10 before | Expand all | Expand 10 after
3606 3606
3607 if (m_webLayer) 3607 if (m_webLayer)
3608 GraphicsLayer::unregisterContentsLayer(m_webLayer); 3608 GraphicsLayer::unregisterContentsLayer(m_webLayer);
3609 m_webLayer = webLayer; 3609 m_webLayer = webLayer;
3610 if (m_webLayer) 3610 if (m_webLayer)
3611 GraphicsLayer::registerContentsLayer(m_webLayer); 3611 GraphicsLayer::registerContentsLayer(m_webLayer);
3612 } 3612 }
3613 3613
3614 void HTMLMediaElement::mediaSourceOpened(WebMediaSource* webMediaSource) 3614 void HTMLMediaElement::mediaSourceOpened(WebMediaSource* webMediaSource)
3615 { 3615 {
3616 setShouldDelayLoadEvent(false);
3616 m_mediaSource->setWebMediaSourceAndOpen(wrapUnique(webMediaSource)); 3617 m_mediaSource->setWebMediaSourceAndOpen(wrapUnique(webMediaSource));
3617 } 3618 }
3618 3619
3619 bool HTMLMediaElement::isInteractiveContent() const 3620 bool HTMLMediaElement::isInteractiveContent() const
3620 { 3621 {
3621 return fastHasAttribute(controlsAttr); 3622 return fastHasAttribute(controlsAttr);
3622 } 3623 }
3623 3624
3624 void HTMLMediaElement::defaultEventHandler(Event* event) 3625 void HTMLMediaElement::defaultEventHandler(Event* event)
3625 { 3626 {
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
3986 3987
3987 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst 3988 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst
3988 { 3989 {
3989 IntRect result; 3990 IntRect result;
3990 if (LayoutObject* object = m_element->layoutObject()) 3991 if (LayoutObject* object = m_element->layoutObject())
3991 result = object->absoluteBoundingBoxRect(); 3992 result = object->absoluteBoundingBoxRect();
3992 return result; 3993 return result;
3993 } 3994 }
3994 3995
3995 } // namespace blink 3996 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/media/media-source/mediasource-attach-stops-delaying-load-event.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698