Remove unused method and de-virtualize others in Element.h

https://bugs.webkit.org/show_bug.cgi?id=115770

Reviewed by Andreas Kling.

Merge https://chromium.googlesource.com/chromium/blink/+/c2c2ff9cb69f46f5cc9d289b2bfbdb8ab5bd3e49

The de-virtualization possibilities were noted whilst "FINALizing" the Node
hierarchy. If a method is successfully marked FINAL but then fails when marked
OVERRIDE as well, the method by definition does not need to be virtual.

* WebCore.exp.in:
* dom/Element.h:
(WebCore::Element::hasAuthorShadowRoot):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@149718 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index bdf9430d98cea1a70da52a4d2a4c9cb17616b206..5f5b9e87fd56452371149eb918c33f99991d7fe4 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2013-05-08  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Remove unused method and de-virtualize others in Element.h
+        https://bugs.webkit.org/show_bug.cgi?id=115770
+
+        Reviewed by Andreas Kling.
+
+        Merge https://chromium.googlesource.com/chromium/blink/+/c2c2ff9cb69f46f5cc9d289b2bfbdb8ab5bd3e49
+
+        The de-virtualization possibilities were noted whilst "FINALizing" the Node
+        hierarchy. If a method is successfully marked FINAL but then fails when marked
+        OVERRIDE as well, the method by definition does not need to be virtual.
+
+        * WebCore.exp.in:
+        * dom/Element.h:
+        (WebCore::Element::hasAuthorShadowRoot):
+
 2013-05-06  Darin Adler  <darin@apple.com>
 
         Use adoptCF and adoptNS in more places

diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in
index aa21de16ca2a9ec5956171fe497a7cb87f2469b2..13b3586496e683e6ce549aea8eb47751ff8def59 100644 (file)
--- a/Source/WebCore/WebCore.exp.in
+++ b/Source/WebCore/WebCore.exp.in
@@ -1608,6 +1608,7 @@ __ZNK7WebCore7Element12getAttributeERKN3WTF12AtomicStringE
 __ZNK7WebCore7Element12getAttributeERKNS_13QualifiedNameE
 __ZNK7WebCore7Element12hasAttributeERKN3WTF12AtomicStringE
 __ZNK7WebCore7Element13pseudoElementENS_8PseudoIdE
+__ZNK7WebCore7Element25containsFullScreenElementEv
 __ZNK7WebCore7Element6shadowEv
 __ZNK7WebCore7IntRect10intersectsERKS0_
 __ZNK7WebCore7IntRect8containsERKS0_

diff --git a/Source/WebCore/dom/Element.h b/Source/WebCore/dom/Element.h
index f47755ec39bbafc4694ce6d487074153c81c254d..442e950345449e35e6db3ff98d6c16cbbc2f3b81 100644 (file)
--- a/Source/WebCore/dom/Element.h
+++ b/Source/WebCore/dom/Element.h
@@ -418,7 +418,6 @@ public:
     ShadowRoot* authorShadowRoot() const;
 
     bool hasAuthorShadowRoot() const { return authorShadowRoot(); }
-    virtual void willAddAuthorShadowRoot() { }
 
     ShadowRoot* userAgentShadowRoot() const;
     ShadowRoot* ensureUserAgentShadowRoot();
@@ -588,9 +587,9 @@ public:
     };
     
     void webkitRequestFullScreen(unsigned short flags);
-    virtual bool containsFullScreenElement() const;
-    virtual void setContainsFullScreenElement(bool);
-    virtual void setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(bool);
+    bool containsFullScreenElement() const;
+    void setContainsFullScreenElement(bool);
+    void setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(bool);
 
     // W3C API
     void webkitRequestFullscreen();