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

Unified Diff: third_party/WebKit/Source/core/html/HTMLMediaElement.h

Issue 2567913002: Rename ActiveDOMObject to SuspendableObject (Closed)
Patch Set: Created 4 years 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/html/HTMLMediaElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.h b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
index 540c9271134c84ac0359ee3f709e8c55e934a562..3ab27e1ecc616b045a54c4e967d65aaa6d1536a3 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
@@ -31,8 +31,8 @@
#include "bindings/core/v8/ScriptPromise.h"
#include "bindings/core/v8/TraceWrapperMember.h"
#include "core/CoreExport.h"
-#include "core/dom/ActiveDOMObject.h"
#include "core/dom/ExceptionCode.h"
+#include "core/dom/SuspendableObject.h"
#include "core/events/GenericEventQueue.h"
#include "core/html/HTMLElement.h"
#include "core/html/track/TextTrack.h"
@@ -78,7 +78,7 @@ class WebRemotePlaybackClient;
class CORE_EXPORT HTMLMediaElement : public HTMLElement,
public Supplementable<HTMLMediaElement>,
public ActiveScriptWrappable,
- public ActiveDOMObject,
+ public SuspendableObject,
private WebMediaPlayerClient {
DEFINE_WRAPPERTYPEINFO();
USING_GARBAGE_COLLECTED_MIXIN(HTMLMediaElement);
@@ -242,7 +242,7 @@ class CORE_EXPORT HTMLMediaElement : public HTMLElement,
void disableAutomaticTextTrackSelection();
// EventTarget function.
- // Both Node (via HTMLElement) and ActiveDOMObject define this method, which
+ // Both Node (via HTMLElement) and SuspendableObject define this method, which
// causes an ambiguity error at compile time. This class's constructor
// ensures that both implementations return document, so return the result
// of one of them here.
@@ -354,7 +354,7 @@ class CORE_EXPORT HTMLMediaElement : public HTMLElement,
bool isInteractiveContent() const final;
- // ActiveDOMObject functions.
+ // SuspendableObject functions.
void contextDestroyed() final;
virtual void updateDisplayState() {}

Powered by Google App Engine
This is Rietveld 408576698