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

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

Issue 535703002: HTMLMediaElement shouldn't call currentTime() when we HAVE_NOTHING. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fixes Created 6 years, 3 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 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 533
534 OwnPtr<MediaPlayer> m_player; 534 OwnPtr<MediaPlayer> m_player;
535 blink::WebLayer* m_webLayer; 535 blink::WebLayer* m_webLayer;
536 536
537 MediaPlayer::Preload m_preload; 537 MediaPlayer::Preload m_preload;
538 538
539 DisplayMode m_displayMode; 539 DisplayMode m_displayMode;
540 540
541 RefPtrWillBeMember<HTMLMediaSource> m_mediaSource; 541 RefPtrWillBeMember<HTMLMediaSource> m_mediaSource;
542 542
543 // Cached time value. Only valid when ready state is HAVE_METADATA or
544 // higher, otherwise the current time is assumed to be zero.
543 mutable double m_cachedTime; 545 mutable double m_cachedTime;
544 mutable double m_cachedTimeWallClockUpdateTime;
545 mutable double m_minimumWallClockTimeToCacheMediaTime;
546 546
547 double m_fragmentStartTime; 547 double m_fragmentStartTime;
548 double m_fragmentEndTime; 548 double m_fragmentEndTime;
549 549
550 typedef unsigned PendingActionFlags; 550 typedef unsigned PendingActionFlags;
551 PendingActionFlags m_pendingActionFlags; 551 PendingActionFlags m_pendingActionFlags;
552 552
553 // FIXME: MediaElement has way too many state bits. 553 // FIXME: MediaElement has way too many state bits.
554 bool m_userGestureRequiredForPlay : 1; 554 bool m_userGestureRequiredForPlay : 1;
555 bool m_playing : 1; 555 bool m_playing : 1;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 inline bool isHTMLMediaElement(const HTMLElement& element) 632 inline bool isHTMLMediaElement(const HTMLElement& element)
633 { 633 {
634 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 634 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
635 } 635 }
636 636
637 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 637 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
638 638
639 } // namespace blink 639 } // namespace blink
640 640
641 #endif // HTMLMediaElement_h 641 #endif // HTMLMediaElement_h
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