<!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>[182492] 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/182492">182492</a></dd>

<dt>Author</dt> <dd>achristensen@apple.com</dd>

<dt>Date</dt> <dd>2015-04-07 14:17:36 -0700 (Tue, 07 Apr 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Optimize content extensions interpreting speed.

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

Reviewed by Brady Eidson.

* contentextensions/ContentExtensionCompiler.cpp:

(WebCore::ContentExtensions::compileRuleList):

* contentextensions/ContentExtensionsBackend.cpp:

(WebCore::ContentExtensions::ContentExtensionsBackend::actionsForResourceLoad):

Measure total time added by content extensions.

* contentextensions/DFABytecodeCompiler.cpp:

(WebCore::ContentExtensions::DFABytecodeCompiler::compileNode):

(WebCore::ContentExtensions::DFABytecodeCompiler::compile):

When jumping to the root, don't re-add all the actions.

* contentextensions/DFABytecodeCompiler.h:

* platform/URL.cpp:

(WebCore::URL::init):

* platform/URL.h:

(WebCore::URL::protocolIsJavaScript): Added.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionCompilercpp">trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp</a></li>

<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionsBackendcpp">trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp</a></li>

<li><a href="#trunkSourceWebCorecontentextensionsDFABytecodeCompilercpp">trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.cpp</a></li>

<li><a href="#trunkSourceWebCorecontentextensionsDFABytecodeCompilerh">trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.h</a></li>

<li><a href="#trunkSourceWebCoreplatformURLcpp">trunk/Source/WebCore/platform/URL.cpp</a></li>

<li><a href="#trunkSourceWebCoreplatformURLh">trunk/Source/WebCore/platform/URL.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182491 => 182492)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-04-07 21:11:00 UTC (rev 182491)

+++ trunk/Source/WebCore/ChangeLog        2015-04-07 21:17:36 UTC (rev 182492)

</span><span class="lines">@@ -1,3 +1,25 @@

</span><ins>+2015-04-07  Alex Christensen  &lt;achristensen@webkit.org&gt;

+

+        Optimize content extensions interpreting speed.

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

+

+        Reviewed by Brady Eidson.

+

+        * contentextensions/ContentExtensionCompiler.cpp:

+        (WebCore::ContentExtensions::compileRuleList):

+        * contentextensions/ContentExtensionsBackend.cpp:

+        (WebCore::ContentExtensions::ContentExtensionsBackend::actionsForResourceLoad):

+        Measure total time added by content extensions.

+        * contentextensions/DFABytecodeCompiler.cpp:

+        (WebCore::ContentExtensions::DFABytecodeCompiler::compileNode):

+        (WebCore::ContentExtensions::DFABytecodeCompiler::compile):

+        When jumping to the root, don't re-add all the actions.

+        * contentextensions/DFABytecodeCompiler.h:

+        * platform/URL.cpp:

+        (WebCore::URL::init):

+        * platform/URL.h:

+        (WebCore::URL::protocolIsJavaScript): Added.

+

</ins><span class="cx"> 2015-04-07  Simon Fraser  &lt;simon.fraser@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Add a new setting, AntialiasedFontDilationEnabled, exposed via WK2.

</span></span></pre></div>

<a id="trunkSourceWebCorecontentextensionsContentExtensionCompilercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp (182491 => 182492)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp        2015-04-07 21:11:00 UTC (rev 182491)

+++ trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp        2015-04-07 21:17:36 UTC (rev 182492)

</span><span class="lines">@@ -213,6 +213,8 @@

</span><span class="cx"> #if CONTENT_EXTENSIONS_PERFORMANCE_REPORTING

</span><span class="cx">     double dfaBuildTimeEnd = monotonicallyIncreasingTime();

</span><span class="cx">     dataLogF(&quot;    Time spent building and compiling the DFAs: %f\n&quot;, (dfaBuildTimeEnd - dfaBuildTimeStart));

</span><ins>+    dataLogF(&quot;    Bytecode size %zu\n&quot;, bytecode.size());

