<!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>[161622] 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/161622">161622</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-09 23:19:29 -0800 (Thu, 09 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up ProgressTracker a little
https://bugs.webkit.org/show_bug.cgi?id=126738
Reviewed by Dan Bernstein.
Use Frame& where the frame can never be null, avoid an extra hash lookup and
switch the m_progressItems map over to std::unique_ptr.
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::frameStartedLoading):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::FrameProgressTracker::~FrameProgressTracker):
(WebCore::FrameLoader::FrameProgressTracker::progressStarted):
(WebCore::FrameLoader::FrameProgressTracker::progressCompleted):
* loader/ProgressTracker.cpp:
(WebCore::ProgressTracker::progressStarted):
(WebCore::ProgressTracker::progressCompleted):
(WebCore::ProgressTracker::incrementProgress):
* loader/ProgressTracker.h:
* loader/ResourceLoadNotifier.cpp:
(WebCore::ResourceLoadNotifier::didReceiveData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderProgressTrackercpp">trunk/Source/WebCore/loader/ProgressTracker.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderProgressTrackerh">trunk/Source/WebCore/loader/ProgressTracker.h</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadNotifiercpp">trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161621 => 161622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-10 06:22:17 UTC (rev 161621)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 07:19:29 UTC (rev 161622)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-01-09 Anders Carlsson <andersca@apple.com>
+
+ Clean up ProgressTracker a little
+ https://bugs.webkit.org/show_bug.cgi?id=126738
+
+ Reviewed by Dan Bernstein.
+
+ Use Frame& where the frame can never be null, avoid an extra hash lookup and
+ switch the m_progressItems map over to std::unique_ptr.
+
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::frameStartedLoading):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::FrameProgressTracker::~FrameProgressTracker):
+ (WebCore::FrameLoader::FrameProgressTracker::progressStarted):
+ (WebCore::FrameLoader::FrameProgressTracker::progressCompleted):
+ * loader/ProgressTracker.cpp:
+ (WebCore::ProgressTracker::progressStarted):
+ (WebCore::ProgressTracker::progressCompleted):
+ (WebCore::ProgressTracker::incrementProgress):
+ * loader/ProgressTracker.h:
+ * loader/ResourceLoadNotifier.cpp:
+ (WebCore::ResourceLoadNotifier::didReceiveData):
+
</ins><span class="cx"> 2014-01-09 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Fix a build break on EFL debug build
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (161621 => 161622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-01-10 06:22:17 UTC (rev 161621)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-01-10 07:19:29 UTC (rev 161622)
</span><span class="lines">@@ -195,8 +195,8 @@
</span><span class="cx"> static void didCommitLoad(Frame*, DocumentLoader*);
</span><span class="cx"> static void frameDocumentUpdated(Frame*);
</span><span class="cx"> static void loaderDetachedFromFrame(Frame*, DocumentLoader*);
</span><del>- static void frameStartedLoading(Frame*);
- static void frameStoppedLoading(Frame*);
</del><ins>+ static void frameStartedLoading(Frame&);
+ static void frameStoppedLoading(Frame&);
</ins><span class="cx"> static void frameScheduledNavigation(Frame*, double delay);
</span><span class="cx"> static void frameClearedScheduledNavigation(Frame*);
</span><span class="cx"> static InspectorInstrumentationCookie willRunJavaScriptDialog(Page*, const String& message);
</span><span class="lines">@@ -1606,21 +1606,21 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::frameStartedLoading(Frame* frame)
</del><ins>+inline void InspectorInstrumentation::frameStartedLoading(Frame& frame)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
- frameStartedLoadingImpl(instrumentingAgents, frame);
</del><ins>+ if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(&frame))
+ frameStartedLoadingImpl(instrumentingAgents, &frame);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(frame);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::frameStoppedLoading(Frame* frame)
</del><ins>+inline void InspectorInstrumentation::frameStoppedLoading(Frame& frame)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
- frameStoppedLoadingImpl(instrumentingAgents, frame);
</del><ins>+ if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(&frame))
+ frameStoppedLoadingImpl(instrumentingAgents, &frame);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(frame);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (161621 => 161622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-01-10 06:22:17 UTC (rev 161621)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-01-10 07:19:29 UTC (rev 161622)
</span><span class="lines">@@ -198,14 +198,14 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_inProgress || m_frame.page());
</span><span class="cx"> if (m_inProgress)
</span><del>- m_frame.page()->progress().progressCompleted(&m_frame);
</del><ins>+ m_frame.page()->progress().progressCompleted(m_frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void progressStarted()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_frame.page());
</span><span class="cx"> if (!m_inProgress)
</span><del>- m_frame.page()->progress().progressStarted(&m_frame);
</del><ins>+ m_frame.page()->progress().progressStarted(m_frame);
</ins><span class="cx"> m_inProgress = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> ASSERT(m_inProgress);
</span><span class="cx"> ASSERT(m_frame.page());
</span><span class="cx"> m_inProgress = false;
</span><del>- m_frame.page()->progress().progressCompleted(&m_frame);
</del><ins>+ m_frame.page()->progress().progressCompleted(m_frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderProgressTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ProgressTracker.cpp (161621 => 161622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ProgressTracker.cpp 2014-01-10 06:22:17 UTC (rev 161621)
+++ trunk/Source/WebCore/loader/ProgressTracker.cpp 2014-01-10 07:19:29 UTC (rev 161622)
</span><span class="lines">@@ -112,16 +112,16 @@
</span><span class="cx"> m_progressHeartbeatTimer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ProgressTracker::progressStarted(Frame* frame)
</del><ins>+void ProgressTracker::progressStarted(Frame& frame)
</ins><span class="cx"> {
</span><del>- LOG(Progress, "Progress started (%p) - frame %p(\"%s\"), value %f, tracked frames %d, originating frame %p", this, frame, frame->tree().uniqueName().string().utf8().data(), m_progressValue, m_numProgressTrackedFrames, m_originatingProgressFrame.get());
</del><ins>+ LOG(Progress, "Progress started (%p) - frame %p(\"%s\"), value %f, tracked frames %d, originating frame %p", this, &frame, frame.tree().uniqueName().string().utf8().data(), m_progressValue, m_numProgressTrackedFrames, m_originatingProgressFrame.get());
</ins><span class="cx">
</span><del>- frame->loader().client().willChangeEstimatedProgress();
</del><ins>+ frame.loader().client().willChangeEstimatedProgress();
</ins><span class="cx">
</span><del>- if (m_numProgressTrackedFrames == 0 || m_originatingProgressFrame == frame) {
</del><ins>+ if (!m_numProgressTrackedFrames || m_originatingProgressFrame == &frame) {
</ins><span class="cx"> reset();
</span><span class="cx"> m_progressValue = initialProgressValue;
</span><del>- m_originatingProgressFrame = frame;
</del><ins>+ m_originatingProgressFrame = &frame;
</ins><span class="cx">
</span><span class="cx"> m_progressHeartbeatTimer.startRepeating(progressHeartbeatInterval);
</span><span class="cx"> m_originatingProgressFrame->loader().loadProgressingStatusChanged();
</span><span class="lines">@@ -130,24 +130,24 @@
</span><span class="cx"> }
</span><span class="cx"> m_numProgressTrackedFrames++;
</span><span class="cx">
</span><del>- frame->loader().client().didChangeEstimatedProgress();
</del><ins>+ frame.loader().client().didChangeEstimatedProgress();
</ins><span class="cx"> InspectorInstrumentation::frameStartedLoading(frame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ProgressTracker::progressCompleted(Frame* frame)
</del><ins>+void ProgressTracker::progressCompleted(Frame& frame)
</ins><span class="cx"> {
</span><del>- LOG(Progress, "Progress completed (%p) - frame %p(\"%s\"), value %f, tracked frames %d, originating frame %p", this, frame, frame->tree().uniqueName().string().utf8().data(), m_progressValue, m_numProgressTrackedFrames, m_originatingProgressFrame.get());
</del><ins>+ LOG(Progress, "Progress completed (%p) - frame %p(\"%s\"), value %f, tracked frames %d, originating frame %p", this, &frame, frame.tree().uniqueName().string().utf8().data(), m_progressValue, m_numProgressTrackedFrames, m_originatingProgressFrame.get());
</ins><span class="cx">
</span><span class="cx"> if (m_numProgressTrackedFrames <= 0)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- frame->loader().client().willChangeEstimatedProgress();
</del><ins>+ frame.loader().client().willChangeEstimatedProgress();
</ins><span class="cx">
</span><span class="cx"> m_numProgressTrackedFrames--;
</span><del>- if (!m_numProgressTrackedFrames || m_originatingProgressFrame == frame)
</del><ins>+ if (!m_numProgressTrackedFrames || m_originatingProgressFrame == &frame)
</ins><span class="cx"> finalProgressComplete();
</span><span class="cx">
</span><del>- frame->loader().client().didChangeEstimatedProgress();
</del><ins>+ frame.loader().client().didChangeEstimatedProgress();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ProgressTracker::finalProgressComplete()
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> frame->loader().client().postProgressFinishedNotification();
</span><span class="cx"> frame->loader().loadProgressingStatusChanged();
</span><span class="cx">
</span><del>- InspectorInstrumentation::frameStoppedLoading(frame.get());
</del><ins>+ InspectorInstrumentation::frameStoppedLoading(*frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ProgressTracker::incrementProgress(unsigned long identifier, const ResourceResponse& response)
</span><span class="lines">@@ -185,14 +185,17 @@
</span><span class="cx">
</span><span class="cx"> m_totalPageAndResourceBytesToLoad += estimatedLength;
</span><span class="cx">
</span><del>- if (ProgressItem* item = m_progressItems.get(identifier)) {
- item->bytesReceived = 0;
- item->estimatedLength = estimatedLength;
- } else
- m_progressItems.set(identifier, adoptPtr(new ProgressItem(estimatedLength)));
</del><ins>+ auto& item = m_progressItems.add(identifier, nullptr).iterator->value;
+ if (!item) {
+ item = std::make_unique<ProgressItem>(estimatedLength);
+ return;
+ }
+
+ item->bytesReceived = 0;
+ item->estimatedLength = estimatedLength;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ProgressTracker::incrementProgress(unsigned long identifier, const char*, int length)
</del><ins>+void ProgressTracker::incrementProgress(unsigned long identifier, unsigned bytesReceived)
</ins><span class="cx"> {
</span><span class="cx"> ProgressItem* item = m_progressItems.get(identifier);
</span><span class="cx">
</span><span class="lines">@@ -204,7 +207,6 @@
</span><span class="cx">
</span><span class="cx"> frame->loader().client().willChangeEstimatedProgress();
</span><span class="cx">
</span><del>- unsigned bytesReceived = length;
</del><span class="cx"> double increment, percentOfRemainingBytes;
</span><span class="cx"> long long remainingBytes, estimatedBytesForPendingRequests;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderProgressTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ProgressTracker.h (161621 => 161622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ProgressTracker.h 2014-01-10 06:22:17 UTC (rev 161621)
+++ trunk/Source/WebCore/loader/ProgressTracker.h 2014-01-10 07:19:29 UTC (rev 161622)
</span><span class="lines">@@ -49,11 +49,11 @@
</span><span class="cx">
</span><span class="cx"> double estimatedProgress() const;
</span><span class="cx">
</span><del>- void progressStarted(Frame*);
- void progressCompleted(Frame*);
</del><ins>+ void progressStarted(Frame&);
+ void progressCompleted(Frame&);
</ins><span class="cx">
</span><span class="cx"> void incrementProgress(unsigned long identifier, const ResourceResponse&);
</span><del>- void incrementProgress(unsigned long identifier, const char*, int);
</del><ins>+ void incrementProgress(unsigned long identifier, unsigned bytesReceived);
</ins><span class="cx"> void completeProgress(unsigned long identifier);
</span><span class="cx">
</span><span class="cx"> long long totalPageAndResourceBytesToLoad() const { return m_totalPageAndResourceBytesToLoad; }
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> RefPtr<Frame> m_originatingProgressFrame;
</span><span class="cx">
</span><span class="cx"> int m_numProgressTrackedFrames;
</span><del>- HashMap<unsigned long, OwnPtr<ProgressItem>> m_progressItems;
</del><ins>+ HashMap<unsigned long, std::unique_ptr<ProgressItem>> m_progressItems;
</ins><span class="cx">
</span><span class="cx"> Timer<ProgressTracker> m_progressHeartbeatTimer;
</span><span class="cx"> unsigned m_heartbeatsWithNoProgress;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadNotifiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp (161621 => 161622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp 2014-01-10 06:22:17 UTC (rev 161621)
+++ trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp 2014-01-10 07:19:29 UTC (rev 161622)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> void ResourceLoadNotifier::didReceiveData(ResourceLoader* loader, const char* data, int dataLength, int encodedDataLength)
</span><span class="cx"> {
</span><span class="cx"> if (Page* page = m_frame.page())
</span><del>- page->progress().incrementProgress(loader->identifier(), data, dataLength);
</del><ins>+ page->progress().incrementProgress(loader->identifier(), dataLength);
</ins><span class="cx">
</span><span class="cx"> dispatchDidReceiveData(loader->documentLoader(), loader->identifier(), data, dataLength, encodedDataLength);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>