| OLD | NEW |
| 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 , m_displayType(displayType) | 72 , m_displayType(displayType) |
| 73 , m_element(element) | 73 , m_element(element) |
| 74 { | 74 { |
| 75 } | 75 } |
| 76 | 76 |
| 77 HTMLMediaElement& MediaControlElement::mediaElement() const | 77 HTMLMediaElement& MediaControlElement::mediaElement() const |
| 78 { | 78 { |
| 79 return mediaControls().mediaElement(); | 79 return mediaControls().mediaElement(); |
| 80 } | 80 } |
| 81 | 81 |
| 82 MediaControllerInterface& MediaControlElement::mediaControllerInterface() const | |
| 83 { | |
| 84 return mediaControls().mediaControllerInterface(); | |
| 85 } | |
| 86 | |
| 87 void MediaControlElement::hide() | 82 void MediaControlElement::hide() |
| 88 { | 83 { |
| 89 m_element->setInlineStyleProperty(CSSPropertyDisplay, CSSValueNone); | 84 m_element->setInlineStyleProperty(CSSPropertyDisplay, CSSValueNone); |
| 90 } | 85 } |
| 91 | 86 |
| 92 void MediaControlElement::show() | 87 void MediaControlElement::show() |
| 93 { | 88 { |
| 94 m_element->removeInlineStyleProperty(CSSPropertyDisplay); | 89 m_element->removeInlineStyleProperty(CSSPropertyDisplay); |
| 95 } | 90 } |
| 96 | 91 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 , m_currentValue(0) | 127 , m_currentValue(0) |
| 133 { | 128 { |
| 134 } | 129 } |
| 135 | 130 |
| 136 void MediaControlTimeDisplayElement::setCurrentValue(double time) | 131 void MediaControlTimeDisplayElement::setCurrentValue(double time) |
| 137 { | 132 { |
| 138 m_currentValue = time; | 133 m_currentValue = time; |
| 139 } | 134 } |
| 140 | 135 |
| 141 } // namespace WebCore | 136 } // namespace WebCore |
| OLD | NEW |