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

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

Issue 1856373004: Fix potential null pointer access in HTMLMediaElement::seek (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 }; 637 };
638 638
639 AudioSourceProviderImpl m_audioSourceProvider; 639 AudioSourceProviderImpl m_audioSourceProvider;
640 640
641 class AutoplayHelperClientImpl; 641 class AutoplayHelperClientImpl;
642 642
643 friend class Internals; 643 friend class Internals;
644 friend class TrackDisplayUpdateScope; 644 friend class TrackDisplayUpdateScope;
645 friend class AutoplayExperimentHelper; 645 friend class AutoplayExperimentHelper;
646 friend class MediaControlsTest; 646 friend class MediaControlsTest;
647 friend class HTMLVideoElementTest;
philipj_slow 2016/04/06 15:08:01 This ends up looking strange, can you add a new HT
647 648
648 Member<AutoplayExperimentHelper::Client> m_autoplayHelperClient; 649 Member<AutoplayExperimentHelper::Client> m_autoplayHelperClient;
649 Member<AutoplayExperimentHelper> m_autoplayHelper; 650 Member<AutoplayExperimentHelper> m_autoplayHelper;
650 651
651 WebRemotePlaybackClient* m_remotePlaybackClient; 652 WebRemotePlaybackClient* m_remotePlaybackClient;
652 653
653 #if !ENABLE(OILPAN) 654 #if !ENABLE(OILPAN)
654 WeakPtrFactory<HTMLMediaElement> m_weakPtrFactory; 655 WeakPtrFactory<HTMLMediaElement> m_weakPtrFactory;
655 #endif 656 #endif
656 657
657 static URLRegistry* s_mediaStreamRegistry; 658 static URLRegistry* s_mediaStreamRegistry;
658 }; 659 };
659 660
660 inline bool isHTMLMediaElement(const HTMLElement& element) 661 inline bool isHTMLMediaElement(const HTMLElement& element)
661 { 662 {
662 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 663 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
663 } 664 }
664 665
665 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 666 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
666 667
667 } // namespace blink 668 } // namespace blink
668 669
669 #endif // HTMLMediaElement_h 670 #endif // HTMLMediaElement_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698