| Index: Source/core/html/HTMLMediaElement.h
|
| diff --git a/Source/core/html/HTMLMediaElement.h b/Source/core/html/HTMLMediaElement.h
|
| index ff834bbc591634b5ed972592a091bd75d8333fb5..695bf5f26a0a1c41eb9a037c00dad760046256e4 100644
|
| --- a/Source/core/html/HTMLMediaElement.h
|
| +++ b/Source/core/html/HTMLMediaElement.h
|
| @@ -285,8 +285,6 @@ protected:
|
| DisplayMode displayMode() const { return m_displayMode; }
|
| virtual void setDisplayMode(DisplayMode mode) { m_displayMode = mode; }
|
|
|
| - virtual bool isMediaElement() const OVERRIDE FINAL { return true; }
|
| -
|
| void setControllerInternal(PassRefPtr<MediaController>);
|
|
|
| bool ignoreTrackDisplayUpdateRequests() const { return m_ignoreTrackDisplayUpdate > 0; }
|
| @@ -545,7 +543,12 @@ struct ValueToString<TextTrackCue*> {
|
|
|
| inline bool isHTMLMediaElement(const Node& node)
|
| {
|
| - return node.isElementNode() && toElement(node).isMediaElement();
|
| + return isHTMLAudioElement(node) || isHTMLVideoElement(node);
|
| +}
|
| +
|
| +inline bool isHTMLMediaElement(const Node* node)
|
| +{
|
| + return node && isHTMLMediaElement(*node);
|
| }
|
|
|
| DEFINE_ELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
|
|
|