From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- Source/WebCore/html/HTMLAudioElement.h | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'Source/WebCore/html/HTMLAudioElement.h') diff --git a/Source/WebCore/html/HTMLAudioElement.h b/Source/WebCore/html/HTMLAudioElement.h index cfa276c5a..07ca48dd4 100644 --- a/Source/WebCore/html/HTMLAudioElement.h +++ b/Source/WebCore/html/HTMLAudioElement.h @@ -28,28 +28,37 @@ #define HTMLAudioElement_h #if ENABLE(VIDEO) - #include "HTMLMediaElement.h" namespace WebCore { class Document; -class HTMLAudioElement : public HTMLMediaElement { +class HTMLAudioElement FINAL : public HTMLMediaElement { public: static PassRefPtr create(const QualifiedName&, Document*, bool); static PassRefPtr createForJSConstructor(Document*, const String& src); - virtual bool hasPendingActivity() const { return isPlaying() || HTMLMediaElement::hasPendingActivity(); } - - virtual bool isActiveNode() const { return true; } - private: HTMLAudioElement(const QualifiedName&, Document*, bool); - - virtual bool isVideo() const { return false; } }; +inline bool isHTMLAudioElement(Node* node) +{ + return node->hasTagName(HTMLNames::audioTag); +} + +inline bool isHTMLAudioElement(Element* element) +{ + return element->hasTagName(HTMLNames::audioTag); +} + +inline HTMLAudioElement* toHTMLAudioElement(Node* node) +{ + ASSERT_WITH_SECURITY_IMPLICATION(!node || isHTMLAudioElement(node)); + return static_cast(node); +} + } //namespace #endif -- cgit v1.2.1