<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[175427] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/175427">175427</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-31 14:43:30 -0700 (Fri, 31 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement() faster
https://bugs.webkit.org/show_bug.cgi?id=138227
Reviewed by Benjamin Poulain.
Restructure CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement()
a bit to do less if checks. The previous implementation was doing 7 if
checks no matter the input value. The new implementation does less
if checks depending on the input type.
Also, the isImageControlsRootElement() was showing in the profiles so
I updated the condition to only do this virtual function call if the
input is an HTMLDivElement (which we can check more efficiently).
With the change, I see that we're spending about ~26% less time in
this method when running speedometer. However, the impact on the
overall score is within noise.
No new tests, no behavior change.
* css/CSSDefaultStyleSheets.cpp:
(WebCore::CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSDefaultStyleSheetscpp">trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175426 => 175427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-31 21:27:10 UTC (rev 175426)
+++ trunk/Source/WebCore/ChangeLog 2014-10-31 21:43:30 UTC (rev 175427)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-10-31 Chris Dumez <cdumez@apple.com>
+
+ Make CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement() faster
+ https://bugs.webkit.org/show_bug.cgi?id=138227
+
+ Reviewed by Benjamin Poulain.
+
+ Restructure CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement()
+ a bit to do less if checks. The previous implementation was doing 7 if
+ checks no matter the input value. The new implementation does less
+ if checks depending on the input type.
+
+ Also, the isImageControlsRootElement() was showing in the profiles so
+ I updated the condition to only do this virtual function call if the
+ input is an HTMLDivElement (which we can check more efficiently).
+
+ With the change, I see that we're spending about ~26% less time in
+ this method when running speedometer. However, the impact on the
+ overall score is within noise.
+
+ No new tests, no behavior change.
+
+ * css/CSSDefaultStyleSheets.cpp:
+ (WebCore::CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement):
+
</ins><span class="cx"> 2014-10-31 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix assertion in CachedResource::addDataBuffer
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSDefaultStyleSheetscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp (175426 => 175427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp 2014-10-31 21:27:10 UTC (rev 175426)
+++ trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp 2014-10-31 21:43:30 UTC (rev 175427)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "RenderTheme.h"
</span><span class="cx"> #include "RuleSet.h"
</span><ins>+#include "SVGElement.h"
</ins><span class="cx"> #include "StyleSheetContents.h"
</span><span class="cx"> #include "UserAgentStyleSheets.h"
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -158,36 +159,62 @@
</span><span class="cx"> changedDefaultStyle = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (element.isSVGElement() && !svgStyleSheet) {
- // SVG rules.
- svgStyleSheet = parseUASheet(svgUserAgentStyleSheet, sizeof(svgUserAgentStyleSheet));
- defaultStyle->addRulesFromSheet(svgStyleSheet, screenEval());
- defaultPrintStyle->addRulesFromSheet(svgStyleSheet, printEval());
- changedDefaultStyle = true;
</del><ins>+ if (is<HTMLElement>(element)) {
+ if (is<HTMLObjectElement>(element) || is<HTMLEmbedElement>(element)) {
+ if (!plugInsStyleSheet) {
+ String plugInsRules = RenderTheme::themeForPage(element.document().page())->extraPlugInsStyleSheet() + element.document().page()->chrome().client().plugInExtraStyleSheet();
+ if (plugInsRules.isEmpty())
+ plugInsRules = String(plugInsUserAgentStyleSheet, sizeof(plugInsUserAgentStyleSheet));
+ plugInsStyleSheet = parseUASheet(plugInsRules);
+ defaultStyle->addRulesFromSheet(plugInsStyleSheet, screenEval());
+ changedDefaultStyle = true;
+ }
+ }
+#if ENABLE(VIDEO)
+ else if (is<HTMLMediaElement>(element)) {
+ if (!mediaControlsStyleSheet) {
+ String mediaRules = RenderTheme::themeForPage(element.document().page())->mediaControlsStyleSheet();
+ if (mediaRules.isEmpty())
+ mediaRules = String(mediaControlsUserAgentStyleSheet, sizeof(mediaControlsUserAgentStyleSheet)) + RenderTheme::themeForPage(element.document().page())->extraMediaControlsStyleSheet();
+ mediaControlsStyleSheet = parseUASheet(mediaRules);
+ defaultStyle->addRulesFromSheet(mediaControlsStyleSheet, screenEval());
+ defaultPrintStyle->addRulesFromSheet(mediaControlsStyleSheet, printEval());
+ changedDefaultStyle = true;
+ }
+ }
+#endif // ENABLE(VIDEO)
+#if ENABLE(SERVICE_CONTROLS)
+ else if (is<HTMLDivElement>(element) && element.isImageControlsRootElement()) {
+ if (!imageControlsStyleSheet) {
+ String imageControlsRules = RenderTheme::themeForPage(element.document().page())->imageControlsStyleSheet();
+ imageControlsStyleSheet = parseUASheet(imageControlsRules);
+ defaultStyle->addRulesFromSheet(imageControlsStyleSheet, screenEval());
+ defaultPrintStyle->addRulesFromSheet(imageControlsStyleSheet, printEval());
+ changedDefaultStyle = true;
+ }
+ }
+#endif // ENABLE(SERVICE_CONTROLS)
+ } else if (is<SVGElement>(element)) {
+ if (!svgStyleSheet) {
+ // SVG rules.
+ svgStyleSheet = parseUASheet(svgUserAgentStyleSheet, sizeof(svgUserAgentStyleSheet));
+ defaultStyle->addRulesFromSheet(svgStyleSheet, screenEval());
+ defaultPrintStyle->addRulesFromSheet(svgStyleSheet, printEval());
+ changedDefaultStyle = true;
+ }
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> #if ENABLE(MATHML)
</span><del>- if (is<MathMLElement>(element) && !mathMLStyleSheet) {
- // MathML rules.
- mathMLStyleSheet = parseUASheet(mathmlUserAgentStyleSheet, sizeof(mathmlUserAgentStyleSheet));
- defaultStyle->addRulesFromSheet(mathMLStyleSheet, screenEval());
- defaultPrintStyle->addRulesFromSheet(mathMLStyleSheet, printEval());
- changedDefaultStyle = true;
</del><ins>+ else if (is<MathMLElement>(element)) {
+ if (!mathMLStyleSheet) {
+ // MathML rules.
+ mathMLStyleSheet = parseUASheet(mathmlUserAgentStyleSheet, sizeof(mathmlUserAgentStyleSheet));
+ defaultStyle->addRulesFromSheet(mathMLStyleSheet, screenEval());
+ defaultPrintStyle->addRulesFromSheet(mathMLStyleSheet, printEval());
+ changedDefaultStyle = true;
+ }
</ins><span class="cx"> }
</span><del>-#endif
</del><ins>+#endif // ENABLE(MATHML)
</ins><span class="cx">
</span><del>-#if ENABLE(VIDEO)
- if (!mediaControlsStyleSheet && is<HTMLMediaElement>(element)) {
- String mediaRules = RenderTheme::themeForPage(element.document().page())->mediaControlsStyleSheet();
- if (mediaRules.isEmpty())
- mediaRules = String(mediaControlsUserAgentStyleSheet, sizeof(mediaControlsUserAgentStyleSheet)) + RenderTheme::themeForPage(element.document().page())->extraMediaControlsStyleSheet();
- mediaControlsStyleSheet = parseUASheet(mediaRules);
- defaultStyle->addRulesFromSheet(mediaControlsStyleSheet, screenEval());
- defaultPrintStyle->addRulesFromSheet(mediaControlsStyleSheet, printEval());
- changedDefaultStyle = true;
- }
-#endif
-
</del><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> if (!fullscreenStyleSheet && element.document().webkitIsFullScreen()) {
</span><span class="cx"> String fullscreenRules = String(fullscreenUserAgentStyleSheet, sizeof(fullscreenUserAgentStyleSheet)) + RenderTheme::defaultTheme()->extraFullScreenStyleSheet();
</span><span class="lines">@@ -196,27 +223,8 @@
</span><span class="cx"> defaultQuirksStyle->addRulesFromSheet(fullscreenStyleSheet, screenEval());
</span><span class="cx"> changedDefaultStyle = true;
</span><span class="cx"> }
</span><del>-#endif
</del><ins>+#endif // ENABLE(FULLSCREEN_API)
</ins><span class="cx">
</span><del>-#if ENABLE(SERVICE_CONTROLS)
- if (!imageControlsStyleSheet && element.isImageControlsRootElement()) {
- String imageControlsRules = RenderTheme::themeForPage(element.document().page())->imageControlsStyleSheet();
- imageControlsStyleSheet = parseUASheet(imageControlsRules);
- defaultStyle->addRulesFromSheet(imageControlsStyleSheet, screenEval());
- defaultPrintStyle->addRulesFromSheet(imageControlsStyleSheet, printEval());
- changedDefaultStyle = true;
- }
-#endif
-
- if (!plugInsStyleSheet && (is<HTMLObjectElement>(element) || is<HTMLEmbedElement>(element))) {
- String plugInsRules = RenderTheme::themeForPage(element.document().page())->extraPlugInsStyleSheet() + element.document().page()->chrome().client().plugInExtraStyleSheet();
- if (plugInsRules.isEmpty())
- plugInsRules = String(plugInsUserAgentStyleSheet, sizeof(plugInsUserAgentStyleSheet));
- plugInsStyleSheet = parseUASheet(plugInsRules);
- defaultStyle->addRulesFromSheet(plugInsStyleSheet, screenEval());
- changedDefaultStyle = true;
- }
-
</del><span class="cx"> ASSERT(defaultStyle->features().idsInRules.isEmpty());
</span><span class="cx"> ASSERT(mathMLStyleSheet || defaultStyle->features().siblingRules.isEmpty());
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>