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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
243 void textTrackAddCue(TextTrack*, PassRefPtrWillBeRawPtr<TextTrackCue>); | 243 void textTrackAddCue(TextTrack*, PassRefPtrWillBeRawPtr<TextTrackCue>); |
244 void textTrackRemoveCue(TextTrack*, PassRefPtrWillBeRawPtr<TextTrackCue>); | 244 void textTrackRemoveCue(TextTrack*, PassRefPtrWillBeRawPtr<TextTrackCue>); |
245 | 245 |
246 // EventTarget function. | 246 // EventTarget function. |
247 // Both Node (via HTMLElement) and ActiveDOMObject define this method, which | 247 // Both Node (via HTMLElement) and ActiveDOMObject define this method, which |
248 // causes an ambiguity error at compile time. This class's constructor | 248 // causes an ambiguity error at compile time. This class's constructor |
249 // ensures that both implementations return document, so return the result | 249 // ensures that both implementations return document, so return the result |
250 // of one of them here. | 250 // of one of them here. |
251 using HTMLElement::executionContext; | 251 using HTMLElement::executionContext; |
252 | 252 |
253 bool hasSingleSecurityOrigin() const { return !m_player || m_player->hasSing leSecurityOrigin(); } | 253 bool hasSingleSecurityOrigin() const { return webMediaPlayer() && webMediaPl ayer()->hasSingleSecurityOrigin(); } |
acolwell GONE FROM CHROMIUM
2014/07/08 00:26:33
Isn't this a behavior change? Shouldn't this be !m
Srirama
2014/07/08 05:06:52
Done.
| |
254 | 254 |
255 bool isFullscreen() const; | 255 bool isFullscreen() const; |
256 void enterFullscreen(); | 256 void enterFullscreen(); |
257 void exitFullscreen(); | 257 void exitFullscreen(); |
258 | 258 |
259 bool hasClosedCaptions() const; | 259 bool hasClosedCaptions() const; |
260 bool closedCaptionsVisible() const; | 260 bool closedCaptionsVisible() const; |
261 void setClosedCaptionsVisible(bool); | 261 void setClosedCaptionsVisible(bool); |
262 | 262 |
263 MediaControls* mediaControls() const; | 263 MediaControls* mediaControls() const; |
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
621 inline bool isHTMLMediaElement(const HTMLElement& element) | 621 inline bool isHTMLMediaElement(const HTMLElement& element) |
622 { | 622 { |
623 return isHTMLAudioElement(element) || isHTMLVideoElement(element); | 623 return isHTMLAudioElement(element) || isHTMLVideoElement(element); |
624 } | 624 } |
625 | 625 |
626 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); | 626 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); |
627 | 627 |
628 } //namespace | 628 } //namespace |
629 | 629 |
630 #endif | 630 #endif |
OLD | NEW |