| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "platform/network/ResourceTimingInfo.h" | 5 #include "platform/network/ResourceTimingInfo.h" |
| 6 | 6 |
| 7 #include "platform/CrossThreadCopier.h" | 7 #include "platform/CrossThreadCopier.h" |
| 8 #include "wtf/PtrUtil.h" |
| 9 #include <memory> |
| 8 | 10 |
| 9 namespace blink { | 11 namespace blink { |
| 10 | 12 |
| 11 PassOwnPtr<ResourceTimingInfo> ResourceTimingInfo::adopt(PassOwnPtr<CrossThreadR
esourceTimingInfoData> data) | 13 std::unique_ptr<ResourceTimingInfo> ResourceTimingInfo::adopt(std::unique_ptr<Cr
ossThreadResourceTimingInfoData> data) |
| 12 { | 14 { |
| 13 OwnPtr<ResourceTimingInfo> info = ResourceTimingInfo::create(AtomicString(da
ta->m_type), data->m_initialTime, data->m_isMainResource); | 15 std::unique_ptr<ResourceTimingInfo> info = ResourceTimingInfo::create(Atomic
String(data->m_type), data->m_initialTime, data->m_isMainResource); |
| 14 info->m_originalTimingAllowOrigin = AtomicString(data->m_originalTimingAllow
Origin); | 16 info->m_originalTimingAllowOrigin = AtomicString(data->m_originalTimingAllow
Origin); |
| 15 info->m_loadFinishTime = data->m_loadFinishTime; | 17 info->m_loadFinishTime = data->m_loadFinishTime; |
| 16 info->m_initialRequest = ResourceRequest(data->m_initialRequest.get()); | 18 info->m_initialRequest = ResourceRequest(data->m_initialRequest.get()); |
| 17 info->m_finalResponse = ResourceResponse(data->m_finalResponse.get()); | 19 info->m_finalResponse = ResourceResponse(data->m_finalResponse.get()); |
| 18 for (auto& responseData : data->m_redirectChain) | 20 for (auto& responseData : data->m_redirectChain) |
| 19 info->m_redirectChain.append(ResourceResponse(responseData.get())); | 21 info->m_redirectChain.append(ResourceResponse(responseData.get())); |
| 20 return info; | 22 return info; |
| 21 } | 23 } |
| 22 | 24 |
| 23 PassOwnPtr<CrossThreadResourceTimingInfoData> ResourceTimingInfo::copyData() con
st | 25 std::unique_ptr<CrossThreadResourceTimingInfoData> ResourceTimingInfo::copyData(
) const |
| 24 { | 26 { |
| 25 OwnPtr<CrossThreadResourceTimingInfoData> data = adoptPtr(new CrossThreadRes
ourceTimingInfoData); | 27 std::unique_ptr<CrossThreadResourceTimingInfoData> data = wrapUnique(new Cro
ssThreadResourceTimingInfoData); |
| 26 data->m_type = m_type.getString().isolatedCopy(); | 28 data->m_type = m_type.getString().isolatedCopy(); |
| 27 data->m_originalTimingAllowOrigin = m_originalTimingAllowOrigin.getString().
isolatedCopy(); | 29 data->m_originalTimingAllowOrigin = m_originalTimingAllowOrigin.getString().
isolatedCopy(); |
| 28 data->m_initialTime = m_initialTime; | 30 data->m_initialTime = m_initialTime; |
| 29 data->m_loadFinishTime = m_loadFinishTime; | 31 data->m_loadFinishTime = m_loadFinishTime; |
| 30 data->m_initialRequest = m_initialRequest.copyData(); | 32 data->m_initialRequest = m_initialRequest.copyData(); |
| 31 data->m_finalResponse = m_finalResponse.copyData(); | 33 data->m_finalResponse = m_finalResponse.copyData(); |
| 32 for (const auto& response : m_redirectChain) | 34 for (const auto& response : m_redirectChain) |
| 33 data->m_redirectChain.append(response.copyData()); | 35 data->m_redirectChain.append(response.copyData()); |
| 34 data->m_isMainResource = m_isMainResource; | 36 data->m_isMainResource = m_isMainResource; |
| 35 return data; | 37 return data; |
| 36 } | 38 } |
| 37 | 39 |
| 38 } // namespace blink | 40 } // namespace blink |
| OLD | NEW |