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

Side by Side Diff: Source/core/html/HTMLMediaElement.h

Issue 196793021: Ignore MediaController in the video fullscreen button logic (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase 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
OLDNEW
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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 static void setMediaStreamRegistry(URLRegistry*); 79 static void setMediaStreamRegistry(URLRegistry*);
80 static bool isMediaStreamURL(const String& url); 80 static bool isMediaStreamURL(const String& url);
81 81
82 // Do not use player(). 82 // Do not use player().
83 // FIXME: Replace all uses with webMediaPlayer() and remove this API. 83 // FIXME: Replace all uses with webMediaPlayer() and remove this API.
84 MediaPlayer* player() const { return m_player.get(); } 84 MediaPlayer* player() const { return m_player.get(); }
85 blink::WebMediaPlayer* webMediaPlayer() const { return m_player ? m_player-> webMediaPlayer() : 0; } 85 blink::WebMediaPlayer* webMediaPlayer() const { return m_player ? m_player-> webMediaPlayer() : 0; }
86 86
87 virtual bool isVideo() const = 0; 87 virtual bool isVideo() const = 0;
88 virtual bool hasVideo() const OVERRIDE { return false; } 88 virtual bool hasVideo() const { return false; }
89 virtual bool hasAudio() const OVERRIDE FINAL; 89 virtual bool hasAudio() const OVERRIDE FINAL;
90 90
91 bool supportsSave() const; 91 bool supportsSave() const;
92 92
93 blink::WebLayer* platformLayer() const; 93 blink::WebLayer* platformLayer() const;
94 94
95 enum DelayedActionType { 95 enum DelayedActionType {
96 LoadMediaResource = 1 << 0, 96 LoadMediaResource = 1 << 0,
97 LoadTextTrackResource = 1 << 1, 97 LoadTextTrackResource = 1 << 1,
98 TextTrackChangesNotification = 1 << 2 98 TextTrackChangesNotification = 1 << 2
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 // EventTarget function. 227 // EventTarget function.
228 // Both Node (via HTMLElement) and ActiveDOMObject define this method, which 228 // Both Node (via HTMLElement) and ActiveDOMObject define this method, which
229 // causes an ambiguity error at compile time. This class's constructor 229 // causes an ambiguity error at compile time. This class's constructor
230 // ensures that both implementations return document, so return the result 230 // ensures that both implementations return document, so return the result
231 // of one of them here. 231 // of one of them here.
232 virtual ExecutionContext* executionContext() const OVERRIDE FINAL { return H TMLElement::executionContext(); } 232 virtual ExecutionContext* executionContext() const OVERRIDE FINAL { return H TMLElement::executionContext(); }
233 233
234 bool hasSingleSecurityOrigin() const { return !m_player || m_player->hasSing leSecurityOrigin(); } 234 bool hasSingleSecurityOrigin() const { return !m_player || m_player->hasSing leSecurityOrigin(); }
235 235
236 bool isFullscreen() const; 236 bool isFullscreen() const;
237 virtual void enterFullscreen() OVERRIDE FINAL; 237 void enterFullscreen();
238 238
239 virtual bool hasClosedCaptions() const OVERRIDE FINAL; 239 virtual bool hasClosedCaptions() const OVERRIDE FINAL;
240 virtual bool closedCaptionsVisible() const OVERRIDE FINAL; 240 virtual bool closedCaptionsVisible() const OVERRIDE FINAL;
241 virtual void setClosedCaptionsVisible(bool) OVERRIDE FINAL; 241 virtual void setClosedCaptionsVisible(bool) OVERRIDE FINAL;
242 242
243 MediaControls* mediaControls() const; 243 MediaControls* mediaControls() const;
244 244
245 void sourceWasRemoved(HTMLSourceElement*); 245 void sourceWasRemoved(HTMLSourceElement*);
246 void sourceWasAdded(HTMLSourceElement*); 246 void sourceWasAdded(HTMLSourceElement*);
247 247
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 inline bool isHTMLMediaElement(const Node& node) 546 inline bool isHTMLMediaElement(const Node& node)
547 { 547 {
548 return node.isElementNode() && toElement(node).isMediaElement(); 548 return node.isElementNode() && toElement(node).isMediaElement();
549 } 549 }
550 550
551 DEFINE_ELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 551 DEFINE_ELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
552 552
553 } //namespace 553 } //namespace
554 554
555 #endif 555 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698