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

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

Issue 302603003: Cleanup tests related to controls hiding/fading in/out (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Tweaks. Created 6 years, 7 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 | Annotate | Revision Log
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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "core/rendering/RenderTheme.h" 48 #include "core/rendering/RenderTheme.h"
49 #include "core/rendering/RenderVideo.h" 49 #include "core/rendering/RenderVideo.h"
50 50
51 namespace WebCore { 51 namespace WebCore {
52 52
53 using namespace HTMLNames; 53 using namespace HTMLNames;
54 54
55 static const AtomicString& getMediaControlCurrentTimeDisplayElementShadowPseudoI d(); 55 static const AtomicString& getMediaControlCurrentTimeDisplayElementShadowPseudoI d();
56 static const AtomicString& getMediaControlTimeRemainingDisplayElementShadowPseud oId(); 56 static const AtomicString& getMediaControlTimeRemainingDisplayElementShadowPseud oId();
57 57
58 // If you change any of the following fade durations, then also update the
59 // corresponding values in LayoutTests/media/media-controls.js.
58 static const double fadeInDuration = 0.1; 60 static const double fadeInDuration = 0.1;
59 static const double fadeOutDuration = 0.3; 61 static const double fadeOutDuration = 0.3;
60 62
61 MediaControlPanelElement::MediaControlPanelElement(MediaControls& mediaControls) 63 MediaControlPanelElement::MediaControlPanelElement(MediaControls& mediaControls)
62 : MediaControlDivElement(mediaControls, MediaControlsPanel) 64 : MediaControlDivElement(mediaControls, MediaControlsPanel)
63 , m_isDisplayed(false) 65 , m_isDisplayed(false)
64 , m_opaque(true) 66 , m_opaque(true)
65 , m_transitionTimer(this, &MediaControlPanelElement::transitionTimerFired) 67 , m_transitionTimer(this, &MediaControlPanelElement::transitionTimerFired)
66 { 68 {
67 } 69 }
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 float fontSize = smallestDimension * 0.05f; 676 float fontSize = smallestDimension * 0.05f;
675 if (fontSize != m_fontSize) { 677 if (fontSize != m_fontSize) {
676 m_fontSize = fontSize; 678 m_fontSize = fontSize;
677 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue: :CSS_PX); 679 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue: :CSS_PX);
678 } 680 }
679 } 681 }
680 682
681 // ---------------------------- 683 // ----------------------------
682 684
683 } // namespace WebCore 685 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/media/video-controls-visible-exiting-fullscreen.html ('k') | Source/core/html/shadow/MediaControls.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698