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

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

Issue 303593002: Oilpan: prevent player from accessing its media element during finalization (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Switch back to initial approach + FIXMEs for follow-up work Created 6 years, 7 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 | « LayoutTests/OilpanExpectations ('k') | Source/core/html/HTMLMediaElement.cpp » ('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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 267
268 MediaController* controller() const; 268 MediaController* controller() const;
269 void setController(PassRefPtr<MediaController>); // Resets the MediaGroup an d sets the MediaController. 269 void setController(PassRefPtr<MediaController>); // Resets the MediaGroup an d sets the MediaController.
270 270
271 void scheduleEvent(PassRefPtrWillBeRawPtr<Event>); 271 void scheduleEvent(PassRefPtrWillBeRawPtr<Event>);
272 272
273 // Current volume that should be used by the webMediaPlayer(). This method t akes muted state 273 // Current volume that should be used by the webMediaPlayer(). This method t akes muted state
274 // and m_mediaController multipliers into account. 274 // and m_mediaController multipliers into account.
275 double playerVolume() const; 275 double playerVolume() const;
276 276
277 #if ENABLE(OILPAN)
278 bool isFinalizing() const { return m_isFinalizing; }
279 #endif
280
277 protected: 281 protected:
278 HTMLMediaElement(const QualifiedName&, Document&); 282 HTMLMediaElement(const QualifiedName&, Document&);
279 virtual ~HTMLMediaElement(); 283 virtual ~HTMLMediaElement();
280 284
281 virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERR IDE; 285 virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERR IDE;
282 virtual void finishParsingChildren() OVERRIDE FINAL; 286 virtual void finishParsingChildren() OVERRIDE FINAL;
283 virtual bool isURLAttribute(const Attribute&) const OVERRIDE; 287 virtual bool isURLAttribute(const Attribute&) const OVERRIDE;
284 virtual void attach(const AttachContext& = AttachContext()) OVERRIDE; 288 virtual void attach(const AttachContext& = AttachContext()) OVERRIDE;
285 289
286 virtual void didMoveToNewDocument(Document& oldDocument) OVERRIDE; 290 virtual void didMoveToNewDocument(Document& oldDocument) OVERRIDE;
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 499
496 bool m_closedCaptionsVisible : 1; 500 bool m_closedCaptionsVisible : 1;
497 501
498 bool m_completelyLoaded : 1; 502 bool m_completelyLoaded : 1;
499 bool m_havePreparedToPlay : 1; 503 bool m_havePreparedToPlay : 1;
500 bool m_delayingLoadForPreloadNone : 1; 504 bool m_delayingLoadForPreloadNone : 1;
501 505
502 bool m_tracksAreReady : 1; 506 bool m_tracksAreReady : 1;
503 bool m_haveVisibleTextTrack : 1; 507 bool m_haveVisibleTextTrack : 1;
504 bool m_processingPreferenceChange : 1; 508 bool m_processingPreferenceChange : 1;
509 #if ENABLE(OILPAN)
510 bool m_isFinalizing : 1;
511 #endif
505 double m_lastTextTrackUpdateTime; 512 double m_lastTextTrackUpdateTime;
506 513
507 RefPtrWillBeMember<TextTrackList> m_textTracks; 514 RefPtrWillBeMember<TextTrackList> m_textTracks;
508 WillBeHeapVector<RefPtrWillBeMember<TextTrack> > m_textTracksWhenResourceSel ectionBegan; 515 WillBeHeapVector<RefPtrWillBeMember<TextTrack> > m_textTracksWhenResourceSel ectionBegan;
509 516
510 CueIntervalTree m_cueTree; 517 CueIntervalTree m_cueTree;
511 518
512 CueList m_currentlyActiveCues; 519 CueList m_currentlyActiveCues;
513 int m_ignoreTrackDisplayUpdate; 520 int m_ignoreTrackDisplayUpdate;
514 521
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 inline bool isHTMLMediaElement(const HTMLElement& element) 560 inline bool isHTMLMediaElement(const HTMLElement& element)
554 { 561 {
555 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 562 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
556 } 563 }
557 564
558 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 565 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
559 566
560 } //namespace 567 } //namespace
561 568
562 #endif 569 #endif
OLDNEW
« no previous file with comments | « LayoutTests/OilpanExpectations ('k') | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698