Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 227 void textTrackAddCue(TextTrack*, PassRefPtrWillBeRawPtr<TextTrackCue>); | 227 void textTrackAddCue(TextTrack*, PassRefPtrWillBeRawPtr<TextTrackCue>); |
| 228 void textTrackRemoveCue(TextTrack*, PassRefPtrWillBeRawPtr<TextTrackCue>); | 228 void textTrackRemoveCue(TextTrack*, PassRefPtrWillBeRawPtr<TextTrackCue>); |
| 229 | 229 |
| 230 // EventTarget function. | 230 // EventTarget function. |
| 231 // Both Node (via HTMLElement) and ActiveDOMObject define this method, which | 231 // Both Node (via HTMLElement) and ActiveDOMObject define this method, which |
| 232 // causes an ambiguity error at compile time. This class's constructor | 232 // causes an ambiguity error at compile time. This class's constructor |
| 233 // ensures that both implementations return document, so return the result | 233 // ensures that both implementations return document, so return the result |
| 234 // of one of them here. | 234 // of one of them here. |
| 235 virtual ExecutionContext* executionContext() const OVERRIDE FINAL { return H TMLElement::executionContext(); } | 235 virtual ExecutionContext* executionContext() const OVERRIDE FINAL { return H TMLElement::executionContext(); } |
| 236 | 236 |
| 237 bool hasSingleSecurityOrigin() const { return !m_player || m_player->hasSing leSecurityOrigin(); } | 237 bool hasSingleSecurityOrigin() const { return webMediaPlayer() && webMediaPl ayer()->hasSingleSecurityOrigin(); } |
|
philipj_slow
2014/05/27 20:54:56
Did you deliberately change the return value when
| |
| 238 | 238 |
| 239 bool isFullscreen() const; | 239 bool isFullscreen() const; |
| 240 void enterFullscreen(); | 240 void enterFullscreen(); |
| 241 void exitFullscreen(); | 241 void exitFullscreen(); |
| 242 | 242 |
| 243 bool hasClosedCaptions() const; | 243 bool hasClosedCaptions() const; |
| 244 bool closedCaptionsVisible() const; | 244 bool closedCaptionsVisible() const; |
| 245 void setClosedCaptionsVisible(bool); | 245 void setClosedCaptionsVisible(bool); |
| 246 | 246 |
| 247 MediaControls* mediaControls() const; | 247 MediaControls* mediaControls() const; |
| (...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 553 inline bool isHTMLMediaElement(const HTMLElement& element) | 553 inline bool isHTMLMediaElement(const HTMLElement& element) |
| 554 { | 554 { |
| 555 return isHTMLAudioElement(element) || isHTMLVideoElement(element); | 555 return isHTMLAudioElement(element) || isHTMLVideoElement(element); |
| 556 } | 556 } |
| 557 | 557 |
| 558 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); | 558 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); |
| 559 | 559 |
| 560 } //namespace | 560 } //namespace |
| 561 | 561 |
| 562 #endif | 562 #endif |
| OLD | NEW |