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

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

Issue 182613006: Remove media controls when not in use. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add shouldDisplayControls and fix overlay logic 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
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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded); 159 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded);
160 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror); 160 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror);
161 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage); 161 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage);
162 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitneedkey); 162 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitneedkey);
163 163
164 // encrypted media extensions (WD) 164 // encrypted media extensions (WD)
165 MediaKeys* mediaKeys() const { return m_mediaKeys.get(); } 165 MediaKeys* mediaKeys() const { return m_mediaKeys.get(); }
166 void setMediaKeys(MediaKeys*, ExceptionState&); 166 void setMediaKeys(MediaKeys*, ExceptionState&);
167 DEFINE_ATTRIBUTE_EVENT_LISTENER(needkey); 167 DEFINE_ATTRIBUTE_EVENT_LISTENER(needkey);
168 168
169 // controls 169 // This reflects the DOM attribute.
170 bool controls() const; 170 bool controls() const;
171 void setControls(bool); 171 void setControls(bool);
172
173 // This version takes scripting and full screen mode into account.
174 bool shouldDisplayControls() const;
175
172 virtual double volume() const OVERRIDE FINAL; 176 virtual double volume() const OVERRIDE FINAL;
173 virtual void setVolume(double, ExceptionState&) OVERRIDE FINAL; 177 virtual void setVolume(double, ExceptionState&) OVERRIDE FINAL;
174 virtual bool muted() const OVERRIDE FINAL; 178 virtual bool muted() const OVERRIDE FINAL;
175 virtual void setMuted(bool) OVERRIDE FINAL; 179 virtual void setMuted(bool) OVERRIDE FINAL;
176 180
177 virtual void beginScrubbing() OVERRIDE FINAL; 181 virtual void beginScrubbing() OVERRIDE FINAL;
178 virtual void endScrubbing() OVERRIDE FINAL; 182 virtual void endScrubbing() OVERRIDE FINAL;
179 183
180 virtual bool canPlay() const OVERRIDE FINAL; 184 virtual bool canPlay() const OVERRIDE FINAL;
181 185
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 inline bool isHTMLMediaElement(const Node& node) 581 inline bool isHTMLMediaElement(const Node& node)
578 { 582 {
579 return node.isElementNode() && toElement(node).isMediaElement(); 583 return node.isElementNode() && toElement(node).isMediaElement();
580 } 584 }
581 585
582 DEFINE_NODE_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 586 DEFINE_NODE_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
583 587
584 } //namespace 588 } //namespace
585 589
586 #endif 590 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/HTMLMediaElement.cpp » ('j') | Source/core/html/HTMLMediaElement.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698