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

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

Issue 892963003: Ensure media control goes to transparent(hide) after seek by touch (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 } 127 }
128 128
129 void MediaControlPanelElement::transitionTimerFired(Timer<MediaControlPanelEleme nt>*) 129 void MediaControlPanelElement::transitionTimerFired(Timer<MediaControlPanelEleme nt>*)
130 { 130 {
131 if (!m_opaque) 131 if (!m_opaque)
132 hide(); 132 hide();
133 133
134 stopTimer(); 134 stopTimer();
135 } 135 }
136 136
137 bool MediaControlPanelElement::isOpaque()
138 {
139 return m_opaque;
140 }
141
137 void MediaControlPanelElement::makeOpaque() 142 void MediaControlPanelElement::makeOpaque()
138 { 143 {
139 if (m_opaque) 144 if (m_opaque)
140 return; 145 return;
141 146
142 setInlineStyleProperty(CSSPropertyOpacity, 1.0, CSSPrimitiveValue::CSS_NUMBE R); 147 setInlineStyleProperty(CSSPropertyOpacity, 1.0, CSSPrimitiveValue::CSS_NUMBE R);
143 m_opaque = true; 148 m_opaque = true;
144 149
145 if (m_isDisplayed) 150 if (m_isDisplayed)
146 show(); 151 show();
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 float fontSize = smallestDimension * 0.05f; 714 float fontSize = smallestDimension * 0.05f;
710 if (fontSize != m_fontSize) { 715 if (fontSize != m_fontSize) {
711 m_fontSize = fontSize; 716 m_fontSize = fontSize;
712 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue: :CSS_PX); 717 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue: :CSS_PX);
713 } 718 }
714 } 719 }
715 720
716 // ---------------------------- 721 // ----------------------------
717 722
718 } // namespace blink 723 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698