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

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

Issue 525773002: Remove PosterWaitingForVideo which is redundant (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 11 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
« no previous file with comments | « no previous file | Source/core/html/HTMLVideoElement.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 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 HTMLMediaElement(const QualifiedName&, Document&); 311 HTMLMediaElement(const QualifiedName&, Document&);
312 virtual ~HTMLMediaElement(); 312 virtual ~HTMLMediaElement();
313 313
314 virtual void parseAttribute(const QualifiedName&, const AtomicString&) overr ide; 314 virtual void parseAttribute(const QualifiedName&, const AtomicString&) overr ide;
315 virtual void finishParsingChildren() override final; 315 virtual void finishParsingChildren() override final;
316 virtual bool isURLAttribute(const Attribute&) const override; 316 virtual bool isURLAttribute(const Attribute&) const override;
317 virtual void attach(const AttachContext& = AttachContext()) override; 317 virtual void attach(const AttachContext& = AttachContext()) override;
318 318
319 virtual void didMoveToNewDocument(Document& oldDocument) override; 319 virtual void didMoveToNewDocument(Document& oldDocument) override;
320 320
321 enum DisplayMode { Unknown, Poster, PosterWaitingForVideo, Video }; 321 enum DisplayMode { Unknown, Poster, Video };
322 DisplayMode displayMode() const { return m_displayMode; } 322 DisplayMode displayMode() const { return m_displayMode; }
323 virtual void setDisplayMode(DisplayMode mode) { m_displayMode = mode; } 323 virtual void setDisplayMode(DisplayMode mode) { m_displayMode = mode; }
324 324
325 void setControllerInternal(PassRefPtrWillBeRawPtr<MediaController>); 325 void setControllerInternal(PassRefPtrWillBeRawPtr<MediaController>);
326 326
327 bool ignoreTrackDisplayUpdateRequests() const { return m_ignoreTrackDisplayU pdate > 0; } 327 bool ignoreTrackDisplayUpdateRequests() const { return m_ignoreTrackDisplayU pdate > 0; }
328 void beginIgnoringTrackDisplayUpdateRequests(); 328 void beginIgnoringTrackDisplayUpdateRequests();
329 void endIgnoringTrackDisplayUpdateRequests(); 329 void endIgnoringTrackDisplayUpdateRequests();
330 330
331 private: 331 private:
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 inline bool isHTMLMediaElement(const HTMLElement& element) 630 inline bool isHTMLMediaElement(const HTMLElement& element)
631 { 631 {
632 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 632 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
633 } 633 }
634 634
635 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 635 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
636 636
637 } // namespace blink 637 } // namespace blink
638 638
639 #endif // HTMLMediaElement_h 639 #endif // HTMLMediaElement_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/HTMLVideoElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698