Changeset 175380 in webkit

Timestamp:

Oct 30, 2014 2:25:30 PM (9 years ago)

Author:

Chris Dumez

Message:

Optimize HTMLVideoElement / HTMLAudioElement type checks a bit
​https://bugs.webkit.org/show_bug.cgi?id=138202

Reviewed by Benjamin Poulain.

Optimize HTMLVideoElement / HTMLAudioElement type checks a bit by:

1. Using is<HTMLMediaElement>() instead of

(is<HTMLVideoElement>()

is<HTMLAudioElement>()) if the caller is

interested in both video and audio elements. This is faster because
it ends up doing:

• virtual call to Element::isMediaElement()

instead of

• Node::isHTMLElement() + virtual call to HTMLElement::isHTMLUnknownElement() + 2 * HTMLElement::hasTagName()

2. Updating HTMLVideoElement / HTMLAudioElement type traits specializations to:
   • Avoid doing any virtual function call if the input type is an HTMLMediaElement (which is common in the code base).
   • Speed up check if the input is an Element by doing:
     • virtual call to Element::isMediaElement() + HTMLElement::hasTagName()
     instead of
     • Node::isHTMLElement() + virtual call to !HTMLElement::isHTMLUnknownElement() + HTMLElement::hasTagName()
     The speed stays the same if the input is a Node or an HTMLElement.

No new tests, no behavior change.

• css/CSSDefaultStyleSheets.cpp:

(WebCore::CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement):

• dom/make_names.pl:

(defaultTagPropertyHash):
(printTypeHelpers):

• html/HTMLAudioElement.h:

(isType):

• html/HTMLImageLoader.cpp:
• html/HTMLTagNames.in:
• html/HTMLVideoElement.h:

(isType):

• page/ChromeClient.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityRenderObject.cpp (modified) (2 diffs)
• css/CSSDefaultStyleSheets.cpp (modified) (1 diff)
• dom/make_names.pl (modified) (2 diffs)
• html/HTMLAudioElement.h (modified) (1 diff)
• html/HTMLImageLoader.cpp (modified) (1 diff)
• html/HTMLTagNames.in (modified) (2 diffs)
• html/HTMLVideoElement.h (modified) (1 diff)
• page/ChromeClient.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-10-30  Chris Dumez  <cdumez@apple.com>
+
+        Optimize HTMLVideoElement / HTMLAudioElement type checks a bit
+        https://bugs.webkit.org/show_bug.cgi?id=138202
+
+        Reviewed by Benjamin Poulain.
+
+        Optimize HTMLVideoElement / HTMLAudioElement type checks a bit by:
+        1. Using is<HTMLMediaElement>() instead of
+           (is<HTMLVideoElement>() || is<HTMLAudioElement>()) if the caller is
+           interested in both video and audio elements. This is faster because
+           it ends up doing:
+               - virtual call to Element::isMediaElement()
+           instead of
+               - Node::isHTMLElement() +
+                 virtual call to HTMLElement::isHTMLUnknownElement() +
+                 2 * HTMLElement::hasTagName()
+        2. Updating HTMLVideoElement / HTMLAudioElement type traits
+           specializations to:
+           - Avoid doing any virtual function call if the input type is an
+             HTMLMediaElement (which is common in the code base).
+           - Speed up check if the input is an Element by doing:
+               - virtual call to Element::isMediaElement() +
+                 HTMLElement::hasTagName()
+             instead of
+               - Node::isHTMLElement() +
+                 virtual call to !HTMLElement::isHTMLUnknownElement() +
+                 HTMLElement::hasTagName()
+             The speed stays the same if the input is a Node or an HTMLElement.
+
+        No new tests, no behavior change.
+
+        * css/CSSDefaultStyleSheets.cpp:
+        (WebCore::CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement):
+        * dom/make_names.pl:
+        (defaultTagPropertyHash):
+        (printTypeHelpers):
+        * html/HTMLAudioElement.h:
+        (isType):
+        * html/HTMLImageLoader.cpp:
+        * html/HTMLTagNames.in:
+        * html/HTMLVideoElement.h:
+        (isType):
+        * page/ChromeClient.h:
+
 2014-10-30  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -45 +45 @@
 #include "FrameSelection.h"
 #include "HTMLAreaElement.h"
+#include "HTMLAudioElement.h"
 #include "HTMLFormElement.h"
 #include "HTMLFrameElementBase.h"
