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 3594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3605 | 3605 |
3606 if (m_webLayer) | 3606 if (m_webLayer) |
3607 GraphicsLayer::unregisterContentsLayer(m_webLayer); | 3607 GraphicsLayer::unregisterContentsLayer(m_webLayer); |
3608 m_webLayer = webLayer; | 3608 m_webLayer = webLayer; |
3609 if (m_webLayer) | 3609 if (m_webLayer) |
3610 GraphicsLayer::registerContentsLayer(m_webLayer); | 3610 GraphicsLayer::registerContentsLayer(m_webLayer); |
3611 } | 3611 } |
3612 | 3612 |
3613 void HTMLMediaElement::mediaSourceOpened(WebMediaSource* webMediaSource) | 3613 void HTMLMediaElement::mediaSourceOpened(WebMediaSource* webMediaSource) |
3614 { | 3614 { |
| 3615 setShouldDelayLoadEvent(false); |
3615 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource)); | 3616 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource)); |
3616 } | 3617 } |
3617 | 3618 |
3618 bool HTMLMediaElement::isInteractiveContent() const | 3619 bool HTMLMediaElement::isInteractiveContent() const |
3619 { | 3620 { |
3620 return fastHasAttribute(controlsAttr); | 3621 return fastHasAttribute(controlsAttr); |
3621 } | 3622 } |
3622 | 3623 |
3623 void HTMLMediaElement::defaultEventHandler(Event* event) | 3624 void HTMLMediaElement::defaultEventHandler(Event* event) |
3624 { | 3625 { |
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3984 | 3985 |
3985 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co
nst | 3986 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co
nst |
3986 { | 3987 { |
3987 IntRect result; | 3988 IntRect result; |
3988 if (LayoutObject* object = m_element->layoutObject()) | 3989 if (LayoutObject* object = m_element->layoutObject()) |
3989 result = object->absoluteBoundingBoxRect(); | 3990 result = object->absoluteBoundingBoxRect(); |
3990 return result; | 3991 return result; |
3991 } | 3992 } |
3992 | 3993 |
3993 } // namespace blink | 3994 } // namespace blink |
OLD | NEW |