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

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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 static blink::WebMimeRegistry::SupportsType supportsType(const ContentType&, const String& keySystem = String()); 77 static blink::WebMimeRegistry::SupportsType supportsType(const ContentType&, const String& keySystem = String());
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 hasVideo() const OVERRIDE { return false; } 87 virtual bool hasVideo() const { return false; }
88 virtual bool hasAudio() const OVERRIDE FINAL; 88 virtual bool hasAudio() const OVERRIDE FINAL;
89 89
90 bool supportsSave() const; 90 bool supportsSave() const;
91 91
92 blink::WebLayer* platformLayer() const; 92 blink::WebLayer* platformLayer() const;
93 93
94 enum DelayedActionType { 94 enum DelayedActionType {
95 LoadMediaResource = 1 << 0, 95 LoadMediaResource = 1 << 0,
96 LoadTextTrackResource = 1 << 1, 96 LoadTextTrackResource = 1 << 1,
97 TextTrackChangesNotification = 1 << 2 97 TextTrackChangesNotification = 1 << 2
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 // EventTarget function. 226 // EventTarget function.
227 // Both Node (via HTMLElement) and ActiveDOMObject define this method, which 227 // Both Node (via HTMLElement) and ActiveDOMObject define this method, which
228 // causes an ambiguity error at compile time. This class's constructor 228 // causes an ambiguity error at compile time. This class's constructor
229 // ensures that both implementations return document, so return the result 229 // ensures that both implementations return document, so return the result
230 // of one of them here. 230 // of one of them here.
231 virtual ExecutionContext* executionContext() const OVERRIDE FINAL { return H TMLElement::executionContext(); } 231 virtual ExecutionContext* executionContext() const OVERRIDE FINAL { return H TMLElement::executionContext(); }
232 232
233 bool hasSingleSecurityOrigin() const { return !m_player || m_player->hasSing leSecurityOrigin(); } 233 bool hasSingleSecurityOrigin() const { return !m_player || m_player->hasSing leSecurityOrigin(); }
234 234
235 bool isFullscreen() const; 235 bool isFullscreen() const;
236 virtual void enterFullscreen() OVERRIDE FINAL; 236 void enterFullscreen();
237 237
238 bool hasClosedCaptions() const; 238 bool hasClosedCaptions() const;
239 bool closedCaptionsVisible() const; 239 bool closedCaptionsVisible() const;
240 void setClosedCaptionsVisible(bool); 240 void setClosedCaptionsVisible(bool);
241 241
242 MediaControls* mediaControls() const; 242 MediaControls* mediaControls() const;
243 243
244 void sourceWasRemoved(HTMLSourceElement*); 244 void sourceWasRemoved(HTMLSourceElement*);
245 void sourceWasAdded(HTMLSourceElement*); 245 void sourceWasAdded(HTMLSourceElement*);
246 246
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 inline bool isHTMLMediaElement(const Node* node) 548 inline bool isHTMLMediaElement(const Node* node)
549 { 549 {
550 return node && isHTMLMediaElement(*node); 550 return node && isHTMLMediaElement(*node);
551 } 551 }
552 552
553 DEFINE_ELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 553 DEFINE_ELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
554 554
555 } //namespace 555 } //namespace
556 556
557 #endif 557 #endif
OLDNEW
« no previous file with comments | « LayoutTests/media/video-enter-fullscreen-without-user-gesture.html ('k') | Source/core/html/MediaController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698