| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 3677 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3688 | 3688 |
| 3689 if (m_webLayer) | 3689 if (m_webLayer) |
| 3690 GraphicsLayer::unregisterContentsLayer(m_webLayer); | 3690 GraphicsLayer::unregisterContentsLayer(m_webLayer); |
| 3691 m_webLayer = webLayer; | 3691 m_webLayer = webLayer; |
| 3692 if (m_webLayer) | 3692 if (m_webLayer) |
| 3693 GraphicsLayer::registerContentsLayer(m_webLayer); | 3693 GraphicsLayer::registerContentsLayer(m_webLayer); |
| 3694 } | 3694 } |
| 3695 | 3695 |
| 3696 void HTMLMediaElement::mediaSourceOpened(WebMediaSource* webMediaSource) { | 3696 void HTMLMediaElement::mediaSourceOpened(WebMediaSource* webMediaSource) { |
| 3697 setShouldDelayLoadEvent(false); | 3697 setShouldDelayLoadEvent(false); |
| 3698 m_mediaSource->setWebMediaSourceAndOpen(wrapUnique(webMediaSource)); | 3698 m_mediaSource->setWebMediaSourceAndOpen(WTF::wrapUnique(webMediaSource)); |
| 3699 } | 3699 } |
| 3700 | 3700 |
| 3701 bool HTMLMediaElement::isInteractiveContent() const { | 3701 bool HTMLMediaElement::isInteractiveContent() const { |
| 3702 return fastHasAttribute(controlsAttr); | 3702 return fastHasAttribute(controlsAttr); |
| 3703 } | 3703 } |
| 3704 | 3704 |
| 3705 DEFINE_TRACE(HTMLMediaElement) { | 3705 DEFINE_TRACE(HTMLMediaElement) { |
| 3706 visitor->trace(m_playedTimeRanges); | 3706 visitor->trace(m_playedTimeRanges); |
| 3707 visitor->trace(m_asyncEventQueue); | 3707 visitor->trace(m_asyncEventQueue); |
| 3708 visitor->trace(m_error); | 3708 visitor->trace(m_error); |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4053 kMostlyFillViewportBecomeStableSeconds, BLINK_FROM_HERE); | 4053 kMostlyFillViewportBecomeStableSeconds, BLINK_FROM_HERE); |
| 4054 } | 4054 } |
| 4055 | 4055 |
| 4056 void HTMLMediaElement::viewportFillDebouncerTimerFired(TimerBase*) { | 4056 void HTMLMediaElement::viewportFillDebouncerTimerFired(TimerBase*) { |
| 4057 m_mostlyFillingViewport = true; | 4057 m_mostlyFillingViewport = true; |
| 4058 if (m_webMediaPlayer) | 4058 if (m_webMediaPlayer) |
| 4059 m_webMediaPlayer->becameDominantVisibleContent(m_mostlyFillingViewport); | 4059 m_webMediaPlayer->becameDominantVisibleContent(m_mostlyFillingViewport); |
| 4060 } | 4060 } |
| 4061 | 4061 |
| 4062 } // namespace blink | 4062 } // namespace blink |
| OLD | NEW |