From 7d8859e15d62d73543e245311b3a8461222dd8dd Mon Sep 17 00:00:00 2001 From: "rniwa@webkit.org" Date: Wed, 8 May 2013 07:58:17 +0000 Subject: [PATCH] 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 --- Source/WebCore/ChangeLog | 17 +++++++++++++++++ Source/WebCore/WebCore.exp.in | 1 + Source/WebCore/dom/Element.h | 7 +++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index bdf9430d98ce..5f5b9e87fd56 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,20 @@ +2013-05-08 Ryosuke Niwa + + 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 Use adoptCF and adoptNS in more places diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in index aa21de16ca2a..13b3586496e6 100644 --- 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 f47755ec39bb..442e95034544 100644 --- 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(); -- 2.36.0