webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 24 insertions, 43 deletions

diff --git a/Source/WebCore/html/HTMLBodyElement.h b/Source/WebCore/html/HTMLBodyElement.h
index 440bd064f..a73639395 100644
--- a/Source/WebCore/html/HTMLBodyElement.h
+++ b/Source/WebCore/html/HTMLBodyElement.h
@@ -2,7 +2,7 @@
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Simon Hausmann <hausmann@kde.org>
- * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2006, 2009, 2010, 2015 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -21,68 +21,49 @@
  *
  */
 
-#ifndef HTMLBodyElement_h
-#define HTMLBodyElement_h
+#pragma once
 
 #include "HTMLElement.h"
 
 namespace WebCore {
 
-class Document;
-
 class HTMLBodyElement final : public HTMLElement {
 public:
-    static PassRefPtr<HTMLBodyElement> create(Document&);
-    static PassRefPtr<HTMLBodyElement> create(const QualifiedName&, Document&);
+    static Ref<HTMLBodyElement> create(Document&);
+    static Ref<HTMLBodyElement> create(const QualifiedName&, Document&);
     virtual ~HTMLBodyElement();
 
-    // Declared virtual in Element
-    DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(blur);
-    DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(error);
-    DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(focus);
-    DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(load);
-
-    DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(beforeunload);
-    DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(hashchange);
-    DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(message);
-    DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(offline);
-    DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(online);
-    DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(popstate);
-    DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(resize);
-    DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(storage);
-    DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(unload);
-
-#if ENABLE(ORIENTATION_EVENTS)
-    DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(orientationchange);
-#endif
+    static const AtomicString& eventNameForWindowEventHandlerAttribute(const QualifiedName& attributeName);
 
 private:
     HTMLBodyElement(const QualifiedName&, Document&);
 
-    virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
-    virtual bool isPresentationAttribute(const QualifiedName&) const override;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override;
+    bool isFirstBodyElementOfDocument() const;
+
+    void parseAttribute(const QualifiedName&, const AtomicString&) final;
+    bool isPresentationAttribute(const QualifiedName&) const final;
+    void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final;
 
-    virtual InsertionNotificationRequest insertedInto(ContainerNode&) override;
+    InsertionNotificationRequest insertedInto(ContainerNode&) final;
 
-    virtual bool isURLAttribute(const Attribute&) const override;
+    bool isURLAttribute(const Attribute&) const final;
     
-    virtual bool supportsFocus() const override;
+    bool supportsFocus() const final;
 
-    virtual int scrollLeft() override;
-    virtual void setScrollLeft(int scrollLeft) override;
+    int scrollLeft() final;
+    void setScrollLeft(int) final;
     
-    virtual int scrollTop() override;
-    virtual void setScrollTop(int scrollTop) override;
+    int scrollTop() final;
+    void setScrollTop(int) final;
+
+    void scrollTo(const ScrollToOptions&) final;
     
-    virtual int scrollHeight() override;
-    virtual int scrollWidth() override;
+    int scrollHeight() final;
+    int scrollWidth() final;
     
-    virtual void addSubresourceAttributeURLs(ListHashSet<URL>&) const override;
-};
+    void addSubresourceAttributeURLs(ListHashSet<URL>&) const final;
 
-NODE_TYPE_CASTS(HTMLBodyElement)
+    static EventHandlerNameMap createWindowEventHandlerNameMap();
+};
 
 } //namespace
-
-#endif