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 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 599 prepareToPlay(); | 599 prepareToPlay(); |
| 600 } | 600 } |
| 601 | 601 |
| 602 void HTMLMediaElement::prepareForLoad() | 602 void HTMLMediaElement::prepareForLoad() |
| 603 { | 603 { |
| 604 WTF_LOG(Media, "HTMLMediaElement::prepareForLoad"); | 604 WTF_LOG(Media, "HTMLMediaElement::prepareForLoad"); |
| 605 | 605 |
| 606 // Perform the cleanup required for the resource load algorithm to run. | 606 // Perform the cleanup required for the resource load algorithm to run. |
| 607 stopPeriodicTimers(); | 607 stopPeriodicTimers(); |
| 608 m_loadTimer.stop(); | 608 m_loadTimer.stop(); |
| 609 // FIXME: Figure out appropriate place to reset LoadTextTrackResource if nec essary and set m_pendingActionFlags to 0 here. | |
|
acolwell GONE FROM CHROMIUM
2014/03/26 01:13:30
I will fix this in a follow-up CL since making thi
| |
| 610 m_pendingActionFlags &= ~LoadMediaResource; | |
| 609 m_sentEndEvent = false; | 611 m_sentEndEvent = false; |
| 610 m_sentStalledEvent = false; | 612 m_sentStalledEvent = false; |
| 611 m_haveFiredLoadedData = false; | 613 m_haveFiredLoadedData = false; |
| 612 m_completelyLoaded = false; | 614 m_completelyLoaded = false; |
| 613 m_havePreparedToPlay = false; | 615 m_havePreparedToPlay = false; |
| 614 m_displayMode = Unknown; | 616 m_displayMode = Unknown; |
| 615 | 617 |
| 616 // 1 - Abort any already-running instance of the resource selection algorith m for this element. | 618 // 1 - Abort any already-running instance of the resource selection algorith m for this element. |
| 617 m_loadState = WaitingForSource; | 619 m_loadState = WaitingForSource; |
| 618 m_currentSourceNode = nullptr; | 620 m_currentSourceNode = nullptr; |
| (...skipping 3040 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3659 { | 3661 { |
| 3660 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource)); | 3662 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource)); |
| 3661 } | 3663 } |
| 3662 | 3664 |
| 3663 bool HTMLMediaElement::isInteractiveContent() const | 3665 bool HTMLMediaElement::isInteractiveContent() const |
| 3664 { | 3666 { |
| 3665 return fastHasAttribute(controlsAttr); | 3667 return fastHasAttribute(controlsAttr); |
| 3666 } | 3668 } |
| 3667 | 3669 |
| 3668 } | 3670 } |
| OLD | NEW |