<!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>[218944] 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/218944">218944</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-06-29 10:58:30 -0700 (Thu, 29 Jun 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Avoid copying ResourceLoadStatistics objects
https://bugs.webkit.org/show_bug.cgi?id=173972

Reviewed by Geoffrey Garen.

Avoid copying ResourceLoadStatistics objects given that they are big. Make the type move-only
to avoid such mistakes in the future.

* loader/ResourceLoadObserver.cpp:
(WebCore::ResourceLoadObserver::logFrameNavigation):
* loader/ResourceLoadStatistics.h:
(WebCore::ResourceLoadStatistics::ResourceLoadStatistics):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadObservercpp">trunk/Source/WebCore/loader/ResourceLoadObserver.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadStatisticsh">trunk/Source/WebCore/loader/ResourceLoadStatistics.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (218943 => 218944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2017-06-29 17:54:32 UTC (rev 218943)
+++ trunk/Source/WebCore/ChangeLog      2017-06-29 17:58:30 UTC (rev 218944)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-06-29  Chris Dumez  <cdumez@apple.com>
+
+        Avoid copying ResourceLoadStatistics objects
+        https://bugs.webkit.org/show_bug.cgi?id=173972
+
+        Reviewed by Geoffrey Garen.
+
+        Avoid copying ResourceLoadStatistics objects given that they are big. Make the type move-only
+        to avoid such mistakes in the future.
+
+        * loader/ResourceLoadObserver.cpp:
+        (WebCore::ResourceLoadObserver::logFrameNavigation):
+        * loader/ResourceLoadStatistics.h:
+        (WebCore::ResourceLoadStatistics::ResourceLoadStatistics):
+
</ins><span class="cx"> 2017-06-29  Antoine Quint  <graouts@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Full stop shows to the right of the picture-in-picture localised string in Hebrew
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadObservercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadObserver.cpp (218943 => 218944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadObserver.cpp     2017-06-29 17:54:32 UTC (rev 218943)
+++ trunk/Source/WebCore/loader/ResourceLoadObserver.cpp        2017-06-29 17:58:30 UTC (rev 218944)
</span><span class="lines">@@ -150,59 +150,58 @@
</span><span class="cx">         bool shouldFireDataModificationHandler = false;
</span><span class="cx">         
</span><span class="cx">         {
</span><del>-        auto locker = holdLock(m_store->statisticsLock());
-        // We must make a copy here, because later calls to 'ensureResourceStatisticsForPrimaryDomain' will invalidate the returned reference:
-        auto targetStatistics = m_store->ensureResourceStatisticsForPrimaryDomain(targetPrimaryDomain);
</del><ins>+            auto locker = holdLock(m_store->statisticsLock());
+            ResourceLoadStatistics targetStatistics(targetPrimaryDomain);
</ins><span class="cx"> 
</span><del>-        // Always fire if we have previously removed data records for this domain
-        shouldFireDataModificationHandler = targetStatistics.dataRecordsRemoved > 0;
</del><ins>+            // Always fire if we have previously removed data records for this domain
+            shouldFireDataModificationHandler = targetStatistics.dataRecordsRemoved > 0;
</ins><span class="cx"> 
</span><del>-        if (isMainFrame)
-            targetStatistics.topFrameHasBeenNavigatedToBefore = true;
-        else {
-            targetStatistics.subframeHasBeenLoadedBefore = true;
</del><ins>+            if (isMainFrame)
+                targetStatistics.topFrameHasBeenNavigatedToBefore = true;
+            else {
+                targetStatistics.subframeHasBeenLoadedBefore = true;
</ins><span class="cx"> 
</span><del>-            auto subframeUnderTopFrameOriginsResult = targetStatistics.subframeUnderTopFrameOrigins.add(mainFramePrimaryDomain);
-            if (subframeUnderTopFrameOriginsResult.isNewEntry)
-                shouldFireDataModificationHandler = true;
-        }
-        
-        if (isRedirect) {
-            auto& redirectingOriginResourceStatistics = m_store->ensureResourceStatisticsForPrimaryDomain(sourcePrimaryDomain);
-            
-            if (m_store->isPrevalentResource(targetPrimaryDomain))
-                redirectingOriginResourceStatistics.redirectedToOtherPrevalentResourceOrigins.add(targetPrimaryDomain);
-            
-            if (isMainFrame) {
-                ++targetStatistics.topFrameHasBeenRedirectedTo;
-                ++redirectingOriginResourceStatistics.topFrameHasBeenRedirectedFrom;
-            } else {
-                ++targetStatistics.subframeHasBeenRedirectedTo;
-                ++redirectingOriginResourceStatistics.subframeHasBeenRedirectedFrom;
-                redirectingOriginResourceStatistics.subframeUniqueRedirectsTo.add(targetPrimaryDomain);
-                
-                ++targetStatistics.subframeSubResourceCount;
</del><ins>+                auto subframeUnderTopFrameOriginsResult = targetStatistics.subframeUnderTopFrameOrigins.add(mainFramePrimaryDomain);
+                if (subframeUnderTopFrameOriginsResult.isNewEntry)
+                    shouldFireDataModificationHandler = true;
</ins><span class="cx">             }
</span><del>-        } else {
-            if (sourcePrimaryDomain.isNull() || sourcePrimaryDomain.isEmpty() || sourcePrimaryDomain == "nullOrigin") {
-                if (isMainFrame)
-                    ++targetStatistics.topFrameInitialLoadCount;
-                else
-                    ++targetStatistics.subframeSubResourceCount;
-            } else {
-                auto& sourceOriginResourceStatistics = m_store->ensureResourceStatisticsForPrimaryDomain(sourcePrimaryDomain);
</del><span class="cx"> 
</span><ins>+            if (isRedirect) {
+                auto& redirectingOriginResourceStatistics = m_store->ensureResourceStatisticsForPrimaryDomain(sourcePrimaryDomain);
+
+                if (m_store->isPrevalentResource(targetPrimaryDomain))
+                    redirectingOriginResourceStatistics.redirectedToOtherPrevalentResourceOrigins.add(targetPrimaryDomain);
+
</ins><span class="cx">                 if (isMainFrame) {
</span><del>-                    ++sourceOriginResourceStatistics.topFrameHasBeenNavigatedFrom;
-                    ++targetStatistics.topFrameHasBeenNavigatedTo;
</del><ins>+                    ++targetStatistics.topFrameHasBeenRedirectedTo;
+                    ++redirectingOriginResourceStatistics.topFrameHasBeenRedirectedFrom;
</ins><span class="cx">                 } else {
</span><del>-                    ++sourceOriginResourceStatistics.subframeHasBeenNavigatedFrom;
-                    ++targetStatistics.subframeHasBeenNavigatedTo;
</del><ins>+                    ++targetStatistics.subframeHasBeenRedirectedTo;
+                    ++redirectingOriginResourceStatistics.subframeHasBeenRedirectedFrom;
+                    redirectingOriginResourceStatistics.subframeUniqueRedirectsTo.add(targetPrimaryDomain);
+
+                    ++targetStatistics.subframeSubResourceCount;
</ins><span class="cx">                 }
</span><ins>+            } else {
+                if (sourcePrimaryDomain.isNull() || sourcePrimaryDomain.isEmpty() || sourcePrimaryDomain == "nullOrigin") {
+                    if (isMainFrame)
+                        ++targetStatistics.topFrameInitialLoadCount;
+                    else
+                        ++targetStatistics.subframeSubResourceCount;
+                } else {
+                    auto& sourceOriginResourceStatistics = m_store->ensureResourceStatisticsForPrimaryDomain(sourcePrimaryDomain);
+
+                    if (isMainFrame) {
+                        ++sourceOriginResourceStatistics.topFrameHasBeenNavigatedFrom;
+                        ++targetStatistics.topFrameHasBeenNavigatedTo;
+                    } else {
+                        ++sourceOriginResourceStatistics.subframeHasBeenNavigatedFrom;
+                        ++targetStatistics.subframeHasBeenNavigatedTo;
+                    }
+                }
</ins><span class="cx">             }
</span><del>-        }
-            
-        m_store->setResourceStatisticsForPrimaryDomain(targetPrimaryDomain, WTFMove(targetStatistics));
</del><ins>+
+            m_store->setResourceStatisticsForPrimaryDomain(targetPrimaryDomain, WTFMove(targetStatistics));
</ins><span class="cx">         } // Release lock
</span><span class="cx">         
</span><span class="cx">         if (shouldFireDataModificationHandler)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadStatisticsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadStatistics.h (218943 => 218944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadStatistics.h     2017-06-29 17:54:32 UTC (rev 218943)
+++ trunk/Source/WebCore/loader/ResourceLoadStatistics.h        2017-06-29 17:58:30 UTC (rev 218944)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> class KeyedEncoder;
</span><span class="cx"> 
</span><span class="cx"> struct ResourceLoadStatistics {
</span><del>-    ResourceLoadStatistics(const String& primaryDomain)
</del><ins>+    explicit ResourceLoadStatistics(const String& primaryDomain)
</ins><span class="cx">         : highLevelDomain(primaryDomain)
</span><span class="cx">     {
</span><span class="cx">     }
</span><span class="lines">@@ -43,6 +43,11 @@
</span><span class="cx"> 
</span><span class="cx">     ResourceLoadStatistics() = default;
</span><span class="cx"> 
</span><ins>+    ResourceLoadStatistics(const ResourceLoadStatistics&) = delete;
+    ResourceLoadStatistics& operator=(const ResourceLoadStatistics&) = delete;
+    ResourceLoadStatistics(ResourceLoadStatistics&&) = default;
+    ResourceLoadStatistics& operator=(ResourceLoadStatistics&&) = default;
+
</ins><span class="cx">     void encode(KeyedEncoder&) const;
</span><span class="cx">     bool decode(KeyedDecoder&, unsigned version);
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>