+    dataLogF(&quot;    DFA count %zu\n&quot;, nfas.size());

</ins><span class="cx"> #endif

</span><span class="cx"> 

</span><span class="cx">     client.writeBytecode(WTF::move(bytecode));

</span></span></pre></div>

<a id="trunkSourceWebCorecontentextensionsContentExtensionsBackendcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp (182491 => 182492)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp        2015-04-07 21:11:00 UTC (rev 182491)

+++ trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp        2015-04-07 21:17:36 UTC (rev 182492)

</span><span class="lines">@@ -30,6 +30,7 @@

</span><span class="cx"> 

</span><span class="cx"> #include &quot;CompiledContentExtension.h&quot;

</span><span class="cx"> #include &quot;ContentExtension.h&quot;

</span><ins>+#include &quot;ContentExtensionsDebugging.h&quot;

</ins><span class="cx"> #include &quot;DFABytecodeInterpreter.h&quot;

</span><span class="cx"> #include &quot;Document.h&quot;

</span><span class="cx"> #include &quot;DocumentLoader.h&quot;

</span><span class="lines">@@ -72,6 +73,13 @@

</span><span class="cx"> 

</span><span class="cx"> Vector&lt;Action&gt; ContentExtensionsBackend::actionsForResourceLoad(const ResourceLoadInfo&amp; resourceLoadInfo) const

</span><span class="cx"> {

</span><ins>+#if CONTENT_EXTENSIONS_PERFORMANCE_REPORTING

+    double addedTimeStart = monotonicallyIncreasingTime();

+#endif

+    if (resourceLoadInfo.resourceURL.protocolIsData()

+        || resourceLoadInfo.resourceURL.protocolIsJavaScript())

+        return Vector&lt;Action&gt;();

+

</ins><span class="cx">     const String&amp; urlString = resourceLoadInfo.resourceURL.string();

</span><span class="cx">     ASSERT_WITH_MESSAGE(urlString.containsOnlyASCII(), &quot;A decoded URL should only contain ASCII characters. The matching algorithm assumes the input is ASCII.&quot;);

</span><span class="cx">     const CString&amp; urlCString = urlString.utf8();

</span><span class="lines">@@ -117,6 +125,10 @@

</span><span class="cx">             finalActions.append(Action(ActionType::CSSDisplayNoneStyleSheet, contentExtension-&gt;identifier()));

</span><span class="cx">         }

</span><span class="cx">     }

</span><ins>+#if CONTENT_EXTENSIONS_PERFORMANCE_REPORTING

+    double addedTimeEnd = monotonicallyIncreasingTime();

+    WTFLogAlways(&quot;Time added: %f microseconds %s&quot;, (addedTimeEnd - addedTimeStart) * 1.0e6, resourceLoadInfo.resourceURL.string().utf8().data());

+#endif

</ins><span class="cx">     return finalActions;

</span><span class="cx"> }

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebCorecontentextensionsDFABytecodeCompilercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.cpp (182491 => 182492)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.cpp        2015-04-07 21:11:00 UTC (rev 182491)

+++ trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.cpp        2015-04-07 21:17:36 UTC (rev 182492)

</span><span class="lines">@@ -93,12 +93,13 @@

</span><span class="cx">     append&lt;DFABytecodeInstruction&gt;(m_bytecode, DFABytecodeInstruction::Terminate);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void DFABytecodeCompiler::compileNode(unsigned index)

</del><ins>+void DFABytecodeCompiler::compileNode(unsigned index, bool root)

