Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 17 insertions, 8 deletions

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<HTMLAudioElement> create(const QualifiedName&, Document*, bool);
     static PassRefPtr<HTMLAudioElement> 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<HTMLAudioElement*>(node);
+}
+
 } //namespace
 
 #endif