Commit 2e653be7 authored by yangguo@chromium.org's avatar yangguo@chromium.org

Pass original int64 response time when caching resource metadata.

This is part 3/4 of a clean up to switch to int64 time stamps when caching metadata. The background to this is that converting int64 time stamps to double and back to int64 is lossy and causes false time stamp mismatches.

BUG=453298

Review URL: https://codereview.chromium.org/940443002

git-svn-id: svn://svn.chromium.org/blink/trunk@190618 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent b89e94ff
...@@ -26,7 +26,7 @@ public: ...@@ -26,7 +26,7 @@ public:
~MockPlatform() override { } ~MockPlatform() override { }
// From blink::Platform: // From blink::Platform:
void cacheMetadata(const WebURL& url, double, const char*, size_t) override void cacheMetadata(const WebURL& url, int64, const char*, size_t) override
{ {
m_cachedURLs.append(url); m_cachedURLs.append(url);
} }
......
...@@ -159,11 +159,6 @@ void WebURLResponse::setHTTPLoadInfo(const WebHTTPLoadInfo& value) ...@@ -159,11 +159,6 @@ void WebURLResponse::setHTTPLoadInfo(const WebHTTPLoadInfo& value)
m_private->m_resourceResponse->setResourceLoadInfo(value); m_private->m_resourceResponse->setResourceLoadInfo(value);
} }
void WebURLResponse::setResponseTime(double responseTime)
{
m_private->m_resourceResponse->setResponseTime(responseTime);
}
void WebURLResponse::setResponseTime(long long responseTime) void WebURLResponse::setResponseTime(long long responseTime)
{ {
m_private->m_resourceResponse->setResponseTime(static_cast<int64>(responseTime)); m_private->m_resourceResponse->setResponseTime(static_cast<int64>(responseTime));
......
...@@ -59,7 +59,6 @@ ResourceResponse::ResourceResponse() ...@@ -59,7 +59,6 @@ ResourceResponse::ResourceResponse()
, m_wasFallbackRequiredByServiceWorker(false) , m_wasFallbackRequiredByServiceWorker(false)
, m_serviceWorkerResponseType(WebServiceWorkerResponseTypeDefault) , m_serviceWorkerResponseType(WebServiceWorkerResponseTypeDefault)
, m_responseTime(0) , m_responseTime(0)
, m_originalResponseTime(0)
, m_remotePort(0) , m_remotePort(0)
{ {
} }
...@@ -95,7 +94,6 @@ ResourceResponse::ResourceResponse(const KURL& url, const AtomicString& mimeType ...@@ -95,7 +94,6 @@ ResourceResponse::ResourceResponse(const KURL& url, const AtomicString& mimeType
, m_wasFallbackRequiredByServiceWorker(false) , m_wasFallbackRequiredByServiceWorker(false)
, m_serviceWorkerResponseType(WebServiceWorkerResponseTypeDefault) , m_serviceWorkerResponseType(WebServiceWorkerResponseTypeDefault)
, m_responseTime(0) , m_responseTime(0)
, m_originalResponseTime(0)
, m_remotePort(0) , m_remotePort(0)
{ {
} }
...@@ -129,7 +127,6 @@ PassOwnPtr<ResourceResponse> ResourceResponse::adopt(PassOwnPtr<CrossThreadResou ...@@ -129,7 +127,6 @@ PassOwnPtr<ResourceResponse> ResourceResponse::adopt(PassOwnPtr<CrossThreadResou
response->m_serviceWorkerResponseType = data->m_serviceWorkerResponseType; response->m_serviceWorkerResponseType = data->m_serviceWorkerResponseType;
response->m_originalURLViaServiceWorker = data->m_originalURLViaServiceWorker; response->m_originalURLViaServiceWorker = data->m_originalURLViaServiceWorker;
response->m_responseTime = data->m_responseTime; response->m_responseTime = data->m_responseTime;
response->m_originalResponseTime = data->m_originalResponseTime;
response->m_remoteIPAddress = AtomicString(data->m_remoteIPAddress); response->m_remoteIPAddress = AtomicString(data->m_remoteIPAddress);
response->m_remotePort = data->m_remotePort; response->m_remotePort = data->m_remotePort;
response->m_downloadedFilePath = data->m_downloadedFilePath; response->m_downloadedFilePath = data->m_downloadedFilePath;
...@@ -169,7 +166,6 @@ PassOwnPtr<CrossThreadResourceResponseData> ResourceResponse::copyData() const ...@@ -169,7 +166,6 @@ PassOwnPtr<CrossThreadResourceResponseData> ResourceResponse::copyData() const
data->m_serviceWorkerResponseType = m_serviceWorkerResponseType; data->m_serviceWorkerResponseType = m_serviceWorkerResponseType;
data->m_originalURLViaServiceWorker = m_originalURLViaServiceWorker; data->m_originalURLViaServiceWorker = m_originalURLViaServiceWorker;
data->m_responseTime = m_responseTime; data->m_responseTime = m_responseTime;
data->m_originalResponseTime = m_originalResponseTime;
data->m_remoteIPAddress = m_remoteIPAddress.string().isolatedCopy(); data->m_remoteIPAddress = m_remoteIPAddress.string().isolatedCopy();
data->m_remotePort = m_remotePort; data->m_remotePort = m_remotePort;
data->m_downloadedFilePath = m_downloadedFilePath.isolatedCopy(); data->m_downloadedFilePath = m_downloadedFilePath.isolatedCopy();
......
...@@ -175,9 +175,8 @@ public: ...@@ -175,9 +175,8 @@ public:
bool isMultipartPayload() const { return m_isMultipartPayload; } bool isMultipartPayload() const { return m_isMultipartPayload; }
void setIsMultipartPayload(bool value) { m_isMultipartPayload = value; } void setIsMultipartPayload(bool value) { m_isMultipartPayload = value; }
double responseTime() const { return m_responseTime; } int64 responseTime() const { return m_responseTime; }
void setResponseTime(double responseTime) { m_responseTime = responseTime; } void setResponseTime(int64 responseTime) { m_responseTime = responseTime; }
void setResponseTime(int64 responseTime) { m_originalResponseTime = responseTime; }
const AtomicString& remoteIPAddress() const { return m_remoteIPAddress; } const AtomicString& remoteIPAddress() const { return m_remoteIPAddress; }
void setRemoteIPAddress(const AtomicString& value) { m_remoteIPAddress = value; } void setRemoteIPAddress(const AtomicString& value) { m_remoteIPAddress = value; }
...@@ -281,8 +280,7 @@ private: ...@@ -281,8 +280,7 @@ private:
// The time at which the response headers were received. For cached // The time at which the response headers were received. For cached
// responses, this time could be "far" in the past. // responses, this time could be "far" in the past.
double m_responseTime; int64 m_responseTime;
int64 m_originalResponseTime;
// Remote IP address of the socket which fetched this resource. // Remote IP address of the socket which fetched this resource.
AtomicString m_remoteIPAddress; AtomicString m_remoteIPAddress;
...@@ -331,8 +329,7 @@ public: ...@@ -331,8 +329,7 @@ public:
bool m_wasFallbackRequiredByServiceWorker; bool m_wasFallbackRequiredByServiceWorker;
WebServiceWorkerResponseType m_serviceWorkerResponseType; WebServiceWorkerResponseType m_serviceWorkerResponseType;
KURL m_originalURLViaServiceWorker; KURL m_originalURLViaServiceWorker;
double m_responseTime; int64 m_responseTime;
int64 m_originalResponseTime;
String m_remoteIPAddress; String m_remoteIPAddress;
unsigned short m_remotePort; unsigned short m_remotePort;
String m_downloadedFilePath; String m_downloadedFilePath;
......
...@@ -307,7 +307,6 @@ public: ...@@ -307,7 +307,6 @@ public:
// A suggestion to cache this metadata in association with this URL. // A suggestion to cache this metadata in association with this URL.
virtual void cacheMetadata(const WebURL&, int64 responseTime, const char* data, size_t dataSize) { } virtual void cacheMetadata(const WebURL&, int64 responseTime, const char* data, size_t dataSize) { }
virtual void cacheMetadata(const WebURL&, double responseTime, const char* data, size_t dataSize) { }
// Returns the decoded data url if url had a supported mimetype and parsing was successful. // Returns the decoded data url if url had a supported mimetype and parsing was successful.
virtual WebData parseDataURL(const WebURL&, WebString& mimetype, WebString& charset) { return WebData(); } virtual WebData parseDataURL(const WebURL&, WebString& mimetype, WebString& charset) { return WebData(); }
......
...@@ -92,7 +92,6 @@ public: ...@@ -92,7 +92,6 @@ public:
BLINK_PLATFORM_EXPORT WebHTTPLoadInfo httpLoadInfo(); BLINK_PLATFORM_EXPORT WebHTTPLoadInfo httpLoadInfo();
BLINK_PLATFORM_EXPORT void setHTTPLoadInfo(const WebHTTPLoadInfo&); BLINK_PLATFORM_EXPORT void setHTTPLoadInfo(const WebHTTPLoadInfo&);
BLINK_PLATFORM_EXPORT void setResponseTime(double);
BLINK_PLATFORM_EXPORT void setResponseTime(long long); BLINK_PLATFORM_EXPORT void setResponseTime(long long);
BLINK_PLATFORM_EXPORT WebString mimeType() const; BLINK_PLATFORM_EXPORT WebString mimeType() const;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment