<!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>[183832] trunk</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/183832">183832</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-05-05 15:20:34 -0700 (Tue, 05 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Content Extensions] Use less memory to store the json input.
https://bugs.webkit.org/show_bug.cgi?id=144604
Reviewed by Benjamin Poulain.
Source/WebCore:
* contentextensions/ContentExtensionCompiler.cpp:
(WebCore::ContentExtensions::compileRuleList):
* contentextensions/ContentExtensionCompiler.h:
(WebCore::ContentExtensions::loadEncodedRules):
Don't copy strings as much or keep them alive after done using them.
Source/WebKit2:
* UIProcess/API/APIUserContentExtensionStore.cpp:
(API::compiledToFile):
(API::UserContentExtensionStore::compileContentExtension):
* UIProcess/API/APIUserContentExtensionStore.h:
Don't copy strings as much or keep them alive after done using them.
Tools:
* MiniBrowser/mac/ExtensionManagerWindowController.m:
(-[ExtensionManagerWindowController add:]):
* TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
(TestWebKitAPI::InMemoryCompiledContentExtension::createFromFilter):
* WebKitTestRunner/mac/TestControllerMac.mm:
(WTR::TestController::platformConfigureViewForTest):</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="#trunkSourceWebCorecontentextensionsContentExtensionCompilerh">trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUserContentExtensionStorecpp">trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUserContentExtensionStoreh">trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreContentExtensionscpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183831 => 183832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-05 22:01:42 UTC (rev 183831)
+++ trunk/Source/WebCore/ChangeLog 2015-05-05 22:20:34 UTC (rev 183832)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-05-05 Alex Christensen <achristensen@webkit.org>
+
+ [Content Extensions] Use less memory to store the json input.
+ https://bugs.webkit.org/show_bug.cgi?id=144604
+
+ Reviewed by Benjamin Poulain.
+
+ * contentextensions/ContentExtensionCompiler.cpp:
+ (WebCore::ContentExtensions::compileRuleList):
+ * contentextensions/ContentExtensionCompiler.h:
+ (WebCore::ContentExtensions::loadEncodedRules):
+ Don't copy strings as much or keep them alive after done using them.
+
</ins><span class="cx"> 2015-05-05 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Prevent recursive calls to show target picker menu.
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp (183831 => 183832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2015-05-05 22:01:42 UTC (rev 183831)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2015-05-05 22:20:34 UTC (rev 183832)
</span><span class="lines">@@ -136,10 +136,11 @@
</span><span class="cx"> dfa.nodes[dfa.root].setActions(actionsStart, static_cast<uint16_t>(actionsLength));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::error_code compileRuleList(ContentExtensionCompilationClient& client, const String& ruleList)
</del><ins>+std::error_code compileRuleList(ContentExtensionCompilationClient& client, String&& ruleList)
</ins><span class="cx"> {
</span><span class="cx"> Vector<ContentExtensionRule> parsedRuleList;
</span><span class="cx"> auto parserError = parseRuleList(ruleList, parsedRuleList);
</span><ins>+ ruleList = String();
</ins><span class="cx"> if (parserError)
</span><span class="cx"> return parserError;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.h (183831 => 183832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.h 2015-05-05 22:01:42 UTC (rev 183831)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.h 2015-05-05 22:20:34 UTC (rev 183832)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> virtual void finalize() = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WEBCORE_EXPORT std::error_code compileRuleList(ContentExtensionCompilationClient&, const String&);
</del><ins>+WEBCORE_EXPORT std::error_code compileRuleList(ContentExtensionCompilationClient&, String&&);
</ins><span class="cx">
</span><span class="cx"> } // namespace ContentExtensions
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183831 => 183832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-05 22:01:42 UTC (rev 183831)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-05 22:20:34 UTC (rev 183832)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-05-05 Alex Christensen <achristensen@webkit.org>
+
+ [Content Extensions] Use less memory to store the json input.
+ https://bugs.webkit.org/show_bug.cgi?id=144604
+
+ Reviewed by Benjamin Poulain.
+
+ * UIProcess/API/APIUserContentExtensionStore.cpp:
+ (API::compiledToFile):
+ (API::UserContentExtensionStore::compileContentExtension):
+ * UIProcess/API/APIUserContentExtensionStore.h:
+ Don't copy strings as much or keep them alive after done using them.
+
</ins><span class="cx"> 2015-05-04 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Use less memory when writing byte code to file
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUserContentExtensionStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp (183831 => 183832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2015-05-05 22:01:42 UTC (rev 183831)
+++ trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2015-05-05 22:20:34 UTC (rev 183832)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> return success;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static std::error_code compiledToFile(const String& json, const String& finalFilePath, ContentExtensionMetaData& metaData, Data& mappedData)
</del><ins>+static std::error_code compiledToFile(String&& json, const String& finalFilePath, ContentExtensionMetaData& metaData, Data& mappedData)
</ins><span class="cx"> {
</span><span class="cx"> using namespace WebCore::ContentExtensions;
</span><span class="cx">
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx">
</span><span class="cx"> CompilationClient compilationClient(temporaryFileHandle, metaData);
</span><span class="cx">
</span><del>- if (auto compilerError = compileRuleList(compilationClient, json))
</del><ins>+ if (auto compilerError = compileRuleList(compilationClient, WTF::move(json)))
</ins><span class="cx"> return compilerError;
</span><span class="cx"> if (compilationClient.hadErrorWhileWritingToFile())
</span><span class="cx"> return UserContentExtensionStore::Error::CompileFailed;
</span><span class="lines">@@ -280,19 +280,19 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UserContentExtensionStore::compileContentExtension(const WTF::String& identifier, const WTF::String& json, std::function<void(RefPtr<API::UserContentExtension>, std::error_code)> completionHandler)
</del><ins>+void UserContentExtensionStore::compileContentExtension(const WTF::String& identifier, WTF::String&& json, std::function<void(RefPtr<API::UserContentExtension>, std::error_code)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<UserContentExtensionStore> self(this);
</span><span class="cx"> StringCapture identifierCapture(identifier);
</span><del>- StringCapture jsonCapture(json);
</del><ins>+ StringCapture jsonCapture(WTF::move(json));
</ins><span class="cx"> StringCapture pathCapture(m_storePath);
</span><span class="cx">
</span><del>- m_compileQueue->dispatch([self, identifierCapture, jsonCapture, pathCapture, completionHandler] {
</del><ins>+ m_compileQueue->dispatch([self, identifierCapture, jsonCapture, pathCapture, completionHandler] () mutable {
</ins><span class="cx"> auto path = constructedPath(pathCapture.string(), identifierCapture.string());
</span><span class="cx">
</span><span class="cx"> ContentExtensionMetaData metaData;
</span><span class="cx"> Data fileData;
</span><del>- auto error = compiledToFile(jsonCapture.string(), path, metaData, fileData);
</del><ins>+ auto error = compiledToFile(jsonCapture.releaseString(), path, metaData, fileData);
</ins><span class="cx"> if (error) {
</span><span class="cx"> RunLoop::main().dispatch([self, error, completionHandler] {
</span><span class="cx"> completionHandler(nullptr, error);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUserContentExtensionStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.h (183831 => 183832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.h 2015-05-05 22:01:42 UTC (rev 183831)
+++ trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.h 2015-05-05 22:20:34 UTC (rev 183832)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> explicit UserContentExtensionStore(const WTF::String& storePath);
</span><span class="cx"> virtual ~UserContentExtensionStore();
</span><span class="cx">
</span><del>- void compileContentExtension(const WTF::String& identifier, const WTF::String& json, std::function<void(RefPtr<API::UserContentExtension>, std::error_code)>);
</del><ins>+ void compileContentExtension(const WTF::String& identifier, WTF::String&& json, std::function<void(RefPtr<API::UserContentExtension>, std::error_code)>);
</ins><span class="cx"> void lookupContentExtension(const WTF::String& identifier, std::function<void(RefPtr<API::UserContentExtension>, std::error_code)>);
</span><span class="cx"> void removeContentExtension(const WTF::String& identifier, std::function<void(std::error_code)>);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (183831 => 183832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-05-05 22:01:42 UTC (rev 183831)
+++ trunk/Tools/ChangeLog 2015-05-05 22:20:34 UTC (rev 183832)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-05-05 Alex Christensen <achristensen@webkit.org>
+
+ [Content Extensions] Use less memory to store the json input.
+ https://bugs.webkit.org/show_bug.cgi?id=144604
+
+ Reviewed by Benjamin Poulain.
+
+ * MiniBrowser/mac/ExtensionManagerWindowController.m:
+ (-[ExtensionManagerWindowController add:]):
+ * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
+ (TestWebKitAPI::InMemoryCompiledContentExtension::createFromFilter):
+ * WebKitTestRunner/mac/TestControllerMac.mm:
+ (WTR::TestController::platformConfigureViewForTest):
+
</ins><span class="cx"> 2015-05-05 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Make myself a WebKit reviewer.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreContentExtensionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp (183831 => 183832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2015-05-05 22:01:42 UTC (rev 183831)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2015-05-05 22:20:34 UTC (rev 183832)
</span><span class="lines">@@ -109,11 +109,11 @@
</span><span class="cx">
</span><span class="cx"> class InMemoryCompiledContentExtension : public ContentExtensions::CompiledContentExtension {
</span><span class="cx"> public:
</span><del>- static RefPtr<InMemoryCompiledContentExtension> createFromFilter(const String& filter)
</del><ins>+ static RefPtr<InMemoryCompiledContentExtension> createFromFilter(String&& filter)
</ins><span class="cx"> {
</span><span class="cx"> WebCore::ContentExtensions::CompiledContentExtensionData extensionData;
</span><span class="cx"> InMemoryContentExtensionCompilationClient client(extensionData);
</span><del>- auto compilerError = ContentExtensions::compileRuleList(client, filter);
</del><ins>+ auto compilerError = ContentExtensions::compileRuleList(client, WTF::move(filter));
</ins><span class="cx"> if (compilerError)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>