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

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

Issue 201123004: Ignore MediaController in the closed captions button logic (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« no previous file with comments | « no previous file | Source/core/html/MediaController.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 virtual void enterFullscreen() OVERRIDE FINAL;
238 238
239 virtual bool hasClosedCaptions() const OVERRIDE FINAL; 239 bool hasClosedCaptions() const;
240 virtual bool closedCaptionsVisible() const OVERRIDE FINAL; 240 bool closedCaptionsVisible() const;
241 virtual void setClosedCaptionsVisible(bool) OVERRIDE FINAL; 241 void setClosedCaptionsVisible(bool);
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
248 bool isPlaying() const { return m_playing; } 248 bool isPlaying() const { return m_playing; }
249 249
250 // ActiveDOMObject functions. 250 // ActiveDOMObject functions.
251 virtual bool hasPendingActivity() const OVERRIDE FINAL; 251 virtual bool hasPendingActivity() const OVERRIDE FINAL;
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 inline bool isHTMLMediaElement(const Node* node) 549 inline bool isHTMLMediaElement(const Node* node)
550 { 550 {
551 return node && isHTMLMediaElement(*node); 551 return node && isHTMLMediaElement(*node);
552 } 552 }
553 553
554 DEFINE_ELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 554 DEFINE_ELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
555 555
556 } //namespace 556 } //namespace
557 557
558 #endif 558 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/MediaController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698