<!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>[168845] trunk/Source</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/168845">168845</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2014-05-14 10:44:18 -0700 (Wed, 14 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use references instead of pointers with ResourceLoadTiming.
https://bugs.webkit.org/show_bug.cgi?id=132846
Reviewed by Alexey Proskuryakov.
Source/WebCore:
* WebCore.exp.in:
Removed ResourceResponseBase::setResourceLoadTiming linker symbol.
* inspector/InspectorResourceAgent.cpp:
(WebCore::buildObjectForResourceResponse):
* page/PerformanceResourceTiming.cpp:
(WebCore::PerformanceResourceTiming::domainLookupStart):
(WebCore::PerformanceResourceTiming::domainLookupEnd):
(WebCore::PerformanceResourceTiming::connectStart):
(WebCore::PerformanceResourceTiming::connectEnd):
(WebCore::PerformanceResourceTiming::secureConnectionStart):
(WebCore::PerformanceResourceTiming::requestStart):
Use references instead of pointers.
* page/PerformanceResourceTiming.h:
Make an instance instead of a RefPtr.
* page/PerformanceTiming.cpp:
(WebCore::PerformanceTiming::domainLookupStart):
(WebCore::PerformanceTiming::domainLookupEnd):
(WebCore::PerformanceTiming::connectStart):
(WebCore::PerformanceTiming::connectEnd):
(WebCore::PerformanceTiming::secureConnectionStart):
(WebCore::PerformanceTiming::requestStart):
(WebCore::PerformanceTiming::responseStart):
Check to see if the loader exists, then use ResourceLoadTiming reference.
(WebCore::PerformanceTiming::resourceLoadTiming): Deleted.
* page/PerformanceTiming.h:
Removed resourceLoadTiming declaration.
* platform/network/ResourceLoadTiming.h:
(WebCore::ResourceLoadTiming::ResourceLoadTiming):
(WebCore::ResourceLoadTiming::operator=):
Replaced reference counting with copy constructors.
(WebCore::ResourceLoadTiming::create): Deleted.
(WebCore::ResourceLoadTiming::deepCopy): Deleted.
* platform/network/ResourceResponseBase.cpp:
(WebCore::ResourceResponseBase::adopt):
(WebCore::ResourceResponseBase::copyData):
(WebCore::ResourceResponseBase::resourceLoadTiming):
(WebCore::ResourceResponseBase::setResourceLoadTiming):
(WebCore::ResourceResponseBase::compare):
* platform/network/ResourceResponseBase.h:
* platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
(-[WebCoreResourceHandleAsDelegate connection:didReceiveResponse:]):
* platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
(-[WebCoreResourceHandleAsOperationQueueDelegate connection:didReceiveResponse:]):
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::ResourceHandle::didStartRequest):
(WebCore::networkEventCallback):
Use references instead of pointers.
Source/WebKit2:
* Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<ResourceResponse>::encode):
(IPC::ArgumentCoder<ResourceResponse>::decode):
Use references instead of pointers and null checks.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgentcpp">trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePerformanceResourceTimingcpp">trunk/Source/WebCore/page/PerformanceResourceTiming.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePerformanceResourceTimingh">trunk/Source/WebCore/page/PerformanceResourceTiming.h</a></li>
<li><a href="#trunkSourceWebCorepagePerformanceTimingcpp">trunk/Source/WebCore/page/PerformanceTiming.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePerformanceTimingh">trunk/Source/WebCore/page/PerformanceTiming.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceLoadTimingh">trunk/Source/WebCore/platform/network/ResourceLoadTiming.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceResponseBasecpp">trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceResponseBaseh">trunk/Source/WebCore/platform/network/ResourceResponseBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsDelegatemm">trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsOperationQueueDelegatemm">trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168844 => 168845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-14 17:29:46 UTC (rev 168844)
+++ trunk/Source/WebCore/ChangeLog 2014-05-14 17:44:18 UTC (rev 168845)
</span><span class="lines">@@ -1,3 +1,58 @@
</span><ins>+2014-05-14 Alex Christensen <achristensen@webkit.org>
+
+ Use references instead of pointers with ResourceLoadTiming.
+ https://bugs.webkit.org/show_bug.cgi?id=132846
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebCore.exp.in:
+ Removed ResourceResponseBase::setResourceLoadTiming linker symbol.
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::buildObjectForResourceResponse):
+ * page/PerformanceResourceTiming.cpp:
+ (WebCore::PerformanceResourceTiming::domainLookupStart):
+ (WebCore::PerformanceResourceTiming::domainLookupEnd):
+ (WebCore::PerformanceResourceTiming::connectStart):
+ (WebCore::PerformanceResourceTiming::connectEnd):
+ (WebCore::PerformanceResourceTiming::secureConnectionStart):
+ (WebCore::PerformanceResourceTiming::requestStart):
+ Use references instead of pointers.
+ * page/PerformanceResourceTiming.h:
+ Make an instance instead of a RefPtr.
+ * page/PerformanceTiming.cpp:
+ (WebCore::PerformanceTiming::domainLookupStart):
+ (WebCore::PerformanceTiming::domainLookupEnd):
+ (WebCore::PerformanceTiming::connectStart):
+ (WebCore::PerformanceTiming::connectEnd):
+ (WebCore::PerformanceTiming::secureConnectionStart):
+ (WebCore::PerformanceTiming::requestStart):
+ (WebCore::PerformanceTiming::responseStart):
+ Check to see if the loader exists, then use ResourceLoadTiming reference.
+ (WebCore::PerformanceTiming::resourceLoadTiming): Deleted.
+ * page/PerformanceTiming.h:
+ Removed resourceLoadTiming declaration.
+ * platform/network/ResourceLoadTiming.h:
+ (WebCore::ResourceLoadTiming::ResourceLoadTiming):
+ (WebCore::ResourceLoadTiming::operator=):
+ Replaced reference counting with copy constructors.
+ (WebCore::ResourceLoadTiming::create): Deleted.
+ (WebCore::ResourceLoadTiming::deepCopy): Deleted.
+ * platform/network/ResourceResponseBase.cpp:
+ (WebCore::ResourceResponseBase::adopt):
+ (WebCore::ResourceResponseBase::copyData):
+ (WebCore::ResourceResponseBase::resourceLoadTiming):
+ (WebCore::ResourceResponseBase::setResourceLoadTiming):
+ (WebCore::ResourceResponseBase::compare):
+ * platform/network/ResourceResponseBase.h:
+ * platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
+ (-[WebCoreResourceHandleAsDelegate connection:didReceiveResponse:]):
+ * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
+ (-[WebCoreResourceHandleAsOperationQueueDelegate connection:didReceiveResponse:]):
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::ResourceHandle::didStartRequest):
+ (WebCore::networkEventCallback):
+ Use references instead of pointers.
+
</ins><span class="cx"> 2014-05-14 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r168837.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (168844 => 168845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-05-14 17:29:46 UTC (rev 168844)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-05-14 17:44:18 UTC (rev 168845)
</span><span class="lines">@@ -3366,6 +3366,5 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span><del>-__ZN7WebCore20ResourceResponseBase21setResourceLoadTimingEN3WTF10PassRefPtrINS_18ResourceLoadTimingEEE
</del><span class="cx"> __ZNK7WebCore20ResourceResponseBase18resourceLoadTimingEv
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (168844 => 168845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-05-14 17:29:46 UTC (rev 168844)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-05-14 17:44:18 UTC (rev 168845)
</span><span class="lines">@@ -243,8 +243,7 @@
</span><span class="cx"> .setConnectionId(response.connectionID());
</span><span class="cx">
</span><span class="cx"> responseObject->setFromDiskCache(response.wasCached());
</span><del>- if (response.resourceLoadTiming())
- responseObject->setTiming(buildObjectForTiming(*response.resourceLoadTiming(), loader));
</del><ins>+ responseObject->setTiming(buildObjectForTiming(response.resourceLoadTiming(), loader));
</ins><span class="cx">
</span><span class="cx"> return responseObject;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceResourceTimingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceResourceTiming.cpp (168844 => 168845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceResourceTiming.cpp 2014-05-14 17:29:46 UTC (rev 168844)
+++ trunk/Source/WebCore/page/PerformanceResourceTiming.cpp 2014-05-14 17:44:18 UTC (rev 168845)
</span><span class="lines">@@ -120,10 +120,10 @@
</span><span class="cx"> if (!m_shouldReportDetails)
</span><span class="cx"> return 0.0;
</span><span class="cx">
</span><del>- if (!m_timing || m_timing->domainLookupStart < 0)
</del><ins>+ if (m_timing.domainLookupStart < 0)
</ins><span class="cx"> return fetchStart();
</span><span class="cx">
</span><del>- return resourceTimeToDocumentMilliseconds(m_timing->domainLookupStart);
</del><ins>+ return resourceTimeToDocumentMilliseconds(m_timing.domainLookupStart);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double PerformanceResourceTiming::domainLookupEnd() const
</span><span class="lines">@@ -131,10 +131,10 @@
</span><span class="cx"> if (!m_shouldReportDetails)
</span><span class="cx"> return 0.0;
</span><span class="cx">
</span><del>- if (!m_timing || m_timing->domainLookupEnd < 0)
</del><ins>+ if (m_timing.domainLookupEnd < 0)
</ins><span class="cx"> return domainLookupStart();
</span><span class="cx">
</span><del>- return resourceTimeToDocumentMilliseconds(m_timing->domainLookupEnd);
</del><ins>+ return resourceTimeToDocumentMilliseconds(m_timing.domainLookupEnd);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double PerformanceResourceTiming::connectStart() const
</span><span class="lines">@@ -143,13 +143,13 @@
</span><span class="cx"> return 0.0;
</span><span class="cx">
</span><span class="cx"> // connectStart will be -1 when a network request is not made.
</span><del>- if (!m_timing || m_timing->connectStart < 0 || m_didReuseConnection)
</del><ins>+ if (m_timing.connectStart < 0 || m_didReuseConnection)
</ins><span class="cx"> return domainLookupEnd();
</span><span class="cx">
</span><span class="cx"> // connectStart includes any DNS time, so we may need to trim that off.
</span><del>- int connectStart = m_timing->connectStart;
- if (m_timing->domainLookupEnd >= 0)
- connectStart = m_timing->domainLookupEnd;
</del><ins>+ int connectStart = m_timing.connectStart;
+ if (m_timing.domainLookupEnd >= 0)
+ connectStart = m_timing.domainLookupEnd;
</ins><span class="cx">
</span><span class="cx"> return resourceTimeToDocumentMilliseconds(connectStart);
</span><span class="cx"> }
</span><span class="lines">@@ -160,10 +160,10 @@
</span><span class="cx"> return 0.0;
</span><span class="cx">
</span><span class="cx"> // connectStart will be -1 when a network request is not made.
</span><del>- if (!m_timing || m_timing->connectEnd < 0 || m_didReuseConnection)
</del><ins>+ if (m_timing.connectEnd < 0 || m_didReuseConnection)
</ins><span class="cx"> return connectStart();
</span><span class="cx">
</span><del>- return resourceTimeToDocumentMilliseconds(m_timing->connectEnd);
</del><ins>+ return resourceTimeToDocumentMilliseconds(m_timing.connectEnd);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double PerformanceResourceTiming::secureConnectionStart() const
</span><span class="lines">@@ -171,10 +171,10 @@
</span><span class="cx"> if (!m_shouldReportDetails)
</span><span class="cx"> return 0.0;
</span><span class="cx">
</span><del>- if (!m_timing || m_timing->secureConnectionStart < 0) // Secure connection not negotiated.
</del><ins>+ if (m_timing.secureConnectionStart < 0) // Secure connection not negotiated.
</ins><span class="cx"> return 0.0;
</span><span class="cx">
</span><del>- return resourceTimeToDocumentMilliseconds(m_timing->secureConnectionStart);
</del><ins>+ return resourceTimeToDocumentMilliseconds(m_timing.secureConnectionStart);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double PerformanceResourceTiming::requestStart() const
</span><span class="lines">@@ -182,10 +182,7 @@
</span><span class="cx"> if (!m_shouldReportDetails)
</span><span class="cx"> return 0.0;
</span><span class="cx">
</span><del>- if (!m_timing)
- return connectEnd();
-
- return resourceTimeToDocumentMilliseconds(m_timing->requestStart);
</del><ins>+ return resourceTimeToDocumentMilliseconds(m_timing.requestStart);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double PerformanceResourceTiming::responseEnd() const
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceResourceTimingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceResourceTiming.h (168844 => 168845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceResourceTiming.h 2014-05-14 17:29:46 UTC (rev 168844)
+++ trunk/Source/WebCore/page/PerformanceResourceTiming.h 2014-05-14 17:44:18 UTC (rev 168845)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #if ENABLE(RESOURCE_TIMING)
</span><span class="cx">
</span><span class="cx"> #include "PerformanceEntry.h"
</span><ins>+#include "ResourceLoadTiming.h"
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -76,7 +77,7 @@
</span><span class="cx"> double resourceTimeToDocumentMilliseconds(int deltaMilliseconds) const;
</span><span class="cx">
</span><span class="cx"> AtomicString m_initiatorType;
</span><del>- RefPtr<ResourceLoadTiming> m_timing;
</del><ins>+ ResourceLoadTiming m_timing;
</ins><span class="cx"> double m_finishTime;
</span><span class="cx"> bool m_didReuseConnection;
</span><span class="cx"> bool m_shouldReportDetails;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceTimingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceTiming.cpp (168844 => 168845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceTiming.cpp 2014-05-14 17:29:46 UTC (rev 168844)
+++ trunk/Source/WebCore/page/PerformanceTiming.cpp 2014-05-14 17:44:18 UTC (rev 168845)
</span><span class="lines">@@ -124,32 +124,34 @@
</span><span class="cx">
</span><span class="cx"> unsigned long long PerformanceTiming::domainLookupStart() const
</span><span class="cx"> {
</span><del>- ResourceLoadTiming* timing = resourceLoadTiming();
- if (!timing)
</del><ins>+ DocumentLoader* loader = documentLoader();
+ if (!loader)
</ins><span class="cx"> return fetchStart();
</span><del>-
</del><ins>+
+ const ResourceLoadTiming& timing = loader->response().resourceLoadTiming();
+
</ins><span class="cx"> // This will be -1 when a DNS request is not performed.
</span><span class="cx"> // Rather than exposing a special value that indicates no DNS, we "backfill" with fetchStart.
</span><del>- int domainLookupStart = timing->domainLookupStart;
- if (domainLookupStart < 0)
</del><ins>+ if (timing.domainLookupStart < 0)
</ins><span class="cx"> return fetchStart();
</span><span class="cx">
</span><del>- return resourceLoadTimeRelativeToAbsolute(domainLookupStart);
</del><ins>+ return resourceLoadTimeRelativeToAbsolute(timing.domainLookupStart);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long PerformanceTiming::domainLookupEnd() const
</span><span class="cx"> {
</span><del>- ResourceLoadTiming* timing = resourceLoadTiming();
- if (!timing)
</del><ins>+ DocumentLoader* loader = documentLoader();
+ if (!loader)
</ins><span class="cx"> return domainLookupStart();
</span><del>-
</del><ins>+
+ const ResourceLoadTiming& timing = loader->response().resourceLoadTiming();
+
</ins><span class="cx"> // This will be -1 when a DNS request is not performed.
</span><span class="cx"> // Rather than exposing a special value that indicates no DNS, we "backfill" with domainLookupStart.
</span><del>- int domainLookupEnd = timing->domainLookupEnd;
- if (domainLookupEnd < 0)
</del><ins>+ if (timing.domainLookupEnd < 0)
</ins><span class="cx"> return domainLookupStart();
</span><span class="cx">
</span><del>- return resourceLoadTimeRelativeToAbsolute(domainLookupEnd);
</del><ins>+ return resourceLoadTimeRelativeToAbsolute(timing.domainLookupEnd);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long PerformanceTiming::connectStart() const
</span><span class="lines">@@ -158,20 +160,18 @@
</span><span class="cx"> if (!loader)
</span><span class="cx"> return domainLookupEnd();
</span><span class="cx">
</span><del>- ResourceLoadTiming* timing = loader->response().resourceLoadTiming();
- if (!timing)
- return domainLookupEnd();
-
</del><ins>+ const ResourceLoadTiming& timing = loader->response().resourceLoadTiming();
+
</ins><span class="cx"> // connectStart will be -1 when a network request is not made.
</span><span class="cx"> // Rather than exposing a special value that indicates no new connection, we "backfill" with domainLookupEnd.
</span><del>- int connectStart = timing->connectStart;
</del><ins>+ int connectStart = timing.connectStart;
</ins><span class="cx"> if (connectStart < 0 || loader->response().connectionReused())
</span><span class="cx"> return domainLookupEnd();
</span><span class="cx">
</span><span class="cx"> // ResourceLoadTiming's connect phase includes DNS, however Navigation Timing's
</span><span class="cx"> // connect phase should not. So if there is DNS time, trim it from the start.
</span><del>- if (timing->domainLookupEnd >= 0 && timing->domainLookupEnd > connectStart)
- connectStart = timing->domainLookupEnd;
</del><ins>+ if (timing.domainLookupEnd >= 0 && timing.domainLookupEnd > connectStart)
+ connectStart = timing.domainLookupEnd;
</ins><span class="cx">
</span><span class="cx"> return resourceLoadTimeRelativeToAbsolute(connectStart);
</span><span class="cx"> }
</span><span class="lines">@@ -182,17 +182,14 @@
</span><span class="cx"> if (!loader)
</span><span class="cx"> return connectStart();
</span><span class="cx">
</span><del>- ResourceLoadTiming* timing = loader->response().resourceLoadTiming();
- if (!timing)
- return connectStart();
-
</del><ins>+ const ResourceLoadTiming& timing = loader->response().resourceLoadTiming();
+
</ins><span class="cx"> // connectEnd will be -1 when a network request is not made.
</span><span class="cx"> // Rather than exposing a special value that indicates no new connection, we "backfill" with connectStart.
</span><del>- int connectEnd = timing->connectEnd;
- if (connectEnd < 0 || loader->response().connectionReused())
</del><ins>+ if (timing.connectEnd < 0 || loader->response().connectionReused())
</ins><span class="cx"> return connectStart();
</span><span class="cx">
</span><del>- return resourceLoadTimeRelativeToAbsolute(connectEnd);
</del><ins>+ return resourceLoadTimeRelativeToAbsolute(timing.connectEnd);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long PerformanceTiming::secureConnectionStart() const
</span><span class="lines">@@ -201,35 +198,36 @@
</span><span class="cx"> if (!loader)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- ResourceLoadTiming* timing = loader->response().resourceLoadTiming();
- if (!timing)
</del><ins>+ const ResourceLoadTiming& timing = loader->response().resourceLoadTiming();
+
+ if (timing.secureConnectionStart < 0)
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><del>- int secureConnectionStart = timing->secureConnectionStart;
- if (secureConnectionStart < 0)
- return 0;
-
- return resourceLoadTimeRelativeToAbsolute(secureConnectionStart);
</del><ins>+ return resourceLoadTimeRelativeToAbsolute(timing.secureConnectionStart);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long PerformanceTiming::requestStart() const
</span><span class="cx"> {
</span><del>- ResourceLoadTiming* timing = resourceLoadTiming();
- if (!timing)
</del><ins>+ DocumentLoader* loader = documentLoader();
+ if (!loader)
</ins><span class="cx"> return connectEnd();
</span><del>-
- ASSERT(timing->requestStart >= 0);
- return resourceLoadTimeRelativeToAbsolute(timing->requestStart);
</del><ins>+
+ const ResourceLoadTiming& timing = loader->response().resourceLoadTiming();
+
+ ASSERT(timing.requestStart >= 0);
+ return resourceLoadTimeRelativeToAbsolute(timing.requestStart);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long PerformanceTiming::responseStart() const
</span><span class="cx"> {
</span><del>- ResourceLoadTiming* timing = resourceLoadTiming();
- if (!timing)
</del><ins>+ DocumentLoader* loader = documentLoader();
+ if (!loader)
</ins><span class="cx"> return requestStart();
</span><span class="cx">
</span><del>- ASSERT(timing->responseStart >= 0);
- return resourceLoadTimeRelativeToAbsolute(timing->responseStart);
</del><ins>+ const ResourceLoadTiming& timing = loader->response().resourceLoadTiming();
+
+ ASSERT(timing.responseStart >= 0);
+ return resourceLoadTimeRelativeToAbsolute(timing.responseStart);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long PerformanceTiming::responseEnd() const
</span><span class="lines">@@ -333,15 +331,6 @@
</span><span class="cx"> return loader->timing();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ResourceLoadTiming* PerformanceTiming::resourceLoadTiming() const
-{
- DocumentLoader* loader = documentLoader();
- if (!loader)
- return 0;
-
- return loader->response().resourceLoadTiming();
-}
-
</del><span class="cx"> unsigned long long PerformanceTiming::resourceLoadTimeRelativeToAbsolute(int relativeMilliseconds) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(relativeMilliseconds >= 0);
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceTimingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceTiming.h (168844 => 168845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceTiming.h 2014-05-14 17:29:46 UTC (rev 168844)
+++ trunk/Source/WebCore/page/PerformanceTiming.h 2014-05-14 17:44:18 UTC (rev 168845)
</span><span class="lines">@@ -77,7 +77,6 @@
</span><span class="cx"> const DocumentTiming* documentTiming() const;
</span><span class="cx"> DocumentLoader* documentLoader() const;
</span><span class="cx"> DocumentLoadTiming* documentLoadTiming() const;
</span><del>- ResourceLoadTiming* resourceLoadTiming() const;
</del><span class="cx"> unsigned long long resourceLoadTimeRelativeToAbsolute(int) const;
</span><span class="cx"> unsigned long long monotonicTimeToIntegerMilliseconds(double) const;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceLoadTimingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceLoadTiming.h (168844 => 168845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceLoadTiming.h 2014-05-14 17:29:46 UTC (rev 168844)
+++ trunk/Source/WebCore/platform/network/ResourceLoadTiming.h 2014-05-14 17:44:18 UTC (rev 168845)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Google, Inc. All Rights Reserved.
</span><ins>+ * Copyright (C) 2014 Apple, Inc. All Rights Reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -20,40 +21,50 @@
</span><span class="cx"> * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><del>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #ifndef ResourceLoadTiming_h
</span><span class="cx"> #define ResourceLoadTiming_h
</span><span class="cx">
</span><del>-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-
</del><span class="cx"> namespace WebCore {
</span><del>-
-class DocumentLoadTiming;
-
-class ResourceLoadTiming : public RefCounted<ResourceLoadTiming> {
</del><ins>+
+class ResourceLoadTiming {
</ins><span class="cx"> public:
</span><del>- static PassRefPtr<ResourceLoadTiming> create()
</del><ins>+ ResourceLoadTiming()
+ : domainLookupStart(-1)
+ , domainLookupEnd(-1)
+ , connectStart(-1)
+ , connectEnd(-1)
+ , requestStart(0)
+ , responseStart(0)
+ , secureConnectionStart(-1)
</ins><span class="cx"> {
</span><del>- return adoptRef(new ResourceLoadTiming);
</del><span class="cx"> }
</span><del>-
- PassRefPtr<ResourceLoadTiming> deepCopy()
</del><ins>+
+ ResourceLoadTiming(const ResourceLoadTiming& other)
+ : domainLookupStart(other.domainLookupStart)
+ , domainLookupEnd(other.domainLookupEnd)
+ , connectStart(other.connectStart)
+ , connectEnd(other.connectEnd)
+ , requestStart(other.requestStart)
+ , responseStart(other.responseStart)
+ , secureConnectionStart(other.secureConnectionStart)
</ins><span class="cx"> {
</span><del>- RefPtr<ResourceLoadTiming> timing = create();
- timing->domainLookupStart = domainLookupStart;
- timing->domainLookupEnd = domainLookupEnd;
- timing->connectStart = connectStart;
- timing->connectEnd = connectEnd;
- timing->requestStart = requestStart;
- timing->responseStart = responseStart;
- timing->secureConnectionStart = secureConnectionStart;
- return timing.release();
</del><span class="cx"> }
</span><del>-
</del><ins>+
+ ResourceLoadTiming& operator=(const ResourceLoadTiming& other)
+ {
+ domainLookupStart = other.domainLookupStart;
+ domainLookupEnd = other.domainLookupEnd;
+ connectStart = other.connectStart;
+ connectEnd = other.connectEnd;
+ requestStart = other.requestStart;
+ responseStart = other.responseStart;
+ secureConnectionStart = other.secureConnectionStart;
+ return *this;
+ }
+
</ins><span class="cx"> bool operator==(const ResourceLoadTiming& other) const
</span><span class="cx"> {
</span><span class="cx"> return domainLookupStart == other.domainLookupStart
</span><span class="lines">@@ -78,18 +89,6 @@
</span><span class="cx"> int requestStart;
</span><span class="cx"> int responseStart;
</span><span class="cx"> int secureConnectionStart;
</span><del>-
-private:
- ResourceLoadTiming()
- : domainLookupStart(-1)
- , domainLookupEnd(-1)
- , connectStart(-1)
- , connectEnd(-1)
- , requestStart(0)
- , responseStart(0)
- , secureConnectionStart(-1)
- {
- }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceResponseBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp (168844 => 168845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp 2014-05-14 17:29:46 UTC (rev 168844)
+++ trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp 2014-05-14 17:44:18 UTC (rev 168845)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">
</span><span class="cx"> response->lazyInit(CommonAndUncommonFields);
</span><span class="cx"> response->m_httpHeaderFields.adopt(data->m_httpHeaders.release());
</span><del>- response->setResourceLoadTiming(data->m_resourceLoadTiming.release());
</del><ins>+ response->setResourceLoadTiming(data->m_resourceLoadTiming);
</ins><span class="cx"> response->doPlatformAdopt(data);
</span><span class="cx"> return response.release();
</span><span class="cx"> }
</span><span class="lines">@@ -122,8 +122,7 @@
</span><span class="cx"> data->m_httpStatusCode = httpStatusCode();
</span><span class="cx"> data->m_httpStatusText = httpStatusText().isolatedCopy();
</span><span class="cx"> data->m_httpHeaders = httpHeaderFields().copyData();
</span><del>- if (m_resourceLoadTiming)
- data->m_resourceLoadTiming = m_resourceLoadTiming->deepCopy();
</del><ins>+ data->m_resourceLoadTiming = m_resourceLoadTiming;
</ins><span class="cx"> return asResourceResponse().doPlatformCopyData(data.release());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -551,14 +550,14 @@
</span><span class="cx"> m_connectionID = connectionID;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ResourceLoadTiming* ResourceResponseBase::resourceLoadTiming() const
</del><ins>+ResourceLoadTiming& ResourceResponseBase::resourceLoadTiming() const
</ins><span class="cx"> {
</span><span class="cx"> lazyInit(CommonAndUncommonFields);
</span><span class="cx">
</span><del>- return m_resourceLoadTiming.get();
</del><ins>+ return m_resourceLoadTiming;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceResponseBase::setResourceLoadTiming(PassRefPtr<ResourceLoadTiming> resourceLoadTiming)
</del><ins>+void ResourceResponseBase::setResourceLoadTiming(const ResourceLoadTiming& resourceLoadTiming)
</ins><span class="cx"> {
</span><span class="cx"> lazyInit(CommonAndUncommonFields);
</span><span class="cx">
</span><span class="lines">@@ -590,8 +589,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (a.httpHeaderFields() != b.httpHeaderFields())
</span><span class="cx"> return false;
</span><del>- if (a.resourceLoadTiming() && b.resourceLoadTiming() && *a.resourceLoadTiming() == *b.resourceLoadTiming())
- return ResourceResponse::platformCompare(a, b);
</del><span class="cx"> if (a.resourceLoadTiming() != b.resourceLoadTiming())
</span><span class="cx"> return false;
</span><span class="cx"> return ResourceResponse::platformCompare(a, b);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceResponseBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceResponseBase.h (168844 => 168845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceResponseBase.h 2014-05-14 17:29:46 UTC (rev 168844)
+++ trunk/Source/WebCore/platform/network/ResourceResponseBase.h 2014-05-14 17:44:18 UTC (rev 168845)
</span><span class="lines">@@ -109,8 +109,8 @@
</span><span class="cx"> bool wasCached() const;
</span><span class="cx"> void setWasCached(bool);
</span><span class="cx">
</span><del>- ResourceLoadTiming* resourceLoadTiming() const;
- void setResourceLoadTiming(PassRefPtr<ResourceLoadTiming>);
</del><ins>+ ResourceLoadTiming& resourceLoadTiming() const;
+ void setResourceLoadTiming(const ResourceLoadTiming&);
</ins><span class="cx">
</span><span class="cx"> // The ResourceResponse subclass may "shadow" this method to provide platform-specific memory usage information
</span><span class="cx"> unsigned memoryUsage() const
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> String m_suggestedFilename;
</span><span class="cx"> AtomicString m_httpStatusText;
</span><span class="cx"> HTTPHeaderMap m_httpHeaderFields;
</span><del>- RefPtr<ResourceLoadTiming> m_resourceLoadTiming;
</del><ins>+ mutable ResourceLoadTiming m_resourceLoadTiming;
</ins><span class="cx">
</span><span class="cx"> int m_httpStatusCode;
</span><span class="cx"> unsigned m_connectionID;
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> int m_httpStatusCode;
</span><span class="cx"> String m_httpStatusText;
</span><span class="cx"> OwnPtr<CrossThreadHTTPHeaderMapData> m_httpHeaders;
</span><del>- RefPtr<ResourceLoadTiming> m_resourceLoadTiming;
</del><ins>+ ResourceLoadTiming m_resourceLoadTiming;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm (168844 => 168845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm 2014-05-14 17:29:46 UTC (rev 168844)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm 2014-05-14 17:44:18 UTC (rev 168845)
</span><span class="lines">@@ -181,9 +181,6 @@
</span><span class="cx"> ResourceResponse resourceResponse(r);
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span><span class="cx"> if (NSDictionary *timingData = [connection _timingData]) {
</span><del>- resourceResponse.setResourceLoadTiming(ResourceLoadTiming::create());
- ResourceLoadTiming* timing = resourceResponse.resourceLoadTiming();
-
</del><span class="cx"> // This is not the navigationStart time in monotonic time, but the other times are relative to this time
</span><span class="cx"> // and only the differences between times are stored.
</span><span class="cx"> double referenceStart = [[timingData valueForKey:@"_kCFNTimingDataTimingDataInit"] doubleValue];
</span><span class="lines">@@ -196,15 +193,14 @@
</span><span class="cx"> double requestStart = [[timingData valueForKey:@"_kCFNTimingDataRequestStart"] doubleValue];
</span><span class="cx"> double responseStart = [[timingData valueForKey:@"_kCFNTimingDataResponseStart"] doubleValue];
</span><span class="cx">
</span><del>- if (timing) {
- timing->domainLookupStart = domainLookupStart <= 0.0 ? -1 : (domainLookupStart - referenceStart) * 1000;
- timing->domainLookupEnd = domainLookupEnd <= 0.0 ? -1 : (domainLookupEnd - referenceStart) * 1000;
- timing->connectStart = connectStart <= 0.0 ? -1 : (connectStart - referenceStart) * 1000;
- timing->secureConnectionStart = secureConnectionStart <= 0.0 ? -1 : (secureConnectionStart - referenceStart) * 1000;
- timing->connectEnd = connectEnd <= 0.0 ? -1 : (connectEnd - referenceStart) * 1000;
- timing->requestStart = requestStart <= 0.0 ? -1 : (requestStart - referenceStart) * 1000;
- timing->responseStart = responseStart <= 0.0 ? -1 : (responseStart - referenceStart) * 1000;
- }
</del><ins>+ ResourceLoadTiming& timing = resourceResponse.resourceLoadTiming();
+ timing.domainLookupStart = domainLookupStart <= 0.0 ? -1 : (domainLookupStart - referenceStart) * 1000;
+ timing.domainLookupEnd = domainLookupEnd <= 0.0 ? -1 : (domainLookupEnd - referenceStart) * 1000;
+ timing.connectStart = connectStart <= 0.0 ? -1 : (connectStart - referenceStart) * 1000;
+ timing.secureConnectionStart = secureConnectionStart <= 0.0 ? -1 : (secureConnectionStart - referenceStart) * 1000;
+ timing.connectEnd = connectEnd <= 0.0 ? -1 : (connectEnd - referenceStart) * 1000;
+ timing.requestStart = requestStart <= 0.0 ? -1 : (requestStart - referenceStart) * 1000;
+ timing.responseStart = responseStart <= 0.0 ? -1 : (responseStart - referenceStart) * 1000;
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(connection);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsOperationQueueDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm (168844 => 168845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm 2014-05-14 17:29:46 UTC (rev 168844)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm 2014-05-14 17:44:18 UTC (rev 168845)
</span><span class="lines">@@ -223,9 +223,6 @@
</span><span class="cx"> ResourceResponse resourceResponse(r);
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span><span class="cx"> if (NSDictionary *timingData = [connection _timingData]) {
</span><del>- resourceResponse.setResourceLoadTiming(ResourceLoadTiming::create());
- ResourceLoadTiming* timing = resourceResponse.resourceLoadTiming();
-
</del><span class="cx"> // This is not the navigationStart time in monotonic time, but the other times are relative to this time
</span><span class="cx"> // and only the differences between times are stored.
</span><span class="cx"> double referenceStart = [[timingData valueForKey:@"_kCFNTimingDataTimingDataInit"] doubleValue];
</span><span class="lines">@@ -238,15 +235,14 @@
</span><span class="cx"> double requestStart = [[timingData valueForKey:@"_kCFNTimingDataRequestStart"] doubleValue];
</span><span class="cx"> double responseStart = [[timingData valueForKey:@"_kCFNTimingDataResponseStart"] doubleValue];
</span><span class="cx">
</span><del>- if (timing) {
- timing->domainLookupStart = domainLookupStart <= 0.0 ? -1 : (domainLookupStart - referenceStart) * 1000;
- timing->domainLookupEnd = domainLookupEnd <= 0.0 ? -1 : (domainLookupEnd - referenceStart) * 1000;
- timing->connectStart = connectStart <= 0.0 ? -1 : (connectStart - referenceStart) * 1000;
- timing->secureConnectionStart = secureConnectionStart <= 0.0 ? -1 : (secureConnectionStart - referenceStart) * 1000;
- timing->connectEnd = connectEnd <= 0.0 ? -1 : (connectEnd - referenceStart) * 1000;
- timing->requestStart = requestStart <= 0.0 ? -1 : (requestStart - referenceStart) * 1000;
- timing->responseStart = responseStart <= 0.0 ? -1 : (responseStart - referenceStart) * 1000;
- }
</del><ins>+ ResourceLoadTiming& timing = resourceResponse.resourceLoadTiming();
+ timing.domainLookupStart = domainLookupStart <= 0.0 ? -1 : (domainLookupStart - referenceStart) * 1000;
+ timing.domainLookupEnd = domainLookupEnd <= 0.0 ? -1 : (domainLookupEnd - referenceStart) * 1000;
+ timing.connectStart = connectStart <= 0.0 ? -1 : (connectStart - referenceStart) * 1000;
+ timing.secureConnectionStart = secureConnectionStart <= 0.0 ? -1 : (secureConnectionStart - referenceStart) * 1000;
+ timing.connectEnd = connectEnd <= 0.0 ? -1 : (connectEnd - referenceStart) * 1000;
+ timing.requestStart = requestStart <= 0.0 ? -1 : (requestStart - referenceStart) * 1000;
+ timing.responseStart = responseStart <= 0.0 ? -1 : (responseStart - referenceStart) * 1000;
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(connection);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (168844 => 168845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-05-14 17:29:46 UTC (rev 168844)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-05-14 17:44:18 UTC (rev 168845)
</span><span class="lines">@@ -382,9 +382,6 @@
</span><span class="cx"> if (!handle || handle->cancelledOrClientless())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ResourceHandleInternal* d = handle->getInternal();
- ResourceResponse& redirectResponse = d->m_response;
- redirectResponse.setResourceLoadTiming(ResourceLoadTiming::create());
</del><span class="cx"> handle->m_requestTime = monotonicallyIncreasingTime();
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -835,11 +832,7 @@
</span><span class="cx">
</span><span class="cx"> void ResourceHandle::didStartRequest()
</span><span class="cx"> {
</span><del>- ResourceHandleInternal* d = getInternal();
- if (!d->m_response.resourceLoadTiming())
- return;
-
- d->m_response.resourceLoadTiming()->requestStart = milisecondsSinceRequest(m_requestTime);
</del><ins>+ getInternal()->m_response.resourceLoadTiming().requestStart = milisecondsSinceRequest(m_requestTime);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void networkEventCallback(SoupMessage*, GSocketClientEvent event, GIOStream*, gpointer data)
</span><span class="lines">@@ -855,21 +848,21 @@
</span><span class="cx"> int deltaTime = milisecondsSinceRequest(handle->m_requestTime);
</span><span class="cx"> switch (event) {
</span><span class="cx"> case G_SOCKET_CLIENT_RESOLVING:
</span><del>- d->m_response.resourceLoadTiming()->domainLookupStart = deltaTime;
</del><ins>+ d->m_response.resourceLoadTiming().domainLookupStart = deltaTime;
</ins><span class="cx"> break;
</span><span class="cx"> case G_SOCKET_CLIENT_RESOLVED:
</span><del>- d->m_response.resourceLoadTiming()->domainLookupEnd = deltaTime;
</del><ins>+ d->m_response.resourceLoadTiming().domainLookupEnd = deltaTime;
</ins><span class="cx"> break;
</span><span class="cx"> case G_SOCKET_CLIENT_CONNECTING:
</span><del>- d->m_response.resourceLoadTiming()->connectStart = deltaTime;
- if (d->m_response.resourceLoadTiming()->domainLookupStart != -1) {
</del><ins>+ d->m_response.resourceLoadTiming().connectStart = deltaTime;
+ if (d->m_response.resourceLoadTiming().domainLookupStart != -1) {
</ins><span class="cx"> // WebCore/inspector/front-end/RequestTimingView.js assumes
</span><span class="cx"> // that DNS time is included in connection time so must
</span><span class="cx"> // substract here the DNS delta that will be added later (see
</span><span class="cx"> // WebInspector.RequestTimingView.createTimingTable in the
</span><span class="cx"> // file above for more details).
</span><del>- d->m_response.resourceLoadTiming()->connectStart -=
- d->m_response.resourceLoadTiming()->domainLookupEnd - d->m_response.resourceLoadTiming()->domainLookupStart;
</del><ins>+ d->m_response.resourceLoadTiming().connectStart -=
+ d->m_response.resourceLoadTiming().domainLookupEnd - d->m_response.resourceLoadTiming().domainLookupStart;
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case G_SOCKET_CLIENT_CONNECTED:
</span><span class="lines">@@ -881,12 +874,12 @@
</span><span class="cx"> case G_SOCKET_CLIENT_PROXY_NEGOTIATED:
</span><span class="cx"> break;
</span><span class="cx"> case G_SOCKET_CLIENT_TLS_HANDSHAKING:
</span><del>- d->m_response.resourceLoadTiming()->secureConnectionStart = deltaTime;
</del><ins>+ d->m_response.resourceLoadTiming().secureConnectionStart = deltaTime;
</ins><span class="cx"> break;
</span><span class="cx"> case G_SOCKET_CLIENT_TLS_HANDSHAKED:
</span><span class="cx"> break;
</span><span class="cx"> case G_SOCKET_CLIENT_COMPLETE:
</span><del>- d->m_response.resourceLoadTiming()->connectEnd = deltaTime;
</del><ins>+ d->m_response.resourceLoadTiming().connectEnd = deltaTime;
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -942,7 +935,6 @@
</span><span class="cx"> soup_message_set_flags(d->m_soupMessage.get(), static_cast<SoupMessageFlags>(soup_message_get_flags(d->m_soupMessage.get()) | SOUP_MESSAGE_NO_REDIRECT));
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span><del>- d->m_response.setResourceLoadTiming(ResourceLoadTiming::create());
</del><span class="cx"> g_signal_connect(d->m_soupMessage.get(), "network-event", G_CALLBACK(networkEventCallback), handle);
</span><span class="cx"> g_signal_connect(d->m_soupMessage.get(), "restarted", G_CALLBACK(restartedCallback), handle);
</span><span class="cx"> #endif
</span><span class="lines">@@ -1017,8 +1009,7 @@
</span><span class="cx"> void ResourceHandle::sendPendingRequest()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span><del>- if (d->m_response.resourceLoadTiming())
- m_requestTime = monotonicallyIncreasingTime();
</del><ins>+ m_requestTime = monotonicallyIncreasingTime();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (d->m_firstRequest.timeoutInterval() > 0) {
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168844 => 168845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-14 17:29:46 UTC (rev 168844)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-14 17:44:18 UTC (rev 168845)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-05-14 Alex Christensen <achristensen@webkit.org>
+
+ Use references instead of pointers with ResourceLoadTiming.
+ https://bugs.webkit.org/show_bug.cgi?id=132846
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<ResourceResponse>::encode):
+ (IPC::ArgumentCoder<ResourceResponse>::decode):
+ Use references instead of pointers and null checks.
+
</ins><span class="cx"> 2014-05-14 Tibor Meszaros <tmeszaros.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove CSS_STICKY_POSITION guards
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (168844 => 168845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-05-14 17:29:46 UTC (rev 168844)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-05-14 17:44:18 UTC (rev 168845)
</span><span class="lines">@@ -690,18 +690,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span><del>- ResourceLoadTiming* timing = resourceResponse.resourceLoadTiming();
- bool hasResourceLoadTiming = timing;
- encoder << hasResourceLoadTiming;
- if (hasResourceLoadTiming) {
- encoder << timing->domainLookupStart;
- encoder << timing->domainLookupEnd;
- encoder << timing->connectStart;
- encoder << timing->connectEnd;
- encoder << timing->requestStart;
- encoder << timing->responseStart;
- encoder << timing->secureConnectionStart;
- }
</del><ins>+ const ResourceLoadTiming& timing = resourceResponse.resourceLoadTiming();
+ encoder << timing.domainLookupStart;
+ encoder << timing.domainLookupEnd;
+ encoder << timing.connectStart;
+ encoder << timing.connectEnd;
+ encoder << timing.requestStart;
+ encoder << timing.responseStart;
+ encoder << timing.secureConnectionStart;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -772,21 +768,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span><del>- bool hasResourceLoadTiming;
- if (!decoder.decode(hasResourceLoadTiming))
</del><ins>+ ResourceLoadTiming& timing = response.resourceLoadTiming();
+ if (!decoder.decode(timing.domainLookupStart)
+ || !decoder.decode(timing.domainLookupEnd)
+ || !decoder.decode(timing.connectStart)
+ || !decoder.decode(timing.connectEnd)
+ || !decoder.decode(timing.requestStart)
+ || !decoder.decode(timing.responseStart)
+ || !decoder.decode(timing.secureConnectionStart))
</ins><span class="cx"> return false;
</span><del>- if (hasResourceLoadTiming) {
- response.setResourceLoadTiming(ResourceLoadTiming::create());
- ResourceLoadTiming* timing = response.resourceLoadTiming();
- if (!decoder.decode(timing->domainLookupStart)
- || !decoder.decode(timing->domainLookupEnd)
- || !decoder.decode(timing->connectStart)
- || !decoder.decode(timing->connectEnd)
- || !decoder.decode(timing->requestStart)
- || !decoder.decode(timing->responseStart)
- || !decoder.decode(timing->secureConnectionStart))
- return false;
- }
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> resourceResponse = response;
</span></span></pre>
</div>
</div>
</body>
</html>