| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 2011, 2012 Google Inc. All rights 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 , m_durationDisplay(nullptr) | 57 , m_durationDisplay(nullptr) |
| 58 , m_enclosure(nullptr) | 58 , m_enclosure(nullptr) |
| 59 , m_hideMediaControlsTimer(this, &MediaControls::hideMediaControlsTimerFired
) | 59 , m_hideMediaControlsTimer(this, &MediaControls::hideMediaControlsTimerFired
) |
| 60 , m_isMouseOverControls(false) | 60 , m_isMouseOverControls(false) |
| 61 , m_isPausedForScrubbing(false) | 61 , m_isPausedForScrubbing(false) |
| 62 { | 62 { |
| 63 } | 63 } |
| 64 | 64 |
| 65 PassRefPtrWillBeRawPtr<MediaControls> MediaControls::create(HTMLMediaElement& me
diaElement) | 65 PassRefPtrWillBeRawPtr<MediaControls> MediaControls::create(HTMLMediaElement& me
diaElement) |
| 66 { | 66 { |
| 67 RefPtrWillBeRawPtr<MediaControls> controls = adoptRefWillBeRefCountedGarbage
Collected(new MediaControls(mediaElement)); | 67 RefPtrWillBeRawPtr<MediaControls> controls = adoptRefWillBeNoop(new MediaCon
trols(mediaElement)); |
| 68 | 68 |
| 69 if (controls->initializeControls()) | 69 if (controls->initializeControls()) |
| 70 return controls.release(); | 70 return controls.release(); |
| 71 | 71 |
| 72 return nullptr; | 72 return nullptr; |
| 73 } | 73 } |
| 74 | 74 |
| 75 bool MediaControls::initializeControls() | 75 bool MediaControls::initializeControls() |
| 76 { | 76 { |
| 77 TrackExceptionState exceptionState; | 77 TrackExceptionState exceptionState; |
| (...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 472 visitor->trace(m_muteButton); | 472 visitor->trace(m_muteButton); |
| 473 visitor->trace(m_volumeSlider); | 473 visitor->trace(m_volumeSlider); |
| 474 visitor->trace(m_toggleClosedCaptionsButton); | 474 visitor->trace(m_toggleClosedCaptionsButton); |
| 475 visitor->trace(m_fullScreenButton); | 475 visitor->trace(m_fullScreenButton); |
| 476 visitor->trace(m_durationDisplay); | 476 visitor->trace(m_durationDisplay); |
| 477 visitor->trace(m_enclosure); | 477 visitor->trace(m_enclosure); |
| 478 HTMLDivElement::trace(visitor); | 478 HTMLDivElement::trace(visitor); |
| 479 } | 479 } |
| 480 | 480 |
| 481 } | 481 } |
| OLD | NEW |