</ins><span class="cx"> {

</span><span class="cx">     const DFANode&amp; node = m_dfa.nodeAt(index);

</span><span class="cx"> 

<span class="cx">     // Record starting index for linking.

</span><del>-    m_nodeStartOffsets[index] = m_bytecode.size();

</del><ins>+    if (!root)

+        m_nodeStartOffsets[index] = m_bytecode.size();

</ins><span class="cx"> 

</span><span class="cx">     for (uint64_t action : node.actions) {

<span class="cx">         // High bits are used to store flags. See compileRuleList.

</span><span class="lines">@@ -107,6 +108,12 @@

</span><span class="cx">         else

</span><span class="cx">             emitAppendAction(static_cast&lt;unsigned&gt;(action));

</span><span class="cx">     }

</span><ins>+    

+    // If we jump to the root, we don't want to re-add its actions to a HashSet.

+    // We know we have already added them because the root is always compiled first and we always start interpreting at the beginning.

+    if (root)

+        m_nodeStartOffsets[index] = m_bytecode.size();

+    

</ins><span class="cx">     compileNodeTransitions(node);

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -200,10 +207,10 @@

</span><span class="cx">     m_nodeStartOffsets.resize(m_dfa.size());

</span><span class="cx">     

<span class="cx">     // Make sure the root is always at the beginning of the bytecode.

</span><del>-    compileNode(m_dfa.root());

</del><ins>+    compileNode(m_dfa.root(), true);

</ins><span class="cx">     for (unsigned i = 0; i &lt; m_dfa.size(); i++) {

</span><span class="cx">         if (i != m_dfa.root())

</span><del>-            compileNode(i);

</del><ins>+            compileNode(i, false);

</ins><span class="cx">     }

</span><span class="cx"> 

<span class="cx">     // Link.

</span></span></pre></div>

<a id="trunkSourceWebCorecontentextensionsDFABytecodeCompilerh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.h (182491 => 182492)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.h        2015-04-07 21:11:00 UTC (rev 182491)

+++ trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.h        2015-04-07 21:17:36 UTC (rev 182492)

</span><span class="lines">@@ -62,7 +62,7 @@

</span><span class="cx">         unsigned destination;

</span><span class="cx">         bool caseSensitive;

</span><span class="cx">     };

</span><del>-    void compileNode(unsigned);

</del><ins>+    void compileNode(unsigned, bool root);

</ins><span class="cx">     void compileNodeTransitions(const DFANode&amp;);

</span><span class="cx">     void compileCheckForRange(const Range&amp;);

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformURLcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.cpp (182491 => 182492)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/URL.cpp        2015-04-07 21:11:00 UTC (rev 182491)

+++ trunk/Source/WebCore/platform/URL.cpp        2015-04-07 21:17:36 UTC (rev 182492)

</span><span class="lines">@@ -470,7 +470,7 @@

</span><span class="cx">     // For compatibility with Win IE, treat backslashes as if they were slashes,

<span class="cx">     // as long as we're not dealing with javascript: or data: URLs.

</span><span class="cx">     String rel = relative;

</span><del>-    if (rel.contains('\\') &amp;&amp; !(protocolIsJavaScript(rel) || protocolIs(rel, &quot;data&quot;)))

</del><ins>+    if (rel.contains('\\') &amp;&amp; !(WebCore::protocolIsJavaScript(rel) || protocolIs(rel, &quot;data&quot;)))

</ins><span class="cx">         rel = substituteBackslashes(rel);

</span><span class="cx"> 

</span><span class="cx">     bool allASCII = rel.containsOnlyASCII();

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformURLh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.h (182491 => 182492)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/URL.h        2015-04-07 21:11:00 UTC (rev 182491)

+++ trunk/Source/WebCore/platform/URL.h        2015-04-07 21:17:36 UTC (rev 182492)

</span><span class="lines">@@ -127,6 +127,7 @@

<span class="cx">     // terminated ASCII argument. The argument must be lower-case.

</span><span class="cx">     WEBCORE_EXPORT bool protocolIs(const char*) const;

</span><span class="cx">     bool protocolIsData() const { return protocolIs(&quot;data&quot;); }

</span><ins>+    bool protocolIsJavaScript() const { return protocolIs(&quot;javascript&quot;); }

</ins><span class="cx">     bool protocolIsInHTTPFamily() const;

</span><span class="cx">     WEBCORE_EXPORT bool isLocalFile() const;

</span><span class="cx">     bool isBlankURL() const;

</span></span></pre>

</div>

</div>

</body>

</html>