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

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

Issue 208483002: Implement the activation behavior of media elements (click to play/pause) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: cancel activation behavior in a failing fullscreen test Created 6 years, 9 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
« no previous file with comments | « Source/core/html/shadow/MediaControlElements.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 { 70 {
71 return adoptRef(new MediaControlPanelElement(mediaControls)); 71 return adoptRef(new MediaControlPanelElement(mediaControls));
72 } 72 }
73 73
74 const AtomicString& MediaControlPanelElement::shadowPseudoId() const 74 const AtomicString& MediaControlPanelElement::shadowPseudoId() const
75 { 75 {
76 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-panel", Atomi cString::ConstructFromLiteral)); 76 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-panel", Atomi cString::ConstructFromLiteral));
77 return id; 77 return id;
78 } 78 }
79 79
80 void MediaControlPanelElement::defaultEventHandler(Event* event)
81 {
82 // Suppress the media element activation behavior (toggle play/pause) when
83 // any part of the control panel is clicked.
84 if (event->type() == EventTypeNames::click) {
85 event->setDefaultHandled();
86 return;
87 }
88 HTMLDivElement::defaultEventHandler(event);
89 }
90
80 void MediaControlPanelElement::startTimer() 91 void MediaControlPanelElement::startTimer()
81 { 92 {
82 stopTimer(); 93 stopTimer();
83 94
84 // The timer is required to set the property display:'none' on the panel, 95 // The timer is required to set the property display:'none' on the panel,
85 // such that captions are correctly displayed at the bottom of the video 96 // such that captions are correctly displayed at the bottom of the video
86 // at the end of the fadeout transition. 97 // at the end of the fadeout transition.
87 // FIXME: Racing a transition with a setTimeout like this is wrong. 98 // FIXME: Racing a transition with a setTimeout like this is wrong.
88 m_transitionTimer.startOneShot(fadeOutDuration, FROM_HERE); 99 m_transitionTimer.startOneShot(fadeOutDuration, FROM_HERE);
89 } 100 }
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
663 float fontSize = smallestDimension * 0.05f; 674 float fontSize = smallestDimension * 0.05f;
664 if (fontSize != m_fontSize) { 675 if (fontSize != m_fontSize) {
665 m_fontSize = fontSize; 676 m_fontSize = fontSize;
666 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue: :CSS_PX); 677 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue: :CSS_PX);
667 } 678 }
668 } 679 }
669 680
670 // ---------------------------- 681 // ----------------------------
671 682
672 } // namespace WebCore 683 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/shadow/MediaControlElements.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698