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

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

Issue 2905233002: Remove the lifetime hack in ImageLoader where it keeps its assoc element alive (Closed)
Patch Set: Rebase Created 3 years, 6 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 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 MediaControls* GetMediaControls() const; 283 MediaControls* GetMediaControls() const;
284 284
285 // Notifies the media element that the media controls became visible, so 285 // Notifies the media element that the media controls became visible, so
286 // that text track layout may be updated to avoid overlapping them. 286 // that text track layout may be updated to avoid overlapping them.
287 void MediaControlsDidBecomeVisible(); 287 void MediaControlsDidBecomeVisible();
288 288
289 void SourceWasRemoved(HTMLSourceElement*); 289 void SourceWasRemoved(HTMLSourceElement*);
290 void SourceWasAdded(HTMLSourceElement*); 290 void SourceWasAdded(HTMLSourceElement*);
291 291
292 // ScriptWrappable functions. 292 // ScriptWrappable functions.
293 bool HasPendingActivity() const final; 293 bool HasPendingActivity() const override;
294 294
295 AudioSourceProviderClient* AudioSourceNode() { return audio_source_node_; } 295 AudioSourceProviderClient* AudioSourceNode() { return audio_source_node_; }
296 void SetAudioSourceNode(AudioSourceProviderClient*); 296 void SetAudioSourceNode(AudioSourceProviderClient*);
297 297
298 AudioSourceProvider& GetAudioSourceProvider() { 298 AudioSourceProvider& GetAudioSourceProvider() {
299 return audio_source_provider_; 299 return audio_source_provider_;
300 } 300 }
301 301
302 enum InvalidURLAction { kDoNothing, kComplain }; 302 enum InvalidURLAction { kDoNothing, kComplain };
303 bool IsSafeToLoadURL(const KURL&, InvalidURLAction); 303 bool IsSafeToLoadURL(const KURL&, InvalidURLAction);
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 740
741 inline bool IsHTMLMediaElement(const HTMLElement& element) { 741 inline bool IsHTMLMediaElement(const HTMLElement& element) {
742 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 742 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
743 } 743 }
744 744
745 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 745 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
746 746
747 } // namespace blink 747 } // namespace blink
748 748
749 #endif // HTMLMediaElement_h 749 #endif // HTMLMediaElement_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLInputElement.idl ('k') | third_party/WebKit/Source/core/html/HTMLObjectElement.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698