@@ -58 +59 @@
 #include "HTMLTableElement.h"
 #include "HTMLTextAreaElement.h"
+#include "HTMLVideoElement.h"
 #include "HitTestRequest.h"
 #include "HitTestResult.h"

trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp

@@ -178 +178 @@
 
 #if ENABLE(VIDEO)
-    if (!mediaControlsStyleSheet && (is<HTMLVideoElement>(element) || is<HTMLAudioElement>(element))) {
+    if (!mediaControlsStyleSheet && is<HTMLMediaElement>(element)) {
         String mediaRules = RenderTheme::themeForPage(element.document().page())->mediaControlsStyleSheet();
         if (mediaRules.isEmpty())

trunk/Source/WebCore/dom/make_names.pl

@@ -195 +195 @@
         'conditional' => 0,
         'runtimeConditional' => 0,
+        'customTypeHelper' => 0,
     );
 }
@@ -635 +636 @@
 
     for my $class (sort keys %classToTags) {
+        my $name = $classToTags{$class}[0];
+        next if $parsedTags{$name}{customTypeHelper};
         # Skip classes that map to more than 1 tag.
         my $tagCount = scalar @{$classToTags{$class}};
         next if $tagCount > 1;
-        my $name = $classToTags{$class}[0];
+
         print F <<END
 namespace WebCore {

trunk/Source/WebCore/html/HTMLAudioElement.h

@@ -46 +46 @@
 };
 
-} //namespace
+} // namespace WebCore
 
-#endif
-#endif
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::HTMLAudioElement)
+    static bool isType(const WebCore::HTMLMediaElement& element) { return element.hasTagName(WebCore::HTMLNames::audioTag); }
+    static bool isType(const WebCore::Element& element) { return is<WebCore::HTMLMediaElement>(element) && isType(downcast<WebCore::HTMLMediaElement>(element)); }
+    static bool isType(const WebCore::Node& node) { return is<WebCore::HTMLMediaElement>(node) && isType(downcast<WebCore::HTMLMediaElement>(node)); }
+SPECIALIZE_TYPE_TRAITS_END()
+
+#endif // ENABLE(VIDEO)
+#endif // HTMLAudioElement_h

trunk/Source/WebCore/html/HTMLImageLoader.cpp

@@ -30 +30 @@
 #include "HTMLObjectElement.h"
 #include "HTMLParserIdioms.h"
+#include "HTMLVideoElement.h"
 #include "Settings.h"
 

trunk/Source/WebCore/html/HTMLTagNames.in

@@ -12 +12 @@
 article interfaceName=HTMLElement
 aside interfaceName=HTMLElement
-audio wrapperOnlyIfMediaIsAvailable, conditional=VIDEO, constructorNeedsCreatedByParser
+audio wrapperOnlyIfMediaIsAvailable, conditional=VIDEO, constructorNeedsCreatedByParser, customTypeHelper
 b interfaceName=HTMLElement
 base
@@ -135 +135 @@
 ul interfaceName=HTMLUListElement
 var interfaceName=HTMLElement
-video wrapperOnlyIfMediaIsAvailable, conditional=VIDEO, constructorNeedsCreatedByParser
+video wrapperOnlyIfMediaIsAvailable, conditional=VIDEO, constructorNeedsCreatedByParser, customTypeHelper
 wbr interfaceName=HTMLElement
 xmp interfaceName=HTMLPreElement

trunk/Source/WebCore/html/HTMLVideoElement.h

@@ -105 +105 @@
 };
 
-} //namespace
+} // namespace WebCore
 
-#endif
-#endif
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::HTMLVideoElement)
+    static bool isType(const WebCore::HTMLMediaElement& element) { return element.hasTagName(WebCore::HTMLNames::videoTag); }
+    static bool isType(const WebCore::Element& element) { return is<WebCore::HTMLMediaElement>(element) && isType(downcast<WebCore::HTMLMediaElement>(element)); }
+    static bool isType(const WebCore::Node& node) { return is<WebCore::HTMLMediaElement>(node) && isType(downcast<WebCore::HTMLMediaElement>(node)); }
+SPECIALIZE_TYPE_TRAITS_END()
+
+#endif // ENABLE(VIDEO)
+#endif // HTMLVideoElement_h

trunk/Source/WebCore/page/ChromeClient.h

@@ -76 +76 @@
 class GraphicsLayerFactory;
 class HTMLInputElement;
+class HTMLVideoElement;
 class HitTestResult;
 class IntRect;