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

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

Issue 295613003: Oilpan: make MediaError + TrackEvent heap savvier. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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 | « no previous file | 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 enum DelayedActionType { 96 enum DelayedActionType {
97 LoadMediaResource = 1 << 0, 97 LoadMediaResource = 1 << 0,
98 LoadTextTrackResource = 1 << 1, 98 LoadTextTrackResource = 1 << 1,
99 TextTrackChangesNotification = 1 << 2 99 TextTrackChangesNotification = 1 << 2
100 }; 100 };
101 void scheduleDelayedAction(DelayedActionType); 101 void scheduleDelayedAction(DelayedActionType);
102 102
103 bool isActive() const { return m_active; } 103 bool isActive() const { return m_active; }
104 104
105 // error state 105 // error state
106 PassRefPtr<MediaError> error() const; 106 PassRefPtrWillBeRawPtr<MediaError> error() const;
107 107
108 // network state 108 // network state
109 void setSrc(const AtomicString&); 109 void setSrc(const AtomicString&);
110 const KURL& currentSrc() const { return m_currentSrc; } 110 const KURL& currentSrc() const { return m_currentSrc; }
111 111
112 enum NetworkState { NETWORK_EMPTY, NETWORK_IDLE, NETWORK_LOADING, NETWORK_NO _SOURCE }; 112 enum NetworkState { NETWORK_EMPTY, NETWORK_IDLE, NETWORK_LOADING, NETWORK_NO _SOURCE };
113 NetworkState networkState() const; 113 NetworkState networkState() const;
114 114
115 String preload() const; 115 String preload() const;
116 void setPreload(const AtomicString&); 116 void setPreload(const AtomicString&);
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 void setPlayerPreload(); 358 void setPlayerPreload();
359 void startDelayedLoad(); 359 void startDelayedLoad();
360 blink::WebMediaPlayer::LoadType loadType() const; 360 blink::WebMediaPlayer::LoadType loadType() const;
361 void scheduleNextSourceChild(); 361 void scheduleNextSourceChild();
362 void loadNextSourceChild(); 362 void loadNextSourceChild();
363 void userCancelledLoad(); 363 void userCancelledLoad();
364 void clearMediaPlayer(int flags); 364 void clearMediaPlayer(int flags);
365 void clearMediaPlayerAndAudioSourceProviderClient(); 365 void clearMediaPlayerAndAudioSourceProviderClient();
366 bool havePotentialSourceChild(); 366 bool havePotentialSourceChild();
367 void noneSupported(); 367 void noneSupported();
368 void mediaEngineError(PassRefPtr<MediaError> err); 368 void mediaEngineError(PassRefPtrWillBeRawPtr<MediaError>);
369 void cancelPendingEventsAndCallbacks(); 369 void cancelPendingEventsAndCallbacks();
370 void waitForSourceChange(); 370 void waitForSourceChange();
371 void prepareToPlay(); 371 void prepareToPlay();
372 372
373 KURL selectNextSourceChild(ContentType*, String* keySystem, InvalidURLAction ); 373 KURL selectNextSourceChild(ContentType*, String* keySystem, InvalidURLAction );
374 374
375 void mediaLoadingFailed(MediaPlayer::NetworkState); 375 void mediaLoadingFailed(MediaPlayer::NetworkState);
376 376
377 void updateActiveTextTrackCues(double); 377 void updateActiveTextTrackCues(double);
378 HTMLTrackElement* showingTrackWithSameKind(HTMLTrackElement*) const; 378 HTMLTrackElement* showingTrackWithSameKind(HTMLTrackElement*) const;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 RefPtr<TimeRanges> m_playedTimeRanges; 425 RefPtr<TimeRanges> m_playedTimeRanges;
426 OwnPtr<GenericEventQueue> m_asyncEventQueue; 426 OwnPtr<GenericEventQueue> m_asyncEventQueue;
427 427
428 double m_playbackRate; 428 double m_playbackRate;
429 double m_defaultPlaybackRate; 429 double m_defaultPlaybackRate;
430 NetworkState m_networkState; 430 NetworkState m_networkState;
431 ReadyState m_readyState; 431 ReadyState m_readyState;
432 ReadyState m_readyStateMaximum; 432 ReadyState m_readyStateMaximum;
433 KURL m_currentSrc; 433 KURL m_currentSrc;
434 434
435 RefPtr<MediaError> m_error; 435 RefPtrWillBeMember<MediaError> m_error;
436 436
437 double m_volume; 437 double m_volume;
438 double m_lastSeekTime; 438 double m_lastSeekTime;
439 439
440 double m_previousProgressTime; 440 double m_previousProgressTime;
441 441
442 // Cached duration to suppress duplicate events if duration unchanged. 442 // Cached duration to suppress duplicate events if duration unchanged.
443 double m_duration; 443 double m_duration;
444 444
445 // The last time a timeupdate event was sent (wall clock). 445 // The last time a timeupdate event was sent (wall clock).
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 inline bool isHTMLMediaElement(const HTMLElement& element) 552 inline bool isHTMLMediaElement(const HTMLElement& element)
553 { 553 {
554 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 554 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
555 } 555 }
556 556
557 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 557 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
558 558
559 } //namespace 559 } //namespace
560 560
561 #endif 561 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698