Chromium Code Reviews| 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 2bd2c77975194ae9e0914d7e2a0991d6e359151d..85bf9f780b32b50094827a136903fe894a94c11c 100644 |
| --- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h |
| +++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h |
| @@ -104,6 +104,9 @@ class CORE_EXPORT HTMLMediaElement |
| // for the given document. |
| static void onMediaControlsEnabledChange(Document*); |
| + // Assert the correct order of the children in shadow dom when DCHECK is on. |
| + static void assertShadowRootChildren(ShadowRoot&); |
|
mlamouri (slow - plz ping)
2017/04/07 13:18:32
Could this be `protected`?
xjz
2017/04/07 23:07:01
Done. Moved it to 'protected'.
|
| + |
| DECLARE_VIRTUAL_TRACE(); |
| DECLARE_VIRTUAL_TRACE_WRAPPERS(); |
| @@ -130,6 +133,7 @@ class CORE_EXPORT HTMLMediaElement |
| bool hasRemoteRoutes() const; |
| bool isPlayingRemotely() const { return m_playingRemotely; } |
| + virtual bool isMediaRemotingStarted() const { return false; } |
|
mlamouri (slow - plz ping)
2017/04/07 13:18:32
Instead of making this a virtual on HTMLMediaEleme
xjz
2017/04/07 23:07:01
Done.
|
| // error state |
| MediaError* error() const; |
| @@ -560,6 +564,8 @@ class CORE_EXPORT HTMLMediaElement |
| void viewportFillDebouncerTimerFired(TimerBase*); |
| + virtual bool isMediaRemotingDisabled() const { return false; } |
| + |
| TaskRunnerTimer<HTMLMediaElement> m_loadTimer; |
| TaskRunnerTimer<HTMLMediaElement> m_progressEventTimer; |
| TaskRunnerTimer<HTMLMediaElement> m_playbackProgressTimer; |