Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(377)

Side by Side Diff: third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp

Issue 1362973004: Rename FROM_HERE to BLINK_FROM_HERE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 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 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 } 125 }
126 126
127 void MediaControlPanelElement::startTimer() 127 void MediaControlPanelElement::startTimer()
128 { 128 {
129 stopTimer(); 129 stopTimer();
130 130
131 // The timer is required to set the property display:'none' on the panel, 131 // The timer is required to set the property display:'none' on the panel,
132 // such that captions are correctly displayed at the bottom of the video 132 // such that captions are correctly displayed at the bottom of the video
133 // at the end of the fadeout transition. 133 // at the end of the fadeout transition.
134 // FIXME: Racing a transition with a setTimeout like this is wrong. 134 // FIXME: Racing a transition with a setTimeout like this is wrong.
135 m_transitionTimer.startOneShot(fadeOutDuration, FROM_HERE); 135 m_transitionTimer.startOneShot(fadeOutDuration, BLINK_FROM_HERE);
136 } 136 }
137 137
138 void MediaControlPanelElement::stopTimer() 138 void MediaControlPanelElement::stopTimer()
139 { 139 {
140 if (m_transitionTimer.isActive()) 140 if (m_transitionTimer.isActive())
141 m_transitionTimer.stop(); 141 m_transitionTimer.stop();
142 } 142 }
143 143
144 void MediaControlPanelElement::transitionTimerFired(Timer<MediaControlPanelEleme nt>*) 144 void MediaControlPanelElement::transitionTimerFired(Timer<MediaControlPanelEleme nt>*)
145 { 145 {
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 } 655 }
656 656
657 PassRefPtrWillBeRawPtr<MediaControlCurrentTimeDisplayElement> MediaControlCurren tTimeDisplayElement::create(MediaControls& mediaControls) 657 PassRefPtrWillBeRawPtr<MediaControlCurrentTimeDisplayElement> MediaControlCurren tTimeDisplayElement::create(MediaControls& mediaControls)
658 { 658 {
659 RefPtrWillBeRawPtr<MediaControlCurrentTimeDisplayElement> element = adoptRef WillBeNoop(new MediaControlCurrentTimeDisplayElement(mediaControls)); 659 RefPtrWillBeRawPtr<MediaControlCurrentTimeDisplayElement> element = adoptRef WillBeNoop(new MediaControlCurrentTimeDisplayElement(mediaControls));
660 element->setShadowPseudoId(AtomicString("-webkit-media-controls-current-time -display", AtomicString::ConstructFromLiteral)); 660 element->setShadowPseudoId(AtomicString("-webkit-media-controls-current-time -display", AtomicString::ConstructFromLiteral));
661 return element.release(); 661 return element.release();
662 } 662 }
663 663
664 } // namespace blink 664 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698