<!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>[178019] 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/178019">178019</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-06 19:23:54 -0800 (Tue, 06 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Drop ResourceResponseBase::connectionID and connectionReused members
https://bugs.webkit.org/show_bug.cgi?id=140158

Reviewed by Sam Weinig.

Drop ResourceResponseBase::connectionID and connectionReused members.
Those were needed by the Chromium port but are no longer used.

Source/JavaScriptCore:

* inspector/protocol/Network.json:

Source/WebCore:

* inspector/InspectorResourceAgent.cpp:
(WebCore::buildObjectForResourceResponse):
* page/PerformanceResourceTiming.cpp:
(WebCore::PerformanceResourceTiming::PerformanceResourceTiming):
(WebCore::PerformanceResourceTiming::connectStart):
(WebCore::PerformanceResourceTiming::connectEnd):
* page/PerformanceResourceTiming.h:
* page/PerformanceTiming.cpp:
(WebCore::PerformanceTiming::connectStart):
(WebCore::PerformanceTiming::connectEnd):
* platform/network/ResourceResponseBase.cpp:
(WebCore::ResourceResponseBase::ResourceResponseBase):
(WebCore::ResourceResponseBase::connectionReused): Deleted.
(WebCore::ResourceResponseBase::setConnectionReused): Deleted.
(WebCore::ResourceResponseBase::connectionID): Deleted.
(WebCore::ResourceResponseBase::setConnectionID): Deleted.
* platform/network/ResourceResponseBase.h:
(WebCore::ResourceResponseBase::encode):
(WebCore::ResourceResponseBase::decode):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolNetworkjson">trunk/Source/JavaScriptCore/inspector/protocol/Network.json</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreplatformnetworkResourceResponseBasecpp">trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceResponseBaseh">trunk/Source/WebCore/platform/network/ResourceResponseBase.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (178018 => 178019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-01-07 02:56:49 UTC (rev 178018)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-01-07 03:23:54 UTC (rev 178019)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-01-06  Chris Dumez  &lt;cdumez@apple.com&gt;
+
+        Drop ResourceResponseBase::connectionID and connectionReused members
+        https://bugs.webkit.org/show_bug.cgi?id=140158
+
+        Reviewed by Sam Weinig.
+
+        Drop ResourceResponseBase::connectionID and connectionReused members.
+        Those were needed by the Chromium port but are no longer used.
+
+        * inspector/protocol/Network.json:
+
</ins><span class="cx"> 2015-01-06  Mark Lam  &lt;mark.lam@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Add the lexicalEnvironment as an operand to op_create_arguments.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolNetworkjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Network.json (178018 => 178019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Network.json        2015-01-07 02:56:49 UTC (rev 178018)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Network.json        2015-01-07 03:23:54 UTC (rev 178019)
</span><span class="lines">@@ -67,8 +67,6 @@
</span><span class="cx">                 { &quot;name&quot;: &quot;mimeType&quot;, &quot;type&quot;: &quot;string&quot;, &quot;description&quot;: &quot;Resource mimeType as determined by the browser.&quot; },
</span><span class="cx">                 { &quot;name&quot;: &quot;requestHeaders&quot;, &quot;$ref&quot;: &quot;Headers&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Refined HTTP request headers that were actually transmitted over the network.&quot; },
</span><span class="cx">                 { &quot;name&quot;: &quot;requestHeadersText&quot;, &quot;type&quot;: &quot;string&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;HTTP request headers text.&quot; },
</span><del>-                { &quot;name&quot;: &quot;connectionReused&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;description&quot;: &quot;Specifies whether physical connection was actually reused for this request.&quot; },
-                { &quot;name&quot;: &quot;connectionId&quot;, &quot;type&quot;: &quot;number&quot;, &quot;description&quot;: &quot;Physical connection id that was actually used for this request.&quot; },
</del><span class="cx">                 { &quot;name&quot;: &quot;fromDiskCache&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Specifies that the request was served from the disk cache.&quot; },
</span><span class="cx">                 { &quot;name&quot;: &quot;timing&quot;, &quot;$ref&quot;: &quot;ResourceTiming&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Timing information for the given request.&quot; }
</span><span class="cx">             ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178018 => 178019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-01-07 02:56:49 UTC (rev 178018)
+++ trunk/Source/WebCore/ChangeLog        2015-01-07 03:23:54 UTC (rev 178019)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2015-01-06  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Drop ResourceResponseBase::connectionID and connectionReused members
+        https://bugs.webkit.org/show_bug.cgi?id=140158
+
+        Reviewed by Sam Weinig.
+
+        Drop ResourceResponseBase::connectionID and connectionReused members.
+        Those were needed by the Chromium port but are no longer used.
+
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::buildObjectForResourceResponse):
+        * page/PerformanceResourceTiming.cpp:
+        (WebCore::PerformanceResourceTiming::PerformanceResourceTiming):
+        (WebCore::PerformanceResourceTiming::connectStart):
+        (WebCore::PerformanceResourceTiming::connectEnd):
+        * page/PerformanceResourceTiming.h:
+        * page/PerformanceTiming.cpp:
+        (WebCore::PerformanceTiming::connectStart):
+        (WebCore::PerformanceTiming::connectEnd):
+        * platform/network/ResourceResponseBase.cpp:
+        (WebCore::ResourceResponseBase::ResourceResponseBase):
+        (WebCore::ResourceResponseBase::connectionReused): Deleted.
+        (WebCore::ResourceResponseBase::setConnectionReused): Deleted.
+        (WebCore::ResourceResponseBase::connectionID): Deleted.
+        (WebCore::ResourceResponseBase::setConnectionID): Deleted.
+        * platform/network/ResourceResponseBase.h:
+        (WebCore::ResourceResponseBase::encode):
+        (WebCore::ResourceResponseBase::decode):
+
+2015-01-06  Chris Dumez  &lt;cdumez@apple.com&gt;
+
</ins><span class="cx">         Move the 'alt' CSS property to the new StyleBuilder
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=140129
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (178018 => 178019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp        2015-01-07 02:56:49 UTC (rev 178018)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp        2015-01-07 03:23:54 UTC (rev 178019)
</span><span class="lines">@@ -237,9 +237,7 @@
</span><span class="cx">         .setStatus(status)
</span><span class="cx">         .setStatusText(response.httpStatusText())
</span><span class="cx">         .setHeaders(headers)
</span><del>-        .setMimeType(response.mimeType())
-        .setConnectionReused(response.connectionReused())
-        .setConnectionId(response.connectionID());
</del><ins>+        .setMimeType(response.mimeType());
</ins><span class="cx"> 
</span><span class="cx">     responseObject-&gt;setFromDiskCache(response.source() == ResourceResponse::Source::DiskCache || response.source() == ResourceResponse::Source::DiskCacheAfterValidation);
</span><span class="cx">     responseObject-&gt;setTiming(buildObjectForTiming(response.resourceLoadTiming(), loader));
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceResourceTimingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceResourceTiming.cpp (178018 => 178019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceResourceTiming.cpp        2015-01-07 02:56:49 UTC (rev 178018)
+++ trunk/Source/WebCore/page/PerformanceResourceTiming.cpp        2015-01-07 03:23:54 UTC (rev 178019)
</span><span class="lines">@@ -80,7 +80,6 @@
</span><span class="cx">     , m_initiatorType(initiatorType)
</span><span class="cx">     , m_timing(response.resourceLoadTiming())
</span><span class="cx">     , m_finishTime(finishTime)
</span><del>-    , m_didReuseConnection(response.connectionReused())
</del><span class="cx">     , m_shouldReportDetails(passesTimingAllowCheck(response, requestingDocument))
</span><span class="cx">     , m_requestingDocument(requestingDocument)
</span><span class="cx"> {
</span><span class="lines">@@ -144,7 +143,7 @@
</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.connectStart &lt; 0 || m_didReuseConnection)
</del><ins>+    if (m_timing.connectStart &lt; 0)
</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><span class="lines">@@ -161,7 +160,7 @@
</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.connectEnd &lt; 0 || m_didReuseConnection)
</del><ins>+    if (m_timing.connectEnd &lt; 0)
</ins><span class="cx">         return connectStart();
</span><span class="cx"> 
</span><span class="cx">     return resourceTimeToDocumentMilliseconds(m_timing.connectEnd);
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceResourceTimingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceResourceTiming.h (178018 => 178019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceResourceTiming.h        2015-01-07 02:56:49 UTC (rev 178018)
+++ trunk/Source/WebCore/page/PerformanceResourceTiming.h        2015-01-07 03:23:54 UTC (rev 178019)
</span><span class="lines">@@ -79,7 +79,6 @@
</span><span class="cx">     AtomicString m_initiatorType;
</span><span class="cx">     ResourceLoadTiming m_timing;
</span><span class="cx">     double m_finishTime;
</span><del>-    bool m_didReuseConnection;
</del><span class="cx">     bool m_shouldReportDetails;
</span><span class="cx">     RefPtr&lt;Document&gt; m_requestingDocument;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceTimingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceTiming.cpp (178018 => 178019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceTiming.cpp        2015-01-07 02:56:49 UTC (rev 178018)
+++ trunk/Source/WebCore/page/PerformanceTiming.cpp        2015-01-07 03:23:54 UTC (rev 178019)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><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 &quot;backfill&quot; with domainLookupEnd.
</span><span class="cx">     int connectStart = timing.connectStart;
</span><del>-    if (connectStart &lt; 0 || loader-&gt;response().connectionReused())
</del><ins>+    if (connectStart &lt; 0)
</ins><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="lines">@@ -186,7 +186,7 @@
</span><span class="cx">     
</span><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 &quot;backfill&quot; with connectStart.
</span><del>-    if (timing.connectEnd &lt; 0 || loader-&gt;response().connectionReused())
</del><ins>+    if (timing.connectEnd &lt; 0)
</ins><span class="cx">         return connectStart();
</span><span class="cx"> 
</span><span class="cx">     return resourceLoadTimeRelativeToAbsolute(timing.connectEnd);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceResponseBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp (178018 => 178019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp        2015-01-07 02:56:49 UTC (rev 178018)
+++ trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp        2015-01-07 03:23:54 UTC (rev 178019)
</span><span class="lines">@@ -48,13 +48,11 @@
</span><span class="cx">     : m_expectedContentLength(0)
</span><span class="cx">     , m_includesCertificateInfo(false)
</span><span class="cx">     , m_httpStatusCode(0)
</span><del>-    , m_connectionID(0)
</del><span class="cx">     , m_cacheControlMaxAge(0)
</span><span class="cx">     , m_age(0)
</span><span class="cx">     , m_date(0)
</span><span class="cx">     , m_expires(0)
</span><span class="cx">     , m_lastModified(0)
</span><del>-    , m_connectionReused(false)
</del><span class="cx">     , m_isNull(true)
</span><span class="cx">     , m_haveParsedCacheControlHeader(false)
</span><span class="cx">     , m_haveParsedAgeHeader(false)
</span><span class="lines">@@ -75,13 +73,11 @@
</span><span class="cx">     , m_textEncodingName(textEncodingName)
</span><span class="cx">     , m_includesCertificateInfo(true) // Empty but valid for synthetic responses.
</span><span class="cx">     , m_httpStatusCode(0)
</span><del>-    , m_connectionID(0)
</del><span class="cx">     , m_cacheControlMaxAge(0)
</span><span class="cx">     , m_age(0)
</span><span class="cx">     , m_date(0)
</span><span class="cx">     , m_expires(0)
</span><span class="cx">     , m_lastModified(0)
</span><del>-    , m_connectionReused(false)
</del><span class="cx">     , m_isNull(false)
</span><span class="cx">     , m_haveParsedCacheControlHeader(false)
</span><span class="cx">     , m_haveParsedAgeHeader(false)
</span><span class="lines">@@ -529,34 +525,6 @@
</span><span class="cx">     m_source = source;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool ResourceResponseBase::connectionReused() const
-{
-    lazyInit(AllFields);
-
-    return m_connectionReused;
-}
-
-void ResourceResponseBase::setConnectionReused(bool connectionReused)
-{
-    lazyInit(AllFields);
-
-    m_connectionReused = connectionReused;
-}
-
-unsigned ResourceResponseBase::connectionID() const
-{
-    lazyInit(AllFields);
-
-    return m_connectionID;
-}
-
-void ResourceResponseBase::setConnectionID(unsigned connectionID)
-{
-    lazyInit(AllFields);
-
-    m_connectionID = connectionID;
-}
-
</del><span class="cx"> void ResourceResponseBase::lazyInit(InitLevel initLevel) const
</span><span class="cx"> {
</span><span class="cx">     const_cast&lt;ResourceResponse*&gt;(static_cast&lt;const ResourceResponse*&gt;(this))-&gt;platformLazyInit(initLevel);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceResponseBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceResponseBase.h (178018 => 178019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceResponseBase.h        2015-01-07 02:56:49 UTC (rev 178018)
+++ trunk/Source/WebCore/platform/network/ResourceResponseBase.h        2015-01-07 03:23:54 UTC (rev 178019)
</span><span class="lines">@@ -109,12 +109,6 @@
</span><span class="cx">     double expires() const;
</span><span class="cx">     WEBCORE_EXPORT double lastModified() const;
</span><span class="cx"> 
</span><del>-    unsigned connectionID() const;
-    void setConnectionID(unsigned);
-
-    bool connectionReused() const;
-    void setConnectionReused(bool);
-
</del><span class="cx">     enum class Source { Unknown, Network, DiskCache, DiskCacheAfterValidation };
</span><span class="cx">     WEBCORE_EXPORT Source source() const;
</span><span class="cx">     WEBCORE_EXPORT void setSource(Source);
</span><span class="lines">@@ -164,7 +158,6 @@
</span><span class="cx">     mutable CertificateInfo m_certificateInfo;
</span><span class="cx"> 
</span><span class="cx">     int m_httpStatusCode;
</span><del>-    unsigned m_connectionID;
</del><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     mutable double m_cacheControlMaxAge;
</span><span class="lines">@@ -174,8 +167,6 @@
</span><span class="cx">     mutable double m_lastModified;
</span><span class="cx"> 
</span><span class="cx"> public:
</span><del>-    bool m_connectionReused : 1;
-
</del><span class="cx">     bool m_isNull : 1;
</span><span class="cx">     
</span><span class="cx"> private:
</span><span class="lines">@@ -215,7 +206,6 @@
</span><span class="cx">     encoder &lt;&lt; m_httpHeaderFields;
</span><span class="cx">     encoder &lt;&lt; m_resourceLoadTiming;
</span><span class="cx">     encoder &lt;&lt; m_httpStatusCode;
</span><del>-    encoder &lt;&lt; m_connectionID;
</del><span class="cx">     encoder &lt;&lt; m_includesCertificateInfo;
</span><span class="cx">     if (m_includesCertificateInfo)
</span><span class="cx">         encoder &lt;&lt; m_certificateInfo;
</span><span class="lines">@@ -252,8 +242,6 @@
</span><span class="cx">         return false;
</span><span class="cx">     if (!decoder.decode(response.m_httpStatusCode))
</span><span class="cx">         return false;
</span><del>-    if (!decoder.decode(response.m_connectionID))
-        return false;
</del><span class="cx">     if (!decoder.decode(response.m_includesCertificateInfo))
</span><span class="cx">         return false;
</span><span class="cx">     if (response.m_includesCertificateInfo) {
</span></span></pre>
</div>
</div>

</body>
</html>