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

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

Issue 456323002: [WIP] Re-implement MediaControls in Blink-in-JS (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 if (!mediaNode) 53 if (!mediaNode)
54 mediaNode = node; 54 mediaNode = node;
55 if (!isHTMLMediaElement(mediaNode)) 55 if (!isHTMLMediaElement(mediaNode))
56 return 0; 56 return 0;
57 57
58 return toHTMLMediaElement(mediaNode); 58 return toHTMLMediaElement(mediaNode);
59 } 59 }
60 60
61 MediaControlElementType mediaControlElementType(Node* node) 61 MediaControlElementType mediaControlElementType(Node* node)
62 { 62 {
63 ASSERT_WITH_SECURITY_IMPLICATION(node->isMediaControlElement()); 63 // TODO: Enable this assertion again
64 //ASSERT_WITH_SECURITY_IMPLICATION(node->isMediaControlElement());
64 HTMLElement* element = toHTMLElement(node); 65 HTMLElement* element = toHTMLElement(node);
65 if (isHTMLInputElement(*element)) 66 if (isHTMLInputElement(*element))
66 return static_cast<MediaControlInputElement*>(element)->displayType(); 67 return static_cast<MediaControlInputElement*>(element)->displayType();
67 return static_cast<MediaControlDivElement*>(element)->displayType(); 68 return static_cast<MediaControlDivElement*>(element)->displayType();
68 } 69 }
69 70
70 MediaControlElement::MediaControlElement(MediaControls& mediaControls, MediaCont rolElementType displayType, HTMLElement* element) 71 MediaControlElement::MediaControlElement(MediaControls& mediaControls, MediaCont rolElementType displayType, HTMLElement* element)
71 : m_mediaControls(mediaControls) 72 : m_mediaControls(mediaControls)
72 , m_displayType(displayType) 73 , m_displayType(displayType)
73 , m_element(element) 74 , m_element(element)
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 , m_currentValue(0) 145 , m_currentValue(0)
145 { 146 {
146 } 147 }
147 148
148 void MediaControlTimeDisplayElement::setCurrentValue(double time) 149 void MediaControlTimeDisplayElement::setCurrentValue(double time)
149 { 150 {
150 m_currentValue = time; 151 m_currentValue = time;
151 } 152 }
152 153
153 } // namespace blink 154 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698