Implement nextHopProtocol in PerformanceResourceTiming and PerformanceNavigationTiming.

third_party/WebKit/Source/core/timing/PerformanceResourceTiming.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2012 Intel Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 37 matching lines @@
     bool allowRedirectDetails)
     : PerformanceEntry(
           info.initialURL().getString(),
           "resource",
           PerformanceBase::monotonicTimeToDOMHighResTimeStamp(timeOrigin,
                                                               startTime),
           PerformanceBase::monotonicTimeToDOMHighResTimeStamp(
               timeOrigin,
               info.loadFinishTime())),
       m_initiatorType(info.initiatorType()),
+      m_alpnNegotiatedProtocol(info.finalResponse().alpnNegotiatedProtocol()),
+      m_connectionInfo(info.finalResponse().connectionInfo()),
       m_timeOrigin(timeOrigin),
       m_timing(info.finalResponse().resourceLoadTiming()),
       m_lastRedirectEndTime(lastRedirectEndTime),
       m_finishTime(info.loadFinishTime()),
       m_transferSize(info.transferSize()),
       m_encodedBodySize(info.finalResponse().encodedBodyLength()),
       m_decodedBodySize(info.finalResponse().decodedBodyLength()),
       m_didReuseConnection(info.finalResponse().connectionReused()),
       m_allowTimingDetails(allowTimingDetails),
       m_allowRedirectDetails(allowRedirectDetails) {}
@@ skipping 28 matching lines @@
 }
 
 unsigned long long PerformanceResourceTiming::getDecodedBodySize() const {
   return m_decodedBodySize;
 }
 
 AtomicString PerformanceResourceTiming::initiatorType() const {
   return m_initiatorType;
 }
 
+AtomicString PerformanceResourceTiming::alpnNegotiatedProtocol() const {
+  return m_alpnNegotiatedProtocol;
+}
+
+AtomicString PerformanceResourceTiming::connectionInfo() const {
+  return m_connectionInfo;
+}
+
+AtomicString PerformanceResourceTiming::getNextHopProtocol(
+    const AtomicString& alpnNegotiatedProtocol,
+    const AtomicString& connectionInfo) {
+  // Fallback to connectionInfo when alpnNegotiatedProtocol is unknowm.

[kinuko, 2017/04/18 05:46:25]

unknowm -> unknown

+  AtomicString returnedProtocol = alpnNegotiatedProtocol == "unknown"
+                                      ? connectionInfo
+                                      : alpnNegotiatedProtocol;
+  // Fallback to "http/1.1" when connectionInfo is also unknown.
+  returnedProtocol =
+      returnedProtocol == "unknown" ? "http/1.1" : returnedProtocol;
+
+  if (returnedProtocol.contains("quic")) {
+    returnedProtocol = "hq";
+  }

[kinuko, 2017/04/18 05:46:25]

nit: no braces needed for one-line body

+  return returnedProtocol;
+}
+
+AtomicString PerformanceResourceTiming::nextHopProtocol() const {
+  return PerformanceResourceTiming::getNextHopProtocol(alpnNegotiatedProtocol(),
+                                                           connectionInfo());

[kinuko, 2017/04/18 05:46:25]

nit: indent looks off (please just run git cl format)

+}
+
 DOMHighResTimeStamp PerformanceResourceTiming::workerStart() const {
   ResourceLoadTiming* timing = resourceLoadTiming();
   if (!timing || timing->workerStart() == 0.0)
     return 0.0;
 
   return PerformanceBase::monotonicTimeToDOMHighResTimeStamp(
       m_timeOrigin, timing->workerStart());
 }
 
 DOMHighResTimeStamp PerformanceResourceTiming::workerReady() const {
@@ skipping 151 matching lines @@
 unsigned long long PerformanceResourceTiming::decodedBodySize() const {
   if (!allowTimingDetails())
     return 0;
 
   return getDecodedBodySize();
 }
 
 void PerformanceResourceTiming::buildJSONValue(V8ObjectBuilder& builder) const {
   PerformanceEntry::buildJSONValue(builder);
   builder.addString("initiatorType", initiatorType());
+  builder.addString("nextHopProtocol", nextHopProtocol());
   builder.addNumber("workerStart", workerStart());
   builder.addNumber("redirectStart", redirectStart());
   builder.addNumber("redirectEnd", redirectEnd());
   builder.addNumber("fetchStart", fetchStart());
   builder.addNumber("domainLookupStart", domainLookupStart());
   builder.addNumber("domainLookupEnd", domainLookupEnd());
   builder.addNumber("connectStart", connectStart());
   builder.addNumber("connectEnd", connectEnd());
   builder.addNumber("secureConnectionStart", secureConnectionStart());
   builder.addNumber("requestStart", requestStart());
   builder.addNumber("responseStart", responseStart());
   builder.addNumber("responseEnd", responseEnd());
   builder.addNumber("transferSize", transferSize());
   builder.addNumber("encodedBodySize", encodedBodySize());
   builder.addNumber("decodedBodySize", decodedBodySize());
 }
 
 }  // namespace blink