| 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 3554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3565 | 3565 |
| 3566 if (m_webLayer) | 3566 if (m_webLayer) |
| 3567 GraphicsLayer::unregisterContentsLayer(m_webLayer); | 3567 GraphicsLayer::unregisterContentsLayer(m_webLayer); |
| 3568 m_webLayer = webLayer; | 3568 m_webLayer = webLayer; |
| 3569 if (m_webLayer) | 3569 if (m_webLayer) |
| 3570 GraphicsLayer::registerContentsLayer(m_webLayer); | 3570 GraphicsLayer::registerContentsLayer(m_webLayer); |
| 3571 } | 3571 } |
| 3572 | 3572 |
| 3573 void HTMLMediaElement::mediaSourceOpened(WebMediaSource* webMediaSource) | 3573 void HTMLMediaElement::mediaSourceOpened(WebMediaSource* webMediaSource) |
| 3574 { | 3574 { |
| 3575 setShouldDelayLoadEvent(false); |
| 3575 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource)); | 3576 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource)); |
| 3576 } | 3577 } |
| 3577 | 3578 |
| 3578 bool HTMLMediaElement::isInteractiveContent() const | 3579 bool HTMLMediaElement::isInteractiveContent() const |
| 3579 { | 3580 { |
| 3580 return fastHasAttribute(controlsAttr); | 3581 return fastHasAttribute(controlsAttr); |
| 3581 } | 3582 } |
| 3582 | 3583 |
| 3583 void HTMLMediaElement::defaultEventHandler(Event* event) | 3584 void HTMLMediaElement::defaultEventHandler(Event* event) |
| 3584 { | 3585 { |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3881 | 3882 |
| 3882 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co
nst | 3883 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co
nst |
| 3883 { | 3884 { |
| 3884 IntRect result; | 3885 IntRect result; |
| 3885 if (LayoutObject* object = m_element->layoutObject()) | 3886 if (LayoutObject* object = m_element->layoutObject()) |
| 3886 result = object->absoluteBoundingBoxRect(); | 3887 result = object->absoluteBoundingBoxRect(); |
| 3887 return result; | 3888 return result; |
| 3888 } | 3889 } |
| 3889 | 3890 |
| 3890 } // namespace blink | 3891 } // namespace blink |
| OLD | NEW |