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

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

Issue 2265873003: binding: Moves hasPendingActivity from ActiveScriptWrappable to ScriptWrappable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed review comments. Created 4 years, 4 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 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 // Note that this can be non-null even if there is no controls attribute. 240 // Note that this can be non-null even if there is no controls attribute.
241 MediaControls* mediaControls() const; 241 MediaControls* mediaControls() const;
242 242
243 // Notifies the media element that the media controls became visible, so 243 // Notifies the media element that the media controls became visible, so
244 // that text track layout may be updated to avoid overlapping them. 244 // that text track layout may be updated to avoid overlapping them.
245 void mediaControlsDidBecomeVisible(); 245 void mediaControlsDidBecomeVisible();
246 246
247 void sourceWasRemoved(HTMLSourceElement*); 247 void sourceWasRemoved(HTMLSourceElement*);
248 void sourceWasAdded(HTMLSourceElement*); 248 void sourceWasAdded(HTMLSourceElement*);
249 249
250 // ActiveScriptWrappable functions. 250 // ScriptWrappable functions.
251 bool hasPendingActivity() const final; 251 bool hasPendingActivity() const final;
252 252
253 AudioSourceProviderClient* audioSourceNode() { return m_audioSourceNode; } 253 AudioSourceProviderClient* audioSourceNode() { return m_audioSourceNode; }
254 void setAudioSourceNode(AudioSourceProviderClient*); 254 void setAudioSourceNode(AudioSourceProviderClient*);
255 255
256 AudioSourceProvider& getAudioSourceProvider() { return m_audioSourceProvider ; } 256 AudioSourceProvider& getAudioSourceProvider() { return m_audioSourceProvider ; }
257 257
258 enum InvalidURLAction { DoNothing, Complain }; 258 enum InvalidURLAction { DoNothing, Complain };
259 bool isSafeToLoadURL(const KURL&, InvalidURLAction); 259 bool isSafeToLoadURL(const KURL&, InvalidURLAction);
260 260
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 inline bool isHTMLMediaElement(const HTMLElement& element) 682 inline bool isHTMLMediaElement(const HTMLElement& element)
683 { 683 {
684 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 684 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
685 } 685 }
686 686
687 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 687 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
688 688
689 } // namespace blink 689 } // namespace blink
690 690
691 #endif // HTMLMediaElement_h 691 #endif // HTMLMediaElement_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fileapi/FileReader.h ('k') | third_party/WebKit/Source/core/page/EventSource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698